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

Update list menu graphics

Browse Source
This commit is contained in:
GriffinR 2022-11-09 19:44:58 -05:00
parent e434b0047f
commit 3b1c8dfb17
6 changed files with 33 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
graphics/interface/red_arrow.png → graphics/interface/arrow_cursor.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 167 B

After

Width:  |  Height:  |  Size: 167 B

0
graphics/interface/selector_outline.png → graphics/interface/outline_cursor.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 156 B

After

Width:  |  Height:  |  Size: 156 B

19
graphics/interface/red.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
115 164 197
255 82 0
131 32 0
255 0 255
255 0 255
255 0 255
255 0 255
255 0 255
255 0 255
255 0 255
255 0 255
255 0 255
255 0 255
255 0 255
255 0 255
255 0 255

0
graphics/interface/red_arrow_other.png → graphics/interface/scroll_indicator.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 197 B

After

Width:  |  Height:  |  Size: 197 B

2
graphics_file_rules.mk
View File

@ -669,7 +669,7 @@ $(WALLPAPERGFXDIR)/whiscash/tiles.4bpp: $(WALLPAPERGFXDIR)/friends_frame2.4bpp $
$(OBJEVENTGFXDIR)/pics/effects/unknown_4F6D38/0.4bpp: %.4bpp: %.png $(OBJEVENTGFXDIR)/pics/effects/unknown_4F6D38/0.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 11 -Wnum_tiles $(GFX) $< $@ -num_tiles 11 -Wnum_tiles
$(INTERFACEGFXDIR)/selector_outline.4bpp: %.4bpp: %.png $(INTERFACEGFXDIR)/outline_cursor.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 8 -Wnum_tiles $(GFX) $< $@ -num_tiles 8 -Wnum_tiles
$(BATTRANSGFXDIR)/frontier_logo_center.4bpp: %.4bpp: %.png $(BATTRANSGFXDIR)/frontier_logo_center.4bpp: %.4bpp: %.png

26
src/list_menu.c
View File

@ -305,10 +305,10 @@ static const struct SpriteTemplate sSpriteTemplate_RedArrowCursor =
.callback = SpriteCallback_RedArrowCursor, .callback = SpriteCallback_RedArrowCursor,
}; };
static const u16 sRedArrowPal[] = INCBIN_U16("graphics/interface/red_arrow.gbapal"); static const u16 sRedInterface_Pal[] = INCBIN_U16("graphics/interface/red.gbapal"); // Shared by all of the below gfx
static const u32 sRedArrowOtherGfx[] = INCBIN_U32("graphics/interface/red_arrow_other.4bpp.lz"); static const u32 sScrollIndicator_Gfx[] = INCBIN_U32("graphics/interface/scroll_indicator.4bpp.lz");
static const u32 sSelectorOutlineGfx[] = INCBIN_U32("graphics/interface/selector_outline.4bpp.lz"); static const u32 sOutlineCursor_Gfx[] = INCBIN_U32("graphics/interface/outline_cursor.4bpp.lz");
static const u32 sRedArrowGfx[] = INCBIN_U32("graphics/interface/red_arrow.4bpp.lz"); static const u32 sArrowCursor_Gfx[] = INCBIN_U32("graphics/interface/arrow_cursor.4bpp.lz");
// code // code
static void ListMenuDummyTask(u8 taskId) static void ListMenuDummyTask(u8 taskId)
@ -1077,18 +1077,18 @@ u8 AddScrollIndicatorArrowPair(const struct ScrollArrowsTemplate *arrowInfo, u16
struct ScrollIndicatorPair *data; struct ScrollIndicatorPair *data;
u8 taskId; u8 taskId;
spriteSheet.data = sRedArrowOtherGfx; spriteSheet.data = sScrollIndicator_Gfx;
spriteSheet.size = 0x100; spriteSheet.size = 0x100;
spriteSheet.tag = arrowInfo->tileTag; spriteSheet.tag = arrowInfo->tileTag;
LoadCompressedSpriteSheet(&spriteSheet); LoadCompressedSpriteSheet(&spriteSheet);
if (arrowInfo->palTag == TAG_NONE) if (arrowInfo->palTag == TAG_NONE)
{ {
LoadPalette(sRedArrowPal, (16 * arrowInfo->palNum) + 0x100, 0x20); LoadPalette(sRedInterface_Pal, (16 * arrowInfo->palNum) + 0x100, 0x20);
} }
else else
{ {
spritePal.data = sRedArrowPal; spritePal.data = sRedInterface_Pal;
spritePal.tag = arrowInfo->palTag; spritePal.tag = arrowInfo->palTag;
LoadSpritePalette(&spritePal); LoadSpritePalette(&spritePal);
} }
@ -1323,18 +1323,18 @@ static u8 ListMenuAddRedOutlineCursorObject(struct CursorStruct *cursor)
struct SpriteTemplate spriteTemplate; struct SpriteTemplate spriteTemplate;
u8 taskId; u8 taskId;
spriteSheet.data = sSelectorOutlineGfx; spriteSheet.data = sOutlineCursor_Gfx;
spriteSheet.size = 0x100; spriteSheet.size = 0x100;
spriteSheet.tag = cursor->tileTag; spriteSheet.tag = cursor->tileTag;
LoadCompressedSpriteSheet(&spriteSheet); LoadCompressedSpriteSheet(&spriteSheet);
if (cursor->palTag == TAG_NONE) if (cursor->palTag == TAG_NONE)
{ {
LoadPalette(sRedArrowPal, (16 * cursor->palNum) + 0x100, 0x20); LoadPalette(sRedInterface_Pal, (16 * cursor->palNum) + 0x100, 0x20);
} }
else else
{ {
spritePal.data = sRedArrowPal; spritePal.data = sRedInterface_Pal;
spritePal.tag = cursor->palTag; spritePal.tag = cursor->palTag;
LoadSpritePalette(&spritePal); LoadSpritePalette(&spritePal);
} }
@ -1408,18 +1408,18 @@ static u8 ListMenuAddRedArrowCursorObject(struct CursorStruct *cursor)
struct SpriteTemplate spriteTemplate; struct SpriteTemplate spriteTemplate;
u8 taskId; u8 taskId;
spriteSheet.data = sRedArrowGfx; spriteSheet.data = sArrowCursor_Gfx;
spriteSheet.size = 0x80; spriteSheet.size = 0x80;
spriteSheet.tag = cursor->tileTag; spriteSheet.tag = cursor->tileTag;
LoadCompressedSpriteSheet(&spriteSheet); LoadCompressedSpriteSheet(&spriteSheet);
if (cursor->palTag == TAG_NONE) if (cursor->palTag == TAG_NONE)
{ {
LoadPalette(sRedArrowPal, (16 * cursor->palNum) + 0x100, 0x20); LoadPalette(sRedInterface_Pal, (16 * cursor->palNum) + 0x100, 0x20);
} }
else else
{ {
spritePal.data = sRedArrowPal; spritePal.data = sRedInterface_Pal;
spritePal.tag = cursor->palTag; spritePal.tag = cursor->palTag;
LoadSpritePalette(&spritePal); LoadSpritePalette(&spritePal);
} }