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

Organize Pokemon storage graphics

Browse Source
This commit is contained in:
cbt6
2022-09-03 23:30:02 +08:00
parent 859ca7994e
commit c0bf576445
124 changed files with 536 additions and 464 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/graphics.c
+5 -5
View File
@@ -1251,11 +1251,11 @@ const u32 gPokeSummary_StatusAilmentIconTiles[] = INCBIN_U32("graphics/interface
const u16 gDexScreen_TopMenuIconPals_AtoZ[] = INCBIN_U16("graphics/pokedex/cat_icon_abc.gbapal");
const u32 gDexScreen_TopMenuIconTiles_AtoZ[] = INCBIN_U32("graphics/pokedex/cat_icon_abc.4bpp.lz");
const u16 gPokeStoragePartyMenu_Pal[] = INCBIN_U16("graphics/interface/box_tiles_pal1.gbapal");
const u16 gPokeStorageInterface_Pal[] = INCBIN_U16("graphics/interface/box_tiles_pal2.gbapal");
const u16 gPokeStorageInterface_NoDisplayMon_Pal[] = INCBIN_U16("graphics/interface/box_tiles_pal3.gbapal");
const u32 gPokeStorageMenu_Gfx[] = INCBIN_U32("graphics/interface/box_tiles.4bpp.lz");
const u32 gPokeStoragePartyMenu_Tilemap[] = INCBIN_U32("graphics/unknown/unknown_E9CAEC.bin.lz");
const u16 gPokeStoragePartyMenu_Pal[] = INCBIN_U16("graphics/pokemon_storage/party_menu.gbapal");
const u16 gPokeStorageInterface_Pal[] = INCBIN_U16("graphics/pokemon_storage/interface.gbapal");
const u16 gPokeStorageInterface_NoDisplayMon_Pal[] = INCBIN_U16("graphics/pokemon_storage/interface_no_display_mon.gbapal");
const u32 gPokeStorageMenu_Gfx[] = INCBIN_U32("graphics/pokemon_storage/menu.4bpp.lz");
const u32 gPokeStoragePartyMenu_Tilemap[] = INCBIN_U32("graphics/pokemon_storage/party_menu.bin.lz");
const u16 gMonMarkingsMenu_Pal[] = INCBIN_U16("graphics/misc/markings2.gbapal");
const u16 gMonMarkingsMenu_Gfx[] = INCBIN_U16("graphics/misc/markings2.4bpp");
src/pokemon_storage_system_2.c
+3 -3
View File
@@ -654,7 +654,7 @@ static void SpriteCB_ChooseBoxArrow(struct Sprite *sprite)
}
// Unused, since LoadChooseBoxMenuGfx is always called with `loadPal` as false
static const u16 sChooseBoxMenu_Pal[] = INCBIN_U16("graphics/interface/pss_unk_83CDA98.gbapal");
static const u16 sChooseBoxMenu_Pal[] = INCBIN_U16("graphics/pokemon_storage/unused_choose_box_menu.gbapal");
static const u8 sChooseBoxMenuCenter_Gfx[] = INCBIN_U8("graphics/interface/pss_unk_83CDAB8.4bpp");
static const u8 sChooseBoxMenuCorners_Gfx[] = INCBIN_U8("graphics/interface/pss_unk_83CE2B8.4bpp");
static const u8 sChooseBoxMenuCenter_Gfx[] = INCBIN_U8("graphics/pokemon_storage/choose_box_menu_center.4bpp");
static const u8 sChooseBoxMenuCorners_Gfx[] = INCBIN_U8("graphics/pokemon_storage/choose_box_menu_corners.4bpp");
src/pokemon_storage_system_3.c
+17 -41
View File
@@ -166,50 +166,26 @@ enum
MSG_FMT_ITEM_NAME,
};
static const u32 sPokemonStorageScrollingBGTileset[] = INCBIN_U32("graphics/interface/pss_unk_83CE438.4bpp.lz");
static const u32 sPokemonStorageScrollingBGTilemap[] = INCBIN_U32("graphics/interface/pss_unk_83CE4D0.bin.lz");
static const u32 sScrollingBg_Gfx[] = INCBIN_U32("graphics/pokemon_storage/scrolling_bg.4bpp.lz");
static const u32 sScrollingBg_Tilemap[] = INCBIN_U32("graphics/pokemon_storage/scrolling_bg.bin.lz");
// Unused
static const u16 sMenu_Pal[] = INCBIN_U16("graphics/interface/pss_unk_83CE5DC.gbapal");
static const u16 sMenu_Pal[] = INCBIN_U16("graphics/pokemon_storage/menu.gbapal");
static const u32 sMenu_Tilemap[] = INCBIN_U32("graphics/interface/pss_unk_83CE5FC.bin.lz");
static const u16 sPkmnData_Tilemap[] = {
0x0101, 0x0102, 0x0103, 0x0104, 0x0105, 0x0106, 0x0107, 0x0108,
0x0111, 0x0112, 0x0113, 0x0114, 0x0115, 0x0116, 0x0117, 0x0118,
0x2101, 0x2102, 0x2103, 0x2104, 0x2105, 0x2106, 0x2107, 0x2108,
0x2111, 0x2112, 0x2113, 0x2114, 0x2115, 0x2116, 0x2117, 0x2118,
};
static const u16 sScrollingBg_Pal[] = INCBIN_U16("graphics/interface/pss_unk_83CE738.gbapal");
static const u16 sScrollingBgMoveItems_Pal[] = INCBIN_U16("graphics/interface/pss_unk_83CE758.gbapal");
static const u16 sCloseBoxButton_Tilemap[] = {
0x014c, 0x014d, 0x014e, 0x014f, 0x0170, 0x0171, 0x0172, 0x0173, 0x0174,
0x015c, 0x015d, 0x015e, 0x015f, 0x0180, 0x0181, 0x0182, 0x0183, 0x0184,
0x0175, 0x0176, 0x0177, 0x0178, 0x0179, 0x017a, 0x017b, 0x017c, 0x017d,
0x0185, 0x0186, 0x0187, 0x0188, 0x0189, 0x018a, 0x018b, 0x018c, 0x018d,
};
static const u16 sPartySlotFilled_Tilemap[] = {
0x1140, 0x1141, 0x1141, 0x1142,
0x1150, 0x1151, 0x1151, 0x1152,
0x1160, 0x1161, 0x1161, 0x1162,
};
static const u16 sPartySlotEmpty_Tilemap[] = {
0x1143, 0x1144, 0x1144, 0x1145,
0x1153, 0x1154, 0x1154, 0x1155,
0x1163, 0x1164, 0x1164, 0x1165,
};
static const u16 sPokeStorageMisc2Pal[] = INCBIN_U16("graphics/interface/pss_unk_83CE810.gbapal");
static const u16 sWaveform_Gfx[] = INCBIN_U16("graphics/interface/pss_unk_83CE810.4bpp");
static const u32 sMenu_Tilemap[] = INCBIN_U32("graphics/pokemon_storage/menu.bin.lz");
static const u16 sPkmnData_Tilemap[] = INCBIN_U16("graphics/pokemon_storage/pkmn_data.bin");
static const u16 sScrollingBg_Pal[] = INCBIN_U16("graphics/pokemon_storage/scrolling_bg.gbapal");
static const u16 sScrollingBgMoveItems_Pal[] = INCBIN_U16("graphics/pokemon_storage/scrolling_bg_move_items.gbapal");
static const u16 sCloseBoxButton_Tilemap[] = INCBIN_U16("graphics/pokemon_storage/close_box_button.bin");
static const u16 sPartySlotFilled_Tilemap[] = INCBIN_U16("graphics/pokemon_storage/party_slot_filled.bin");
static const u16 sPartySlotEmpty_Tilemap[] = INCBIN_U16("graphics/pokemon_storage/party_slot_empty.bin");
static const u16 sPokeStorageMisc2Pal[] = INCBIN_U16("graphics/pokemon_storage/misc2.gbapal");
static const u16 sWaveform_Gfx[] = INCBIN_U16("graphics/pokemon_storage/waveform.4bpp");
// Unused
static const u16 sUnused_Pal[] = INCBIN_U16("graphics/interface/pss_unk_83CE9D0.gbapal");
static const u16 sUnused_Pal[] = INCBIN_U16("graphics/pokemon_storage/unused.gbapal");
static const u16 sTextWindows_Pal[] = INCBIN_U16("graphics/interface/pss_unk_83CEA10.gbapal");
static const u16 sItemInfoFrame_Pal[] = INCBIN_U16("graphics/pokemon_storage/item_info_frame.gbapal");
static const struct WindowTemplate sWindowTemplates[] = {
{
@@ -2135,8 +2111,8 @@ static void FreePokeStorageData(void)
static void SetScrollingBackground(void)
{
SetGpuReg(REG_OFFSET_BG3CNT, BGCNT_PRIORITY(3) | BGCNT_CHARBASE(3) | BGCNT_16COLOR | BGCNT_SCREENBASE(31));
DecompressAndLoadBgGfxUsingHeap(3, sPokemonStorageScrollingBGTileset, 0, 0, 0);
LZ77UnCompVram(sPokemonStorageScrollingBGTilemap, (void *)BG_SCREEN_ADDR(31));
DecompressAndLoadBgGfxUsingHeap(3, sScrollingBg_Gfx, 0, 0, 0);
LZ77UnCompVram(sScrollingBg_Tilemap, (void *)BG_SCREEN_ADDR(31));
}
static void ScrollBackground(void)
@@ -2173,7 +2149,7 @@ static void InitPalettesAndSprites(void)
{
LoadPalette(gPokeStorageInterface_Pal, 0, 0x20);
LoadPalette(gPokeStorageInterface_NoDisplayMon_Pal, 0x20, 0x20);
LoadPalette(sTextWindows_Pal, 0xF0, 0x20);
LoadPalette(sItemInfoFrame_Pal, 0xF0, 0x20);
if (gStorage->boxOption != OPTION_MOVE_ITEMS)
LoadPalette(sScrollingBg_Pal, 0x30, sizeof(sScrollingBg_Pal));
else
src/pokemon_storage_system_4.c
+114 -66
View File
@@ -76,74 +76,122 @@ static const union AffineAnimCmd *const sAffineAnims_ReleaseMon[] = {
[RELEASE_ANIM_COME_BACK] = sAffineAnim_ReleaseMon_ComeBack,
};
static const u16 sWallpaperPalettes_Forest[] = INCBIN_U16("graphics/interface/pss_unk_83CEC40.gbapal");
static const u32 sWallpaperTiles_Forest[] = INCBIN_U32("graphics/interface/pss_unk_83CEC80.4bpp.lz");
static const u32 sWallpaperTilemap_Forest[] = INCBIN_U32("graphics/interface/pss_unk_83CF050.bin.lz");
static const u16 sWallpaperPalettes_Forest[][16] = {
INCBIN_U16("graphics/pokemon_storage/wallpapers/forest/title.gbapal"),
INCBIN_U16("graphics/pokemon_storage/wallpapers/forest/box.gbapal"),
};
static const u32 sWallpaperTiles_Forest[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/forest/tiles.4bpp.lz");
static const u32 sWallpaperTilemap_Forest[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/forest/tilemap.bin.lz");
static const u16 sWallpaperPalettes_City[] = INCBIN_U16("graphics/interface/pss_unk_83CF12C.gbapal");
static const u32 sWallpaperTiles_City[] = INCBIN_U32("graphics/interface/pss_unk_83CF16C.4bpp.lz");
static const u32 sWallpaperTilemap_City[] = INCBIN_U32("graphics/interface/pss_unk_83CF374.bin.lz");
static const u16 sWallpaperPalettes_City[][16] = {
INCBIN_U16("graphics/pokemon_storage/wallpapers/city/title.gbapal"),
INCBIN_U16("graphics/pokemon_storage/wallpapers/city/box.gbapal"),
};
static const u32 sWallpaperTiles_City[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/city/tiles.4bpp.lz");
static const u32 sWallpaperTilemap_City[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/city/tilemap.bin.lz");
static const u16 sWallpaperPalettes_Desert[] = INCBIN_U16("graphics/interface/pss_unk_83CF424.gbapal");
static const u32 sWallpaperTiles_Desert[] = INCBIN_U32("graphics/interface/pss_unk_83CF464.4bpp.lz");
static const u32 sWallpaperTilemap_Desert[] = INCBIN_U32("graphics/interface/pss_unk_83CF750.bin.lz");
static const u16 sWallpaperPalettes_Desert[][16] = {
INCBIN_U16("graphics/pokemon_storage/wallpapers/desert/title.gbapal"),
INCBIN_U16("graphics/pokemon_storage/wallpapers/desert/box.gbapal"),
};
static const u32 sWallpaperTiles_Desert[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/desert/tiles.4bpp.lz");
static const u32 sWallpaperTilemap_Desert[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/desert/tilemap.bin.lz");
static const u16 sWallpaperPalettes_Savanna[] = INCBIN_U16("graphics/interface/pss_unk_83CF834.gbapal");
static const u32 sWallpaperTiles_Savanna[] = INCBIN_U32("graphics/interface/pss_unk_83CF874.4bpp.lz");
static const u32 sWallpaperTilemap_Savanna[] = INCBIN_U32("graphics/interface/pss_unk_83CFA94.bin.lz");
static const u16 sWallpaperPalettes_Savanna[][16] = {
INCBIN_U16("graphics/pokemon_storage/wallpapers/savanna/title.gbapal"),
INCBIN_U16("graphics/pokemon_storage/wallpapers/savanna/box.gbapal"),
};
static const u32 sWallpaperTiles_Savanna[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/savanna/tiles.4bpp.lz");
static const u32 sWallpaperTilemap_Savanna[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/savanna/tilemap.bin.lz");
static const u16 sWallpaperPalettes_Crag[] = INCBIN_U16("graphics/interface/pss_unk_83CFB60.gbapal");
static const u32 sWallpaperTiles_Crag[] = INCBIN_U32("graphics/interface/pss_unk_83CFBA0.4bpp.lz");
static const u32 sWallpaperTilemap_Crag[] = INCBIN_U32("graphics/interface/pss_unk_83CFEF0.bin.lz");
static const u16 sWallpaperPalettes_Crag[][16] = {
INCBIN_U16("graphics/pokemon_storage/wallpapers/crag/title.gbapal"),
INCBIN_U16("graphics/pokemon_storage/wallpapers/crag/box.gbapal"),
};
static const u32 sWallpaperTiles_Crag[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/crag/tiles.4bpp.lz");
static const u32 sWallpaperTilemap_Crag[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/crag/tilemap.bin.lz");
static const u16 sWallpaperPalettes_Volcano[] = INCBIN_U16("graphics/interface/pss_unk_83CFFC8.gbapal");
static const u32 sWallpaperTiles_Volcano[] = INCBIN_U32("graphics/interface/pss_unk_83D0008.4bpp.lz");
static const u16 sWallpaperPalettes_Volcano[][16] = {
INCBIN_U16("graphics/pokemon_storage/wallpapers/volcano/title.gbapal"),
INCBIN_U16("graphics/pokemon_storage/wallpapers/volcano/box.gbapal"),
};
static const u32 sWallpaperTiles_Volcano[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/volcano/tiles.4bpp.lz");
static const u8 sUnusedSpace1[4] = {};
static const u32 sWallpaperTilemap_Volcano[] = INCBIN_U32("graphics/interface/pss_unk_83D033C.bin.lz");
static const u32 sWallpaperTilemap_Volcano[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/volcano/tilemap.bin.lz");
static const u16 sWallpaperPalettes_Snow[] = INCBIN_U16("graphics/interface/pss_unk_83D0414.gbapal");
static const u32 sWallpaperTiles_Snow[] = INCBIN_U32("graphics/interface/pss_unk_83D0454.4bpp.lz");
static const u32 sWallpaperTilemap_Snow[] = INCBIN_U32("graphics/interface/pss_unk_83D070C.bin.lz");
static const u16 sWallpaperPalettes_Snow[][16] = {
INCBIN_U16("graphics/pokemon_storage/wallpapers/snow/title.gbapal"),
INCBIN_U16("graphics/pokemon_storage/wallpapers/snow/box.gbapal"),
};
static const u32 sWallpaperTiles_Snow[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/snow/tiles.4bpp.lz");
static const u32 sWallpaperTilemap_Snow[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/snow/tilemap.bin.lz");
static const u16 sWallpaperPalettes_Cave[] = INCBIN_U16("graphics/interface/pss_unk_83D07D8.gbapal");
static const u32 sWallpaperTiles_Cave[] = INCBIN_U32("graphics/interface/pss_unk_83D0818.4bpp.lz");
static const u32 sWallpaperTilemap_Cave[] = INCBIN_U32("graphics/interface/pss_unk_83D0B5C.bin.lz");
static const u16 sWallpaperPalettes_Cave[][16] = {
INCBIN_U16("graphics/pokemon_storage/wallpapers/cave/title.gbapal"),
INCBIN_U16("graphics/pokemon_storage/wallpapers/cave/box.gbapal"),
};
static const u32 sWallpaperTiles_Cave[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/cave/tiles.4bpp.lz");
static const u32 sWallpaperTilemap_Cave[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/cave/tilemap.bin.lz");
static const u16 sWallpaperPalettes_Beach[] = INCBIN_U16("graphics/interface/pss_unk_83D0C38.gbapal");
static const u32 sWallpaperTiles_Beach[] = INCBIN_U32("graphics/interface/pss_unk_83D0C78.4bpp.lz");
static const u32 sWallpaperTilemap_Beach[] = INCBIN_U32("graphics/interface/pss_unk_83D0FFC.bin.lz");
static const u16 sWallpaperPalettes_Beach[][16] = {
INCBIN_U16("graphics/pokemon_storage/wallpapers/beach/title.gbapal"),
INCBIN_U16("graphics/pokemon_storage/wallpapers/beach/box.gbapal"),
};
static const u32 sWallpaperTiles_Beach[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/beach/tiles.4bpp.lz");
static const u32 sWallpaperTilemap_Beach[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/beach/tilemap.bin.lz");
static const u16 sWallpaperPalettes_Seafloor[] = INCBIN_U16("graphics/interface/pss_unk_83D10E4.gbapal");
static const u32 sWallpaperTiles_Seafloor[] = INCBIN_U32("graphics/interface/pss_unk_83D1124.4bpp.lz");
static const u32 sWallpaperTilemap_Seafloor[] = INCBIN_U32("graphics/interface/pss_unk_83D13D8.bin.lz");
static const u16 sWallpaperPalettes_Seafloor[][16] = {
INCBIN_U16("graphics/pokemon_storage/wallpapers/seafloor/title.gbapal"),
INCBIN_U16("graphics/pokemon_storage/wallpapers/seafloor/box.gbapal"),
};
static const u32 sWallpaperTiles_Seafloor[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/seafloor/tiles.4bpp.lz");
static const u32 sWallpaperTilemap_Seafloor[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/seafloor/tilemap.bin.lz");
static const u16 sWallpaperPalettes_River[] = INCBIN_U16("graphics/interface/pss_unk_83D14B4.gbapal");
static const u32 sWallpaperTiles_River[] = INCBIN_U32("graphics/interface/pss_unk_83D14F4.4bpp.lz");
static const u32 sWallpaperTilemap_River[] = INCBIN_U32("graphics/interface/pss_unk_83D1788.bin.lz");
static const u16 sWallpaperPalettes_River[][16] = {
INCBIN_U16("graphics/pokemon_storage/wallpapers/river/title.gbapal"),
INCBIN_U16("graphics/pokemon_storage/wallpapers/river/box.gbapal"),
};
static const u32 sWallpaperTiles_River[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/river/tiles.4bpp.lz");
static const u32 sWallpaperTilemap_River[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/river/tilemap.bin.lz");
static const u16 sWallpaperPalettes_Sky[] = INCBIN_U16("graphics/interface/pss_unk_83D1874.gbapal");
static const u32 sWallpaperTiles_Sky[] = INCBIN_U32("graphics/interface/pss_unk_83D18B4.4bpp.lz");
static const u32 sWallpaperTilemap_Sky[] = INCBIN_U32("graphics/interface/pss_unk_83D1B4C.bin.lz");
static const u16 sWallpaperPalettes_Sky[][16] = {
INCBIN_U16("graphics/pokemon_storage/wallpapers/sky/title.gbapal"),
INCBIN_U16("graphics/pokemon_storage/wallpapers/sky/box.gbapal"),
};
static const u32 sWallpaperTiles_Sky[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/sky/tiles.4bpp.lz");
static const u32 sWallpaperTilemap_Sky[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/sky/tilemap.bin.lz");
static const u16 sWallpaperPalettes_Stars[] = INCBIN_U16("graphics/interface/pss_unk_83D1C2C.gbapal");
static const u16 sWallpaperPalettes_Stars[][16] = {
INCBIN_U16("graphics/pokemon_storage/wallpapers/stars/title.gbapal"),
INCBIN_U16("graphics/pokemon_storage/wallpapers/stars/box.gbapal"),
};
static const u8 sUnusedSpace2[32] = {};
static const u32 sWallpaperTiles_Stars[] = INCBIN_U32("graphics/interface/pss_unk_83D1C8C.4bpp.lz");
static const u32 sWallpaperTilemap_Stars[] = INCBIN_U32("graphics/interface/pss_unk_83D1EC4.bin.lz");
static const u32 sWallpaperTiles_Stars[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/stars/tiles.4bpp.lz");
static const u32 sWallpaperTilemap_Stars[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/stars/tilemap.bin.lz");
static const u16 sWallpaperPalettes_Pokecenter[] = INCBIN_U16("graphics/interface/pss_unk_83D1F94.gbapal");
static const u32 sWallpaperTiles_Pokecenter[] = INCBIN_U32("graphics/interface/pss_unk_83D1FD4.4bpp.lz");
static const u32 sWallpaperTilemap_Pokecenter[] = INCBIN_U32("graphics/interface/pss_unk_83D22B8.bin.lz");
static const u16 sWallpaperPalettes_Pokecenter[][16] = {
INCBIN_U16("graphics/pokemon_storage/wallpapers/pokecenter/title.gbapal"),
INCBIN_U16("graphics/pokemon_storage/wallpapers/pokecenter/box.gbapal"),
};
static const u32 sWallpaperTiles_Pokecenter[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/pokecenter/tiles.4bpp.lz");
static const u32 sWallpaperTilemap_Pokecenter[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/pokecenter/tilemap.bin.lz");
static const u16 sWallpaperPalettes_Tiles[] = INCBIN_U16("graphics/interface/pss_unk_83D239C.gbapal");
static const u32 sWallpaperTiles_Tiles[] = INCBIN_U32("graphics/interface/pss_unk_83D23DC.4bpp.lz");
static const u32 sWallpaperTilemap_Tiles[] = INCBIN_U32("graphics/interface/pss_unk_83D256C.bin.lz");
static const u16 sWallpaperPalettes_Tiles[][16] = {
INCBIN_U16("graphics/pokemon_storage/wallpapers/tiles/title.gbapal"),
INCBIN_U16("graphics/pokemon_storage/wallpapers/tiles/box.gbapal"),
};
static const u32 sWallpaperTiles_Tiles[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/tiles/tiles.4bpp.lz");
static const u32 sWallpaperTilemap_Tiles[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/tiles/tilemap.bin.lz");
static const u16 sWallpaperPalettes_Simple[] = INCBIN_U16("graphics/interface/pss_unk_83D2614.gbapal");
static const u32 sWallpaperTiles_Simple[] = INCBIN_U32("graphics/interface/pss_unk_83D2654.4bpp.lz");
static const u32 sWallpaperTilemap_Simple[] = INCBIN_U32("graphics/interface/pss_unk_83D277C.bin.lz");
static const u16 sWallpaperPalettes_Simple[][16] = {
INCBIN_U16("graphics/pokemon_storage/wallpapers/simple/title.gbapal"),
INCBIN_U16("graphics/pokemon_storage/wallpapers/simple/box.gbapal"),
};
static const u32 sWallpaperTiles_Simple[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/simple/tiles.4bpp.lz");
static const u32 sWallpaperTilemap_Simple[] = INCBIN_U32("graphics/pokemon_storage/wallpapers/simple/tilemap.bin.lz");
// Unused
static const u16 sWallpaperTilemap_Unused[] = INCBIN_U16("graphics/interface/pss_unk_83D2820.bin");
static const u16 sWallpaperTilemap_Unused[] = INCBIN_U16("graphics/pokemon_storage/wallpapers/unused.bin");
// Shadow color, text color
static const u16 sBoxTitleColors[][2] = {
@@ -166,25 +214,25 @@ static const u16 sBoxTitleColors[][2] = {
};
static const struct Wallpaper sWallpapers[] = {
{sWallpaperTiles_Forest, sWallpaperTilemap_Forest, sWallpaperPalettes_Forest },
{sWallpaperTiles_City, sWallpaperTilemap_City, sWallpaperPalettes_City },
{sWallpaperTiles_Desert, sWallpaperTilemap_Desert, sWallpaperPalettes_Desert },
{sWallpaperTiles_Savanna, sWallpaperTilemap_Savanna, sWallpaperPalettes_Savanna },
{sWallpaperTiles_Crag, sWallpaperTilemap_Crag, sWallpaperPalettes_Crag },
{sWallpaperTiles_Volcano, sWallpaperTilemap_Volcano, sWallpaperPalettes_Volcano },
{sWallpaperTiles_Snow, sWallpaperTilemap_Snow, sWallpaperPalettes_Snow },
{sWallpaperTiles_Cave, sWallpaperTilemap_Cave, sWallpaperPalettes_Cave },
{sWallpaperTiles_Beach, sWallpaperTilemap_Beach, sWallpaperPalettes_Beach },
{sWallpaperTiles_Seafloor, sWallpaperTilemap_Seafloor, sWallpaperPalettes_Seafloor },
{sWallpaperTiles_River, sWallpaperTilemap_River, sWallpaperPalettes_River },
{sWallpaperTiles_Sky, sWallpaperTilemap_Sky, sWallpaperPalettes_Sky },
{sWallpaperTiles_Stars, sWallpaperTilemap_Stars, sWallpaperPalettes_Stars },
{sWallpaperTiles_Pokecenter, sWallpaperTilemap_Pokecenter, sWallpaperPalettes_Pokecenter},
{sWallpaperTiles_Tiles, sWallpaperTilemap_Tiles, sWallpaperPalettes_Tiles },
{sWallpaperTiles_Simple, sWallpaperTilemap_Simple, sWallpaperPalettes_Simple },
{sWallpaperTiles_Forest, sWallpaperTilemap_Forest, *sWallpaperPalettes_Forest },
{sWallpaperTiles_City, sWallpaperTilemap_City, *sWallpaperPalettes_City },
{sWallpaperTiles_Desert, sWallpaperTilemap_Desert, *sWallpaperPalettes_Desert },
{sWallpaperTiles_Savanna, sWallpaperTilemap_Savanna, *sWallpaperPalettes_Savanna },
{sWallpaperTiles_Crag, sWallpaperTilemap_Crag, *sWallpaperPalettes_Crag },
{sWallpaperTiles_Volcano, sWallpaperTilemap_Volcano, *sWallpaperPalettes_Volcano },
{sWallpaperTiles_Snow, sWallpaperTilemap_Snow, *sWallpaperPalettes_Snow },
{sWallpaperTiles_Cave, sWallpaperTilemap_Cave, *sWallpaperPalettes_Cave },
{sWallpaperTiles_Beach, sWallpaperTilemap_Beach, *sWallpaperPalettes_Beach },
{sWallpaperTiles_Seafloor, sWallpaperTilemap_Seafloor, *sWallpaperPalettes_Seafloor },
{sWallpaperTiles_River, sWallpaperTilemap_River, *sWallpaperPalettes_River },
{sWallpaperTiles_Sky, sWallpaperTilemap_Sky, *sWallpaperPalettes_Sky },
{sWallpaperTiles_Stars, sWallpaperTilemap_Stars, *sWallpaperPalettes_Stars },
{sWallpaperTiles_Pokecenter, sWallpaperTilemap_Pokecenter, *sWallpaperPalettes_Pokecenter},
{sWallpaperTiles_Tiles, sWallpaperTilemap_Tiles, *sWallpaperPalettes_Tiles },
{sWallpaperTiles_Simple, sWallpaperTilemap_Simple, *sWallpaperPalettes_Simple },
};
static const u16 sBoxScrollArrow_Gfx[] = INCBIN_U16("graphics/interface/pss_unk_83D2AD0.4bpp");
static const u16 sBoxScrollArrow_Gfx[] = INCBIN_U16("graphics/pokemon_storage/box_scroll_arrow.4bpp");
static const u16 sUnusedColor = RGB(26, 29, 8);
src/pokemon_storage_system_5.c
+3 -3
View File
@@ -45,9 +45,9 @@ static bool8 SetMenuTextsForItem(void);
static void CreateCursorSprites(void);
static void ToggleCursorMultiMoveMode(void);
static const u16 sPokeStorageMisc1Pal[] = INCBIN_U16("graphics/interface/pss_unk_83D2BCC.gbapal");
static const u16 sHandCursorTiles[] = INCBIN_U16("graphics/interface/pss_unk_83D2BEC.4bpp");
static const u16 sHandCursorShadowTiles[] = INCBIN_U16("graphics/interface/pss_unk_83D33EC.4bpp");
static const u16 sPokeStorageMisc1Pal[] = INCBIN_U16("graphics/pokemon_storage/misc1.gbapal");
static const u16 sHandCursorTiles[] = INCBIN_U16("graphics/pokemon_storage/cursor.4bpp");
static const u16 sHandCursorShadowTiles[] = INCBIN_U16("graphics/pokemon_storage/cursor_shadow.4bpp");
// Modes for selecting and moving Pokémon in the box. Multiple Pokémon can be
// selected by pressing the Select button to change the cursor, then holding
src/pokemon_storage_system_8.c
+1 -1
View File
@@ -40,7 +40,7 @@ static void SpriteCB_ItemIcon_SwapToHand(struct Sprite *sprite);
static void SpriteCB_ItemIcon_SwapToMon(struct Sprite *sprite);
static void SpriteCB_ItemIcon_HideParty(struct Sprite *sprite);
static const u32 sItemInfoFrame_Gfx[] = INCBIN_U32("graphics/interface/pss_unk_83D35DC.4bpp");
static const u32 sItemInfoFrame_Gfx[] = INCBIN_U32("graphics/pokemon_storage/item_info_frame.4bpp");
static const struct OamData sOamData_ItemIcon = {
.y = 0,