mirror of
https://github.com/FireEmblemUniverse/fireemblem8u.git
synced 2024-11-24 05:39:45 +00:00
Merge pull request #91 from ProjectRevoTPP/item_icon_palette_fix
fix item_icon_palette being 0x20 instead of 0x40
This commit is contained in:
commit
aad637c57d
@ -1,9 +1,5 @@
|
||||
.section .data
|
||||
|
||||
.global gUnknown_08599714
|
||||
gUnknown_08599714: @ 0x08599714
|
||||
.incbin "baserom.gba", 0x599714, 0x20
|
||||
|
||||
.global gUnknown_08599734
|
||||
gUnknown_08599734: @ 0x08599734
|
||||
.incbin "baserom.gba", 0x599734, 0x200
|
||||
|
Binary file not shown.
@ -18,7 +18,7 @@ void DrawIcon(u16* BgOut, int IconIndex, int OamPalBase);
|
||||
void ClearIconGfx(u32 Index);
|
||||
void LoadIconObjectGraphics(int Index, int b);
|
||||
|
||||
extern const u32 item_icon_palette[]; // Item Icon Palette
|
||||
extern const u16 item_icon_palette[2][16]; // Item Icon Palette
|
||||
extern const u8 item_icon_tiles[]; // Item Icon GFX
|
||||
|
||||
#endif // GUARD_ICON_H
|
||||
|
@ -23,12 +23,12 @@ void ResetIconGraphics()
|
||||
|
||||
void LoadIconPalettes(u32 Dest)
|
||||
{
|
||||
CopyToPaletteBuffer(item_icon_palette, Dest << 5, 0x40);
|
||||
CopyToPaletteBuffer(&item_icon_palette, Dest << 5, sizeof(item_icon_palette));
|
||||
}
|
||||
|
||||
void LoadIconPalette(u32 Index, u32 Dest)
|
||||
{
|
||||
CopyToPaletteBuffer((item_icon_palette + (Index << 3)), Dest << 5, 0x20);
|
||||
CopyToPaletteBuffer(item_icon_palette[Index], Dest << 5, 0x20);
|
||||
}
|
||||
|
||||
int GetNextFreeIcon() // Unused
|
||||
|
Loading…
Reference in New Issue
Block a user