diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2018-01-17 20:57:19 -0600 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2018-01-17 20:57:19 -0600 |
| commit | 184fedc8706bf8c71b337334fbb60dcb0fe98f80 (patch) | |
| tree | 9fa4df3fed5594695bc02ca51bbef6c5ff179e21 | |
| parent | 90c175b73f420b0cd74d3d21577ba0349449be4c (diff) | |
Extract PC box background images
68 files changed, 875 insertions, 239 deletions
diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index 00a8b4d92..94879764b 100755 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -10135,7 +10135,7 @@ _080CC7E6: lsls r0, r1, 1 adds r0, r1 lsls r0, 2 - ldr r1, =gUnknown_085775B8 + ldr r1, =gWallpaperTable adds r6, r0, r1 ldr r0, [r6, 0x4] ldr r1, [r7] diff --git a/data/pokemon_storage_system.s b/data/pokemon_storage_system.s index e419db55a..6c2c17a4a 100644 --- a/data/pokemon_storage_system.s +++ b/data/pokemon_storage_system.s @@ -2,68 +2,102 @@ .include "constants/constants.inc" .section .rodata - .align 2, 0 + .align 2 gUnknown_0857173C:: @ 857173C - .incbin "baserom.gba", 0x57173c, 0x20 + .incbin "graphics/unknown/unknown_57173C.gbapal" + .align 2 gUnknown_0857175C:: @ 857175C - .incbin "baserom.gba", 0x57175c, 0x800 + .incbin "graphics/pokemon_storage/box_selection_popup_center.4bpp" + .align 2 gUnknown_08571F5C:: @ 8571F5C - .incbin "baserom.gba", 0x571f5c, 0x180 + .incbin "graphics/pokemon_storage/box_selection_popup_sides.4bpp" + .align 2 gUnknown_085720DC:: @ 85720DC - .incbin "baserom.gba", 0x5720dc, 0x98 + .incbin "graphics/pokemon_storage/scrolling_bg.4bpp.lz" + .align 2 gUnknown_08572174:: @ 8572174 - .incbin "baserom.gba", 0x572174, 0x12c + .incbin "graphics/pokemon_storage/scrolling_bg.bin.lz" + + .align 2 +gUnknown_08572280:: @ 8572280 + .incbin "graphics/unknown/unknown_572280.gbapal" + .align 2 gUnknown_085722A0:: @ 85722A0 - .incbin "baserom.gba", 0x5722a0, 0xfc + .incbin "graphics/unknown/unknown_5722A0.bin.lz" + .align 1 gUnknown_0857239C:: @ 857239C - .incbin "baserom.gba", 0x57239c, 0x40 + .2byte 0x0101, 0x0102, 0x0103, 0x0104, 0x0105, 0x0106, 0x0107, 0x0108, 0x0111, 0x0112, 0x0113, 0x0114, 0x0115, 0x0116, 0x0117, 0x0118 + .2byte 0x2101, 0x2102, 0x2103, 0x2104, 0x2105, 0x2106, 0x2107, 0x2108, 0x2111, 0x2112, 0x2113, 0x2114, 0x2115, 0x2116, 0x2117, 0x2118 + .align 2 gUnknown_085723DC:: @ 85723DC - .incbin "baserom.gba", 0x5723dc, 0x20 + .incbin "graphics/unknown/unknown_5723DC.gbapal" + .align 2 gUnknown_085723FC:: @ 85723FC - .incbin "baserom.gba", 0x5723fc, 0x20 + .incbin "graphics/unknown/unknown_5723FC.gbapal" + .align 2 gUnknown_0857241C:: @ 857241C - .incbin "baserom.gba", 0x57241c, 0x20 + .incbin "graphics/unknown/unknown_57241C.gbapal" + .align 2 gUnknown_0857243C:: @ 857243C - .incbin "baserom.gba", 0x57243c, 0x20 + .incbin "graphics/unknown/unknown_57243C.gbapal" + .align 1 gUnknown_0857245C:: @ 857245C - .incbin "baserom.gba", 0x57245c, 0x48 + .2byte 0x014c, 0x014d, 0x014e, 0x014f, 0x0170, 0x0171, 0x0172, 0x0173, 0x0174, 0x015c, 0x015d, 0x015e, 0x015f, 0x0180, 0x0181, 0x0182 + .2byte 0x0183, 0x0184, 0x0175, 0x0176, 0x0177, 0x0178, 0x0179, 0x017a, 0x017b, 0x017c, 0x017d, 0x0185, 0x0186, 0x0187, 0x0188, 0x0189 + .2byte 0x018a, 0x018b, 0x018c, 0x018d + .align 1 gUnknown_085724A4:: @ 85724A4 - .incbin "baserom.gba", 0x5724a4, 0x18 + .2byte 0x1140, 0x1141, 0x1141, 0x1142, 0x1150, 0x1151, 0x1151, 0x1152, 0x1160, 0x1161, 0x1161, 0x1162 + .align 1 gUnknown_085724BC:: @ 85724BC - .incbin "baserom.gba", 0x5724bc, 0x18 + .2byte 0x1143, 0x1144, 0x1144, 0x1145, 0x1153, 0x1154, 0x1154, 0x1155, 0x1163, 0x1164, 0x1164, 0x1165 + .align 2 gUnknown_085724D4:: @ 85724D4 - .incbin "baserom.gba", 0x5724d4, 0x20 + .incbin "graphics/pokemon_storage/waveform.gbapal" + .align 2 gUnknown_085724F4:: @ 85724F4 - .incbin "baserom.gba", 0x5724f4, 0x200 + .incbin "graphics/pokemon_storage/waveform.4bpp" + + .align 2 +gUnknown_085726B4:: @ 85726B4 + .incbin "graphics/unused/unknown_5726B4.gbapal" + .align 2 gUnknown_085726F4:: @ 85726F4 - .incbin "baserom.gba", 0x5726f4, 0x20 + .incbin "graphics/unknown/unknown_5726F4.gbapal" + .align 2 gUnknown_08572714:: @ 8572714 - .incbin "baserom.gba", 0x572714, 0x20 + window_template 0x01, 0x00, 0x0b, 0x09, 0x07, 0x03, 0x00c0 + window_template 0x00, 0x0b, 0x11, 0x12, 0x02, 0x0f, 0x0014 + window_template 0x00, 0x00, 0x0d, 0x15, 0x07, 0x0f, 0x0014 + window_template_terminator + .align 2 gUnknown_08572734:: @ 8572734 - .incbin "baserom.gba", 0x572734, 0x10 + .4byte 0x000001d0, 0x004011e5, 0x000023ba, 0x000031ff + .align 2 gUnknown_08572744:: @ 8572744 obj_pal gUnknown_085724D4, 0xDACA + .align 2 gUnknown_0857274C:: @ 857274C obj_tiles gUnknown_085724F4, 0x1C0, 5 @@ -104,7 +138,6 @@ gUnknown_0857276C:: @ 857276C .4byte gUnknown_085EBA38, 0 .align 2 - gUnknown_08572864:: @ 8572864 window_template 0, 0x18, 0xB, 5, 4, 0xF, 0x5C @@ -180,14 +213,326 @@ gSpriteAffineAnimTable_857291C:: @ 857291C .4byte gSpriteAffineAnim_85728F4 .4byte gSpriteAffineAnim_8572904 -gUnknown_08572924:: @ 8572924 - .incbin "baserom.gba", 0x572924, 0x4c50 + .align 2 +gWallpaperPalettes_Forest:: @ 8572924 + .incbin "graphics/pokemon_storage/forest_frame.gbapal" + .incbin "graphics/pokemon_storage/forest_bg.gbapal" + + .align 2 +gWallpaperTiles_Forest: @ 8572964 + .incbin "graphics/pokemon_storage/forest.4bpp.lz" + + .align 2 +gWallpaperTilemap_Forest:: @ 8572DE8 + .incbin "graphics/pokemon_storage/forest.bin.lz" + + .align 2 +gWallpaperPalettes_City: @ 8572EC8 + .incbin "graphics/pokemon_storage/city_frame.gbapal" + .incbin "graphics/pokemon_storage/city_bg.gbapal" + + .align 2 +gWallpaperTiles_City: @ 8572F08 + .incbin "graphics/pokemon_storage/city.4bpp.lz" + + .align 2 +gWallpaperTilemap_City: @ 8573220 + .incbin "graphics/pokemon_storage/city.bin.lz" + + .align 2 +gWallpaperPalettes_Desert: @ 85732FC + .incbin "graphics/pokemon_storage/desert_frame.gbapal" + .incbin "graphics/pokemon_storage/desert_bg.gbapal" + + .align 2 +gWallpaperTiles_Desert: @ 857333C + .incbin "graphics/pokemon_storage/desert.4bpp.lz" + + .align 2 +gWallpaperTilemap_Desert: @ 85736F0 + .incbin "graphics/pokemon_storage/desert.bin.lz" + + .align 2 +gWallpaperPalettes_Savanna: @ 85737EC + .incbin "graphics/pokemon_storage/savanna_frame.gbapal" + .incbin "graphics/pokemon_storage/savanna_bg.gbapal" + + .align 2 +gWallpaperTiles_Savanna: @ 857382C + .incbin "graphics/pokemon_storage/savanna.4bpp.lz" + + .align 2 +gWallpaperTilemap_Savanna: @ 8573C40 + .incbin "graphics/pokemon_storage/savanna.bin.lz" + + .align 2 +gWallpaperPalettes_Crag: @ 8573D44 + .incbin "graphics/pokemon_storage/crag_frame.gbapal" + .incbin "graphics/pokemon_storage/crag_bg.gbapal" + .align 2 +gWallpaperTiles_Crag: @ 8573D84 + .incbin "graphics/pokemon_storage/crag.4bpp.lz" + + .align 2 +gWallpaperTilemap_Crag: @ 8574180 + .incbin "graphics/pokemon_storage/crag.bin.lz" + + .align 2 +gWallpaperPalettes_Volcano: @ 8573D44 + .incbin "graphics/pokemon_storage/volcano_frame.gbapal" + .incbin "graphics/pokemon_storage/volcano_bg.gbapal" + + .align 2 +gWallpaperTiles_Volcano: @ 8573D84 + .incbin "graphics/pokemon_storage/volcano.4bpp.lz" + + .align 2 +gWallpaperTilemap_Volcano: @ 85747A0 + .incbin "graphics/pokemon_storage/volcano.bin.lz" + + .align 2 +gWallpaperPalettes_Snow: @ 85748DC + .incbin "graphics/pokemon_storage/snow_frame.gbapal" + .incbin "graphics/pokemon_storage/snow_bg.gbapal" + + .align 2 +gWallpaperTiles_Snow: @ 857491C + .incbin "graphics/pokemon_storage/snow.4bpp.lz" + + .align 2 +gWallpaperTilemap_Snow: @ 8574D7C + .incbin "graphics/pokemon_storage/snow.bin.lz" + + .align 2 +gWallpaperPalettes_Cave: @ 8574E88 + .incbin "graphics/pokemon_storage/cave_frame.gbapal" + .incbin "graphics/pokemon_storage/cave_bg.gbapal" + + .align 2 +gWallpaperTiles_Cave: @ 8574EC8 + .incbin "graphics/pokemon_storage/cave.4bpp.lz" + + .align 2 +gWallpaperTilemap_Cave: @ 85752A0 + .incbin "graphics/pokemon_storage/cave.bin.lz" + + .align 2 +gWallpaperPalettes_Beach: @ 8575378 + .incbin "graphics/pokemon_storage/beach_frame.gbapal" + .incbin "graphics/pokemon_storage/beach_bg.gbapal" + + .align 2 +gWallpaperTiles_Beach: @ 85753B8 + .incbin "graphics/pokemon_storage/beach.4bpp.lz" + + .align 2 +gWallpaperTilemap_Beach: @ 8575788 + .incbin "graphics/pokemon_storage/beach.bin.lz" + + .align 2 +gWallpaperPalettes_Seafloor: @ 8575888 + .incbin "graphics/pokemon_storage/seafloor_frame.gbapal" + .incbin "graphics/pokemon_storage/seafloor_bg.gbapal" + + .align 2 +gWallpaperTiles_Seafloor: @ 85758C8 + .incbin "graphics/pokemon_storage/seafloor.4bpp.lz" + + .align 2 +gWallpaperTilemap_Seafloor: @ 8575BC4 + .incbin "graphics/pokemon_storage/seafloor.bin.lz" + + .align 2 +gWallpaperPalettes_River: @ 8575CD8 + .incbin "graphics/pokemon_storage/river_frame.gbapal" + .incbin "graphics/pokemon_storage/river_bg.gbapal" + + .align 2 +gWallpaperTiles_River: @ 8575D18 + .incbin "graphics/pokemon_storage/river.4bpp.lz" + + .align 2 +gWallpaperTilemap_River: @ 8576100 + .incbin "graphics/pokemon_storage/river.bin.lz" + + .align 2 +gWallpaperPalettes_Sky: @ 85761F8 + .incbin "graphics/pokemon_storage/sky_frame.gbapal" + .incbin "graphics/pokemon_storage/sky_bg.gbapal" + + .align 2 +gWallpaperTiles_Sky: @ 8576238 + .incbin "graphics/pokemon_storage/sky.4bpp.lz" + + .align 2 +gWallpaperTilemap_Sky: @ 85765C0 + .incbin "graphics/pokemon_storage/sky.bin.lz" + + .align 2 +gWallpaperPalettes_Bubbles: @ 85766B0 + .incbin "graphics/pokemon_storage/bubbles_frame.gbapal" + .incbin "graphics/pokemon_storage/bubbles_bg.gbapal" + + .align 2 +gWallpaperTiles_Bubbles: @ 85766F0 + .incbin "graphics/pokemon_storage/bubbles.4bpp.lz" + + .align 2 +gWallpaperTilemap_Bubbles: @ 85769B8 + .incbin "graphics/pokemon_storage/bubbles.bin.lz" + + .align 2 +gWallpaperPalettes_Pokecenter: @ 8576AB8 + .incbin "graphics/pokemon_storage/pokecenter_frame.gbapal" + .incbin "graphics/pokemon_storage/pokecenter_bg.gbapal" + + .align 2 +gWallpaperTiles_Pokecenter: @ 8576AF8 + .incbin "graphics/pokemon_storage/pokecenter.4bpp.lz" + + .align 2 +gWallpaperTilemap_Pokecenter: @ 8576D74 + .incbin "graphics/pokemon_storage/pokecenter.bin.lz" + + .align 2 +gWallpaperPalettes_Machine: @ 8576E74 + .incbin "graphics/pokemon_storage/machine_frame.gbapal" + .incbin "graphics/pokemon_storage/machine_bg.gbapal" + + .align 2 +gWallpaperTiles_Machine: @ 8576EB4 + .incbin "graphics/pokemon_storage/machine.4bpp.lz" + + .align 2 +gWallpaperTilemap_Machine: @ 8577108 + .incbin "graphics/pokemon_storage/machine.bin.lz" + + .align 2 +gWallpaperPalettes_Plain: @ 85771CC + .incbin "graphics/pokemon_storage/plain_frame.gbapal" + .incbin "graphics/pokemon_storage/plain_bg.gbapal" + + .align 2 +gWallpaperTiles_Plain: @ 857720C + .incbin "graphics/pokemon_storage/plain.4bpp.lz" + + .align 2 +gWallpaperTilemap_Plain: @ 857732C + .incbin "graphics/pokemon_storage/plain.bin.lz" + +@ 12×18 tilemap + .incbin "graphics/unused/tilemap_5773C4.bin" + + .align 1 gUnknown_08577574:: @ 8577574 - .incbin "baserom.gba", 0x577574, 0x44 + .2byte 0x1CE7, 0x7FFF + .2byte 0x1CE7, 0x7FFF + .2byte 0x1CE7, 0x7FFF + .2byte 0x1CE7, 0x7FFF + .2byte 0x1CE7, 0x7FFF + .2byte 0x1CE7, 0x7FFF + .2byte 0x1CE7, 0x7FFF + .2byte 0x1CE7, 0x7FFF + .2byte 0x1CE7, 0x7FFF + .2byte 0x1CE7, 0x7FFF + .2byte 0x1CE7, 0x7FFF + .2byte 0x1CE7, 0x7FFF + .2byte 0x1CE7, 0x7FFF + .2byte 0x1CE7, 0x7FFF + .2byte 0x1CE7, 0x7FFF + .2byte 0x1CE7, 0x7FFF + .2byte 0x1CE7, 0x7FFF + + .align 2 +gWallpaperTable:: @ 85775B8 + @ Forest + .4byte gWallpaperTiles_Forest + .4byte gWallpaperTilemap_Forest + .4byte gWallpaperPalettes_Forest + + @ City + .4byte gWallpaperTiles_City + .4byte gWallpaperTilemap_City + .4byte gWallpaperPalettes_City + + @ Desert + .4byte gWallpaperTiles_Desert + .4byte gWallpaperTilemap_Desert + .4byte gWallpaperPalettes_Desert + + @ Savanna + .4byte gWallpaperTiles_Savanna + .4byte gWallpaperTilemap_Savanna + .4byte gWallpaperPalettes_Savanna + + @ Crag + .4byte gWallpaperTiles_Crag + .4byte gWallpaperTilemap_Crag + .4byte gWallpaperPalettes_Crag + + @ Volcano + .4byte gWallpaperTiles_Volcano + .4byte gWallpaperTilemap_Volcano + .4byte gWallpaperPalettes_Volcano + + @ Snow + .4byte gWallpaperTiles_Snow + .4byte gWallpaperTilemap_Snow + .4byte gWallpaperPalettes_Snow + + @ Cave + .4byte gWallpaperTiles_Cave + .4byte gWallpaperTilemap_Cave + .4byte gWallpaperPalettes_Cave + + @ Beach + .4byte gWallpaperTiles_Beach + .4byte gWallpaperTilemap_Beach + .4byte gWallpaperPalettes_Beach + + @ Seafloor + .4byte gWallpaperTiles_Seafloor + .4byte gWallpaperTilemap_Seafloor + .4byte gWallpaperPalettes_Seafloor + + @ River + .4byte gWallpaperTiles_River + .4byte gWallpaperTilemap_River + .4byte gWallpaperPalettes_River + + @ Sky + .4byte gWallpaperTiles_Sky + .4byte gWallpaperTilemap_Sky + .4byte gWallpaperPalettes_Sky + + @ Bubbles + .4byte gWallpaperTiles_Bubbles + .4byte gWallpaperTilemap_Bubbles + .4byte gWallpaperPalettes_Bubbles + + @ Pokecenter + .4byte gWallpaperTiles_Pokecenter + .4byte gWallpaperTilemap_Pokecenter + .4byte gWallpaperPalettes_Pokecenter + + @ Machine + .4byte gWallpaperTiles_Machine + .4byte gWallpaperTilemap_Machine + .4byte gWallpaperPalettes_Machine + + @ Plain + .4byte gWallpaperTiles_Plain + .4byte gWallpaperTilemap_Plain + .4byte gWallpaperPalettes_Plain -gUnknown_085775B8:: @ 85775B8 - .incbin "baserom.gba", 0x5775b8, 0x398c + .align 2 +PCGfx_Arrow: @ 8577678 + .incbin "graphics/pokemon_storage/arrow.4bpp" + + .align 2 +gUnknown_085776F8:: @ 85776F8 + .incbin "baserom.gba", 0x5776F8, 0x384c gUnknown_0857AF44:: @ 857AF44 .incbin "baserom.gba", 0x57af44, 0xc0 diff --git a/graphics/pokemon_storage/arrow.png b/graphics/pokemon_storage/arrow.png Binary files differnew file mode 100644 index 000000000..ec1202319 --- /dev/null +++ b/graphics/pokemon_storage/arrow.png diff --git a/graphics/pokemon_storage/beach.bin b/graphics/pokemon_storage/beach.bin Binary files differnew file mode 100644 index 000000000..42b834dbd --- /dev/null +++ b/graphics/pokemon_storage/beach.bin diff --git a/graphics/pokemon_storage/beach_bg.png b/graphics/pokemon_storage/beach_bg.png Binary files differnew file mode 100644 index 000000000..49f169084 --- /dev/null +++ b/graphics/pokemon_storage/beach_bg.png diff --git a/graphics/pokemon_storage/beach_frame.png b/graphics/pokemon_storage/beach_frame.png Binary files differnew file mode 100644 index 000000000..eae14b95a --- /dev/null +++ b/graphics/pokemon_storage/beach_frame.png diff --git a/graphics/pokemon_storage/box_bg1.pal b/graphics/pokemon_storage/box_bg1.pal new file mode 100644 index 000000000..52ac12110 --- /dev/null +++ b/graphics/pokemon_storage/box_bg1.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +106 205 106 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/pokemon_storage/box_selection_popup_center.png b/graphics/pokemon_storage/box_selection_popup_center.png Binary files differnew file mode 100644 index 000000000..f7ab30276 --- /dev/null +++ b/graphics/pokemon_storage/box_selection_popup_center.png diff --git a/graphics/pokemon_storage/box_selection_popup_sides.png b/graphics/pokemon_storage/box_selection_popup_sides.png Binary files differnew file mode 100644 index 000000000..a0140dc87 --- /dev/null +++ b/graphics/pokemon_storage/box_selection_popup_sides.png diff --git a/graphics/pokemon_storage/bubbles.bin b/graphics/pokemon_storage/bubbles.bin Binary files differnew file mode 100644 index 000000000..c31792b81 --- /dev/null +++ b/graphics/pokemon_storage/bubbles.bin diff --git a/graphics/pokemon_storage/bubbles_bg.png b/graphics/pokemon_storage/bubbles_bg.png Binary files differnew file mode 100644 index 000000000..fe67c1b39 --- /dev/null +++ b/graphics/pokemon_storage/bubbles_bg.png diff --git a/graphics/pokemon_storage/bubbles_frame.png b/graphics/pokemon_storage/bubbles_frame.png Binary files differnew file mode 100644 index 000000000..4d76fbbbf --- /dev/null +++ b/graphics/pokemon_storage/bubbles_frame.png diff --git a/graphics/pokemon_storage/cave.bin b/graphics/pokemon_storage/cave.bin Binary files differnew file mode 100644 index 000000000..112d4724d --- /dev/null +++ b/graphics/pokemon_storage/cave.bin diff --git a/graphics/pokemon_storage/cave_bg.png b/graphics/pokemon_storage/cave_bg.png Binary files differnew file mode 100644 index 000000000..421221634 --- /dev/null +++ b/graphics/pokemon_storage/cave_bg.png diff --git a/graphics/pokemon_storage/cave_frame.png b/graphics/pokemon_storage/cave_frame.png Binary files differnew file mode 100644 index 000000000..35cca742c --- /dev/null +++ b/graphics/pokemon_storage/cave_frame.png diff --git a/graphics/pokemon_storage/city.bin b/graphics/pokemon_storage/city.bin Binary files differnew file mode 100644 index 000000000..ff0785a96 --- /dev/null +++ b/graphics/pokemon_storage/city.bin diff --git a/graphics/pokemon_storage/city_bg.png b/graphics/pokemon_storage/city_bg.png Binary files differnew file mode 100644 index 000000000..b221c2596 --- /dev/null +++ b/graphics/pokemon_storage/city_bg.png diff --git a/graphics/pokemon_storage/city_frame.png b/graphics/pokemon_storage/city_frame.png Binary files differnew file mode 100644 index 000000000..82e4731ef --- /dev/null +++ b/graphics/pokemon_storage/city_frame.png diff --git a/graphics/pokemon_storage/crag.bin b/graphics/pokemon_storage/crag.bin Binary files differnew file mode 100644 index 000000000..5c7c44cd2 --- /dev/null +++ b/graphics/pokemon_storage/crag.bin diff --git a/graphics/pokemon_storage/crag_bg.png b/graphics/pokemon_storage/crag_bg.png Binary files differnew file mode 100644 index 000000000..13b536358 --- /dev/null +++ b/graphics/pokemon_storage/crag_bg.png diff --git a/graphics/pokemon_storage/crag_frame.png b/graphics/pokemon_storage/crag_frame.png Binary files differnew file mode 100644 index 000000000..b67c6efa1 --- /dev/null +++ b/graphics/pokemon_storage/crag_frame.png diff --git a/graphics/pokemon_storage/desert.bin b/graphics/pokemon_storage/desert.bin Binary files differnew file mode 100644 index 000000000..98464faff --- /dev/null +++ b/graphics/pokemon_storage/desert.bin diff --git a/graphics/pokemon_storage/desert_bg.png b/graphics/pokemon_storage/desert_bg.png Binary files differnew file mode 100644 index 000000000..535fe9cb0 --- /dev/null +++ b/graphics/pokemon_storage/desert_bg.png diff --git a/graphics/pokemon_storage/desert_frame.png b/graphics/pokemon_storage/desert_frame.png Binary files differnew file mode 100644 index 000000000..a46e72e7f --- /dev/null +++ b/graphics/pokemon_storage/desert_frame.png diff --git a/graphics/pokemon_storage/forest.bin b/graphics/pokemon_storage/forest.bin Binary files differnew file mode 100644 index 000000000..5439f1274 --- /dev/null +++ b/graphics/pokemon_storage/forest.bin diff --git a/graphics/pokemon_storage/forest_bg.png b/graphics/pokemon_storage/forest_bg.png Binary files differnew file mode 100644 index 000000000..c81182807 --- /dev/null +++ b/graphics/pokemon_storage/forest_bg.png diff --git a/graphics/pokemon_storage/forest_frame.png b/graphics/pokemon_storage/forest_frame.png Binary files differnew file mode 100644 index 000000000..c205e8944 --- /dev/null +++ b/graphics/pokemon_storage/forest_frame.png diff --git a/graphics/pokemon_storage/machine.bin b/graphics/pokemon_storage/machine.bin Binary files differnew file mode 100644 index 000000000..123dc02e0 --- /dev/null +++ b/graphics/pokemon_storage/machine.bin diff --git a/graphics/pokemon_storage/machine_bg.png b/graphics/pokemon_storage/machine_bg.png Binary files differnew file mode 100644 index 000000000..648229ed2 --- /dev/null +++ b/graphics/pokemon_storage/machine_bg.png diff --git a/graphics/pokemon_storage/machine_frame.png b/graphics/pokemon_storage/machine_frame.png Binary files differnew file mode 100644 index 000000000..7b14a0d0d --- /dev/null +++ b/graphics/pokemon_storage/machine_frame.png diff --git a/graphics/pokemon_storage/plain.bin b/graphics/pokemon_storage/plain.bin Binary files differnew file mode 100644 index 000000000..1813620a4 --- /dev/null +++ b/graphics/pokemon_storage/plain.bin diff --git a/graphics/pokemon_storage/plain_bg.png b/graphics/pokemon_storage/plain_bg.png Binary files differnew file mode 100644 index 000000000..79218ca9d --- /dev/null +++ b/graphics/pokemon_storage/plain_bg.png diff --git a/graphics/pokemon_storage/plain_frame.png b/graphics/pokemon_storage/plain_frame.png Binary files differnew file mode 100644 index 000000000..e3eea8728 --- /dev/null +++ b/graphics/pokemon_storage/plain_frame.png diff --git a/graphics/pokemon_storage/pokecenter.bin b/graphics/pokemon_storage/pokecenter.bin Binary files differnew file mode 100644 index 000000000..c7b6405e1 --- /dev/null +++ b/graphics/pokemon_storage/pokecenter.bin diff --git a/graphics/pokemon_storage/pokecenter_bg.png b/graphics/pokemon_storage/pokecenter_bg.png Binary files differnew file mode 100644 index 000000000..52b100357 --- /dev/null +++ b/graphics/pokemon_storage/pokecenter_bg.png diff --git a/graphics/pokemon_storage/pokecenter_frame.png b/graphics/pokemon_storage/pokecenter_frame.png Binary files differnew file mode 100644 index 000000000..3a32c4e64 --- /dev/null +++ b/graphics/pokemon_storage/pokecenter_frame.png diff --git a/graphics/pokemon_storage/river.bin b/graphics/pokemon_storage/river.bin Binary files differnew file mode 100644 index 000000000..ca4d56f8a --- /dev/null +++ b/graphics/pokemon_storage/river.bin diff --git a/graphics/pokemon_storage/river_bg.png b/graphics/pokemon_storage/river_bg.png Binary files differnew file mode 100644 index 000000000..ab76e28e3 --- /dev/null +++ b/graphics/pokemon_storage/river_bg.png diff --git a/graphics/pokemon_storage/river_frame.png b/graphics/pokemon_storage/river_frame.png Binary files differnew file mode 100644 index 000000000..f6a87236b --- /dev/null +++ b/graphics/pokemon_storage/river_frame.png diff --git a/graphics/pokemon_storage/savanna.bin b/graphics/pokemon_storage/savanna.bin Binary files differnew file mode 100644 index 000000000..ae9911446 --- /dev/null +++ b/graphics/pokemon_storage/savanna.bin diff --git a/graphics/pokemon_storage/savanna_bg.png b/graphics/pokemon_storage/savanna_bg.png Binary files differnew file mode 100644 index 000000000..24fc476f6 --- /dev/null +++ b/graphics/pokemon_storage/savanna_bg.png diff --git a/graphics/pokemon_storage/savanna_frame.png b/graphics/pokemon_storage/savanna_frame.png Binary files differnew file mode 100644 index 000000000..b66494d79 --- /dev/null +++ b/graphics/pokemon_storage/savanna_frame.png diff --git a/graphics/pokemon_storage/scrolling_bg.bin b/graphics/pokemon_storage/scrolling_bg.bin Binary files differnew file mode 100644 index 000000000..25b6cf240 --- /dev/null +++ b/graphics/pokemon_storage/scrolling_bg.bin diff --git a/graphics/pokemon_storage/scrolling_bg.png b/graphics/pokemon_storage/scrolling_bg.png Binary files differnew file mode 100644 index 000000000..8be861a26 --- /dev/null +++ b/graphics/pokemon_storage/scrolling_bg.png diff --git a/graphics/pokemon_storage/seafloor.bin b/graphics/pokemon_storage/seafloor.bin Binary files differnew file mode 100644 index 000000000..aa8d671d4 --- /dev/null +++ b/graphics/pokemon_storage/seafloor.bin diff --git a/graphics/pokemon_storage/seafloor_bg.png b/graphics/pokemon_storage/seafloor_bg.png Binary files differnew file mode 100644 index 000000000..841642946 --- /dev/null +++ b/graphics/pokemon_storage/seafloor_bg.png diff --git a/graphics/pokemon_storage/seafloor_frame.png b/graphics/pokemon_storage/seafloor_frame.png Binary files differnew file mode 100644 index 000000000..494145558 --- /dev/null +++ b/graphics/pokemon_storage/seafloor_frame.png diff --git a/graphics/pokemon_storage/sky.bin b/graphics/pokemon_storage/sky.bin Binary files differnew file mode 100644 index 000000000..1091d2a62 --- /dev/null +++ b/graphics/pokemon_storage/sky.bin diff --git a/graphics/pokemon_storage/sky_bg.png b/graphics/pokemon_storage/sky_bg.png Binary files differnew file mode 100644 index 000000000..f561cef53 --- /dev/null +++ b/graphics/pokemon_storage/sky_bg.png diff --git a/graphics/pokemon_storage/sky_frame.png b/graphics/pokemon_storage/sky_frame.png Binary files differnew file mode 100644 index 000000000..83c1e9a0b --- /dev/null +++ b/graphics/pokemon_storage/sky_frame.png diff --git a/graphics/pokemon_storage/snow.bin b/graphics/pokemon_storage/snow.bin Binary files differnew file mode 100644 index 000000000..5dac9c110 --- /dev/null +++ b/graphics/pokemon_storage/snow.bin diff --git a/graphics/pokemon_storage/snow_bg.png b/graphics/pokemon_storage/snow_bg.png Binary files differnew file mode 100644 index 000000000..5e81e4980 --- /dev/null +++ b/graphics/pokemon_storage/snow_bg.png diff --git a/graphics/pokemon_storage/snow_frame.png b/graphics/pokemon_storage/snow_frame.png Binary files differnew file mode 100644 index 000000000..529fff66e --- /dev/null +++ b/graphics/pokemon_storage/snow_frame.png diff --git a/graphics/pokemon_storage/volcano.bin b/graphics/pokemon_storage/volcano.bin Binary files differnew file mode 100644 index 000000000..0dbaf03a3 --- /dev/null +++ b/graphics/pokemon_storage/volcano.bin diff --git a/graphics/pokemon_storage/volcano_bg.png b/graphics/pokemon_storage/volcano_bg.png Binary files differnew file mode 100644 index 000000000..25f391e8b --- /dev/null +++ b/graphics/pokemon_storage/volcano_bg.png diff --git a/graphics/pokemon_storage/volcano_frame.png b/graphics/pokemon_storage/volcano_frame.png Binary files differnew file mode 100644 index 000000000..edfef1247 --- /dev/null +++ b/graphics/pokemon_storage/volcano_frame.png diff --git a/graphics/pokemon_storage/waveform.png b/graphics/pokemon_storage/waveform.png Binary files differnew file mode 100644 index 000000000..12eeef86b --- /dev/null +++ b/graphics/pokemon_storage/waveform.png diff --git a/graphics/unknown/unknown_57173C.pal b/graphics/unknown/unknown_57173C.pal new file mode 100644 index 000000000..3743fa228 --- /dev/null +++ b/graphics/unknown/unknown_57173C.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +246 222 115 +246 230 180 +205 123 0 +123 74 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/unknown/unknown_572280.pal b/graphics/unknown/unknown_572280.pal new file mode 100644 index 000000000..bf5197761 --- /dev/null +++ b/graphics/unknown/unknown_572280.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 90 57 +148 148 172 +255 255 255 +0 0 0 +222 222 246 +90 189 238 +164 164 180 +98 98 115 +0 0 0 +82 82 90 +189 238 98 +164 222 74 +164 230 74 +180 230 115 +148 205 57 +148 148 172 diff --git a/graphics/unknown/unknown_5722A0.bin b/graphics/unknown/unknown_5722A0.bin Binary files differnew file mode 100644 index 000000000..050dd78f9 --- /dev/null +++ b/graphics/unknown/unknown_5722A0.bin diff --git a/graphics/unknown/unknown_5723DC.pal b/graphics/unknown/unknown_5723DC.pal new file mode 100644 index 000000000..1fda7f05a --- /dev/null +++ b/graphics/unknown/unknown_5723DC.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +148 148 172 +115 115 123 +82 82 90 +148 148 172 +246 172 82 +164 164 180 +0 0 0 +164 205 246 +123 180 213 +255 222 148 +213 230 255 +180 213 246 +156 205 238 +255 255 255 +90 255 238 diff --git a/graphics/unknown/unknown_5723FC.pal b/graphics/unknown/unknown_5723FC.pal new file mode 100644 index 000000000..42bb76663 --- /dev/null +++ b/graphics/unknown/unknown_5723FC.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 246 148 +148 148 172 +115 115 123 +82 82 90 +139 139 164 +164 123 0 +164 164 180 +0 0 0 +164 205 246 +123 180 213 +197 189 24 +213 230 255 +180 213 246 +156 205 238 +180 180 180 +90 255 238 diff --git a/graphics/unknown/unknown_57241C.pal b/graphics/unknown/unknown_57241C.pal new file mode 100644 index 000000000..087a84a69 --- /dev/null +++ b/graphics/unknown/unknown_57241C.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +148 148 172 +255 255 255 +0 0 0 +123 189 255 +0 123 255 +255 131 131 +172 24 24 +255 238 230 +255 230 213 +255 222 205 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/unknown/unknown_57243C.pal b/graphics/unknown/unknown_57243C.pal new file mode 100644 index 000000000..74876ded3 --- /dev/null +++ b/graphics/unknown/unknown_57243C.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +148 148 172 +255 255 255 +0 0 0 +123 189 255 +0 123 255 +255 131 131 +172 24 24 +230 246 255 +222 238 246 +213 238 246 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/unknown/unknown_5726F4.pal b/graphics/unknown/unknown_5726F4.pal new file mode 100644 index 000000000..b9c6f46de --- /dev/null +++ b/graphics/unknown/unknown_5726F4.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +255 255 255 +98 98 98 +213 213 205 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/unused/tilemap_5773C4.bin b/graphics/unused/tilemap_5773C4.bin new file mode 100644 index 000000000..95e7b00d5 --- /dev/null +++ b/graphics/unused/tilemap_5773C4.bin @@ -0,0 +1 @@ +"®"¯"°"±"²"³"´"µ"¶"®"·"¸"¹"º"»"¼"½"¾"¿"À"Á"¹"Â"Ã"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Å"Ã"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Å"Ã"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Å"Ã"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Å"Ã"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Å"Ã"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Å"Ã"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Å"Ã"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Å"Æ"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Å"Ç"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Å"Ç"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Å"Ç"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Å"Ç"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Å"Ç"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Å"Ç"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Ä"Å"È"É"É"É"É"É"É"É"É"É"É"Ê"
\ No newline at end of file diff --git a/graphics/unused/unknown_5726B4.pal b/graphics/unused/unknown_5726B4.pal new file mode 100644 index 000000000..a28f6d332 --- /dev/null +++ b/graphics/unused/unknown_5726B4.pal @@ -0,0 +1,35 @@ +JASC-PAL +0100 +32 +0 0 0 +65 205 255 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 139 189 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +148 148 172 +0 0 0 +255 156 148 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +189 90 82 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +148 148 172 diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk index 9e2f6b8e5..9fffa279f 100644 --- a/graphics_file_rules.mk +++ b/graphics_file_rules.mk @@ -1,296 +1,297 @@ -monstillfrontdir := graphics/pokemon/front_pics -monbackdir := graphics/pokemon/back_pics -monfrontdir := graphics/pokemon/anim_front_pics -monpaldir := graphics/pokemon/palettes -tilesetdir := data/tilesets -fontdir := data/graphics/fonts -menudir := graphics/interface -btanimgfxdir := graphics/battle_anims/sprites -unusedgfxdir := graphics/unused -unknowngfxdir := graphics/unknown -btintgfxdir := graphics/battle_interface -masksgfxdir := graphics/battle_anims/masks -bttransgfxdir := graphics/battle_transitions -typesdir := graphics/types -rayquazadir := graphics/rayquaza_scene -roulettegfxdir := graphics/roulette -pknvdir := graphics/pokenav/ -pknvoptionsdir := graphics/pokenav/options +MONSTILLFRONTGFXDIR := graphics/pokemon/front_pics +MONBACKGFXDIR := graphics/pokemon/back_pics +MONFRONTGFXDIR := graphics/pokemon/anim_front_pics +MONPALDIR := graphics/pokemon/palettes +TILESETGFXDIR := data/tilesets +FONTGFXDIR := data/graphics/fonts +MENUGFXDIR := graphics/interface +BTLANMSPRGFXDIR := graphics/battle_anims/sprites +UNUSEDGFXDIR := graphics/unused +UNKNOWNGFXDIR := graphics/unknown +BATINTGFXDIR := graphics/battle_interface +MASKSGFXDIR := graphics/battle_anims/masks +BATTRANSGFXDIR := graphics/battle_transitions +TYPESGFXDIR := graphics/types +RAYQUAZAGFXDIR := graphics/rayquaza_scene +ROULETTEGFXDIR := graphics/roulette +PKNAVGFXDIR := graphics/pokenav/ +PKNAVOPTIONSGFXDIR := graphics/pokenav/options +PSSGFXDIR := graphics/pokemon_storage types := normal fight flying poison ground rock bug ghost steel mystery fire water grass electric psychic ice dragon dark contest_types := cool beauty cute smart tough -$(monstillfrontdir)/castform_still_front_pic.4bpp: $(monstillfrontdir)/castform_normal_form_still_front_pic.4bpp \ - $(monstillfrontdir)/castform_sunny_form_still_front_pic.4bpp \ - $(monstillfrontdir)/castform_rainy_form_still_front_pic.4bpp \ - $(monstillfrontdir)/castform_snowy_form_still_front_pic.4bpp +$(MONSTILLFRONTGFXDIR)/castform_still_front_pic.4bpp: $(MONSTILLFRONTGFXDIR)/castform_normal_form_still_front_pic.4bpp \ + $(MONSTILLFRONTGFXDIR)/castform_sunny_form_still_front_pic.4bpp \ + $(MONSTILLFRONTGFXDIR)/castform_rainy_form_still_front_pic.4bpp \ + $(MONSTILLFRONTGFXDIR)/castform_snowy_form_still_front_pic.4bpp @cat $^ >$@ -$(monbackdir)/castform_back_pic.4bpp: $(monbackdir)/castform_normal_form_back_pic.4bpp \ - $(monbackdir)/castform_sunny_form_back_pic.4bpp \ - $(monbackdir)/castform_rainy_form_back_pic.4bpp \ - $(monbackdir)/castform_snowy_form_back_pic.4bpp +$(MONBACKGFXDIR)/castform_back_pic.4bpp: $(MONBACKGFXDIR)/castform_normal_form_back_pic.4bpp \ + $(MONBACKGFXDIR)/castform_sunny_form_back_pic.4bpp \ + $(MONBACKGFXDIR)/castform_rainy_form_back_pic.4bpp \ + $(MONBACKGFXDIR)/castform_snowy_form_back_pic.4bpp @cat $^ >$@ -$(monfrontdir)/castform_front_pic.4bpp: $(monfrontdir)/castform_normal_form_front_pic.4bpp \ - $(monfrontdir)/castform_sunny_form_front_pic.4bpp \ - $(monfrontdir)/castform_rainy_form_front_pic.4bpp \ - $(monfrontdir)/castform_snowy_form_front_pic.4bpp +$(MONFRONTGFXDIR)/castform_front_pic.4bpp: $(MONFRONTGFXDIR)/castform_normal_form_front_pic.4bpp \ + $(MONFRONTGFXDIR)/castform_sunny_form_front_pic.4bpp \ + $(MONFRONTGFXDIR)/castform_rainy_form_front_pic.4bpp \ + $(MONFRONTGFXDIR)/castform_snowy_form_front_pic.4bpp @cat $^ >$@ -$(monpaldir)/castform_palette.gbapal: $(monpaldir)/castform_normal_form_palette.gbapal \ - $(monpaldir)/castform_sunny_form_palette.gbapal \ - $(monpaldir)/castform_rainy_form_palette.gbapal \ - $(monpaldir)/castform_snowy_form_palette.gbapal +$(MONPALDIR)/castform_palette.gbapal: $(MONPALDIR)/castform_normal_form_palette.gbapal \ + $(MONPALDIR)/castform_sunny_form_palette.gbapal \ + $(MONPALDIR)/castform_rainy_form_palette.gbapal \ + $(MONPALDIR)/castform_snowy_form_palette.gbapal @cat $^ >$@ -$(monpaldir)/castform_shiny_palette.gbapal: $(monpaldir)/castform_normal_form_shiny_palette.gbapal \ - $(monpaldir)/castform_sunny_form_shiny_palette.gbapal \ - $(monpaldir)/castform_rainy_form_shiny_palette.gbapal \ - $(monpaldir)/castform_snowy_form_shiny_palette.gbapal +$(MONPALDIR)/castform_shiny_palette.gbapal: $(MONPALDIR)/castform_normal_form_shiny_palette.gbapal \ + $(MONPALDIR)/castform_sunny_form_shiny_palette.gbapal \ + $(MONPALDIR)/castform_rainy_form_shiny_palette.gbapal \ + $(MONPALDIR)/castform_snowy_form_shiny_palette.gbapal @cat $^ >$@ -$(tilesetdir)/secondary/petalburg/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/petalburg/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 159 -$(tilesetdir)/secondary/rustboro/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/rustboro/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 498 -$(tilesetdir)/secondary/dewford/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/dewford/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 503 -$(tilesetdir)/secondary/slateport/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/slateport/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 504 -$(tilesetdir)/secondary/mauville/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/mauville/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 503 -$(tilesetdir)/secondary/lavaridge/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/lavaridge/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 450 -$(tilesetdir)/secondary/fortree/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/fortree/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 493 -$(tilesetdir)/secondary/pacifidlog/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/pacifidlog/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 504 -$(tilesetdir)/secondary/sootopolis/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/sootopolis/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 328 -$(tilesetdir)/secondary/battle_frontier_outside_west/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/battle_frontier_outside_west/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 508 -$(tilesetdir)/secondary/battle_frontier_outside_east/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/battle_frontier_outside_east/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 508 -$(tilesetdir)/primary/building/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/primary/building/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 502 -$(tilesetdir)/secondary/shop/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/shop/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 502 -$(tilesetdir)/secondary/pokemon_center/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/pokemon_center/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 478 -$(tilesetdir)/secondary/cave/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/cave/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 425 -$(tilesetdir)/secondary/pokemon_school/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/pokemon_school/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 278 -$(tilesetdir)/secondary/pokemon_fan_club/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/pokemon_fan_club/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 319 -$(tilesetdir)/secondary/unused_1/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/unused_1/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 17 -$(tilesetdir)/secondary/meteor_falls/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/meteor_falls/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 460 -$(tilesetdir)/secondary/oceanic_museum/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/oceanic_museum/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 319 -$(tilesetdir)/secondary/cable_club/unknown_tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/cable_club/unknown_tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 120 -$(tilesetdir)/secondary/seashore_house/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/seashore_house/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 312 -$(tilesetdir)/secondary/pretty_petal_flower_shop/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/pretty_petal_flower_shop/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 345 -$(tilesetdir)/secondary/pokemon_day_care/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/pokemon_day_care/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 355 -$(tilesetdir)/secondary/secret_base/brown_cave/unused_tiles.4bpp: $(tilesetdir)/secondary/secret_base/brown_cave/tiles.png +$(TILESETGFXDIR)/secondary/secret_base/brown_cave/unused_tiles.4bpp: $(TILESETGFXDIR)/secondary/secret_base/brown_cave/tiles.png $(GFX) $< $@ -num_tiles 82 -$(tilesetdir)/secondary/secret_base/tree/unused_tiles.4bpp: $(tilesetdir)/secondary/secret_base/tree/tiles.png +$(TILESETGFXDIR)/secondary/secret_base/tree/unused_tiles.4bpp: $(TILESETGFXDIR)/secondary/secret_base/tree/tiles.png $(GFX) $< $@ -num_tiles 82 -$(tilesetdir)/secondary/secret_base/shrub/unused_tiles.4bpp: $(tilesetdir)/secondary/secret_base/shrub/tiles.png +$(TILESETGFXDIR)/secondary/secret_base/shrub/unused_tiles.4bpp: $(TILESETGFXDIR)/secondary/secret_base/shrub/tiles.png $(GFX) $< $@ -num_tiles 82 -$(tilesetdir)/secondary/secret_base/blue_cave/unused_tiles.4bpp: $(tilesetdir)/secondary/secret_base/blue_cave/tiles.png +$(TILESETGFXDIR)/secondary/secret_base/blue_cave/unused_tiles.4bpp: $(TILESETGFXDIR)/secondary/secret_base/blue_cave/tiles.png $(GFX) $< $@ -num_tiles 82 -$(tilesetdir)/secondary/secret_base/yellow_cave/unused_tiles.4bpp: $(tilesetdir)/secondary/secret_base/yellow_cave/tiles.png +$(TILESETGFXDIR)/secondary/secret_base/yellow_cave/unused_tiles.4bpp: $(TILESETGFXDIR)/secondary/secret_base/yellow_cave/tiles.png $(GFX) $< $@ -num_tiles 82 -$(tilesetdir)/secondary/secret_base/red_cave/unused_tiles.4bpp: $(tilesetdir)/secondary/secret_base/red_cave/tiles.png +$(TILESETGFXDIR)/secondary/secret_base/red_cave/unused_tiles.4bpp: $(TILESETGFXDIR)/secondary/secret_base/red_cave/tiles.png $(GFX) $< $@ -num_tiles 82 -$(tilesetdir)/secondary/secret_base/brown_cave/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/secret_base/brown_cave/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 83 -$(tilesetdir)/secondary/secret_base/tree/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/secret_base/tree/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 83 -$(tilesetdir)/secondary/secret_base/shrub/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/secret_base/shrub/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 83 -$(tilesetdir)/secondary/secret_base/blue_cave/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/secret_base/blue_cave/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 83 -$(tilesetdir)/secondary/secret_base/yellow_cave/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/secret_base/yellow_cave/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 83 -$(tilesetdir)/secondary/secret_base/red_cave/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/secret_base/red_cave/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 83 -$(tilesetdir)/secondary/inside_of_truck/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/inside_of_truck/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 62 -$(tilesetdir)/secondary/contest/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/contest/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 430 -$(tilesetdir)/secondary/lilycove_museum/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/lilycove_museum/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 431 -$(tilesetdir)/secondary/lab/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/lab/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 500 -$(tilesetdir)/secondary/underwater/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/underwater/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 500 -$(tilesetdir)/secondary/generic_building/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/generic_building/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 509 -$(tilesetdir)/secondary/mauville_game_corner/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/mauville_game_corner/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 469 -$(tilesetdir)/secondary/unused_2/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/unused_2/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 150 -$(tilesetdir)/secondary/rustboro_gym/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/rustboro_gym/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 60 -$(tilesetdir)/secondary/dewford_gym/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/dewford_gym/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 61 -$(tilesetdir)/secondary/lavaridge_gym/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/lavaridge_gym/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 54 -$(tilesetdir)/secondary/petalburg_gym/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/petalburg_gym/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 148 -$(tilesetdir)/secondary/fortree_gym/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/fortree_gym/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 61 -$(tilesetdir)/secondary/mossdeep_gym/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/mossdeep_gym/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 82 -$(tilesetdir)/secondary/sootopolis_gym/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/sootopolis_gym/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 484 -$(tilesetdir)/secondary/trick_house_puzzle/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/trick_house_puzzle/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 294 -$(tilesetdir)/secondary/inside_ship/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/inside_ship/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 342 -$(tilesetdir)/secondary/elite_four/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/elite_four/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 505 -$(tilesetdir)/secondary/battle_frontier/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/battle_frontier/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 310 -$(tilesetdir)/secondary/battle_factory/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/battle_factory/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 424 -$(tilesetdir)/secondary/battle_pike/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/battle_pike/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 382 -$(tilesetdir)/secondary/mirage_tower/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/mirage_tower/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 420 -$(tilesetdir)/secondary/mossdeep_game_corner/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/mossdeep_game_corner/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 95 -$(tilesetdir)/secondary/island_harbor/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/island_harbor/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 503 -$(tilesetdir)/secondary/trainer_hill/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/trainer_hill/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 374 -$(tilesetdir)/secondary/navel_rock/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/navel_rock/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 420 -$(tilesetdir)/secondary/battle_frontier_ranking_hall/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/battle_frontier_ranking_hall/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 136 -$(tilesetdir)/secondary/mystery_events_house/tiles.4bpp: %.4bpp: %.png +$(TILESETGFXDIR)/secondary/mystery_events_house/tiles.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 509 -$(fontdir)/font0.latfont: $(fontdir)/font0_latin.png +$(FONTGFXDIR)/font0.latfont: $(FONTGFXDIR)/font0_latin.png $(GFX) $< $@ -$(fontdir)/font1.latfont: $(fontdir)/font1_latin.png +$(FONTGFXDIR)/font1.latfont: $(FONTGFXDIR)/font1_latin.png $(GFX) $< $@ -$(fontdir)/font2.latfont: $(fontdir)/font2_latin.png +$(FONTGFXDIR)/font2.latfont: $(FONTGFXDIR)/font2_latin.png $(GFX) $< $@ -$(fontdir)/font7.latfont: $(fontdir)/font7_latin.png +$(FONTGFXDIR)/font7.latfont: $(FONTGFXDIR)/font7_latin.png $(GFX) $< $@ -$(fontdir)/font8.latfont: $(fontdir)/font8_latin.png +$(FONTGFXDIR)/font8.latfont: $(FONTGFXDIR)/font8_latin.png $(GFX) $< $@ -$(fontdir)/font0.hwjpnfont: $(fontdir)/font0_japanese.png +$(FONTGFXDIR)/font0.hwjpnfont: $(FONTGFXDIR)/font0_japanese.png $(GFX) $< $@ -$(fontdir)/font1.hwjpnfont: $(fontdir)/font1_japanese.png +$(FONTGFXDIR)/font1.hwjpnfont: $(FONTGFXDIR)/font1_japanese.png $(GFX) $< $@ -$(fontdir)/font9.hwjpnfont: $(fontdir)/font9_japanese.png +$(FONTGFXDIR)/font9.hwjpnfont: $(FONTGFXDIR)/font9_japanese.png $(GFX) $< $@ -$(fontdir)/font2.fwjpnfont: $(fontdir)/font2_japanese.png +$(FONTGFXDIR)/font2.fwjpnfont: $(FONTGFXDIR)/font2_japanese.png $(GFX) $< $@ -$(fontdir)/font6.fwjpnfont: $(fontdir)/font6_braille.png +$(FONTGFXDIR)/font6.fwjpnfont: $(FONTGFXDIR)/font6_braille.png $(GFX) $< $@ -$(fontdir)/unused_frlg_male.fwjpnfont: $(fontdir)/unused_japanese_frlg_male_font.png +$(FONTGFXDIR)/unused_frlg_male.fwjpnfont: $(FONTGFXDIR)/unused_japanese_frlg_male_font.png $(GFX) $< $@ -$(fontdir)/unused_frlg_female.fwjpnfont: $(fontdir)/unused_japanese_frlg_female_font.png +$(FONTGFXDIR)/unused_frlg_female.fwjpnfont: $(FONTGFXDIR)/unused_japanese_frlg_female_font.png $(GFX) $< $@ -$(fontdir)/down_arrow.4bpp: %.4bpp: %.png +$(FONTGFXDIR)/down_arrow.4bpp: %.4bpp: %.png $(GFX) $< $@ -$(fontdir)/down_arrow_rs.4bpp: %.4bpp: %.png +$(FONTGFXDIR)/down_arrow_rs.4bpp: %.4bpp: %.png $(GFX) $< $@ -$(fontdir)/unused_frlg_blanked_down_arrow.4bpp: %.4bpp: %.png +$(FONTGFXDIR)/unused_frlg_blanked_down_arrow.4bpp: %.4bpp: %.png $(GFX) $< $@ -$(fontdir)/unused_frlg_down_arrow.4bpp: %.4bpp: %.png +$(FONTGFXDIR)/unused_frlg_down_arrow.4bpp: %.4bpp: %.png $(GFX) $< $@ -$(fontdir)/keypad_icons.4bpp: %.4bpp: %.png +$(FONTGFXDIR)/keypad_icons.4bpp: %.4bpp: %.png $(GFX) $< $@ graphics/title_screen/pokemon_logo.gbapal: %.gbapal: %.pal @@ -308,179 +309,281 @@ graphics/pokenav/region_map.8bpp: %.8bpp: %.png graphics/misc/japanese_hof.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 29 -$(menudir)/menu.gbapal: $(menudir)/menu_0.gbapal \ - $(menudir)/menu_1.gbapal +$(MENUGFXDIR)/menu.gbapal: $(MENUGFXDIR)/menu_0.gbapal \ + $(MENUGFXDIR)/menu_1.gbapal @cat $^ >$@ -$(btanimgfxdir)/010.4bpp: $(btanimgfxdir)/010_0.4bpp \ - $(btanimgfxdir)/010_1.4bpp \ - $(btanimgfxdir)/010_2.4bpp \ - $(btanimgfxdir)/010_3.4bpp +$(BTLANMSPRGFXDIR)/010.4bpp: $(BTLANMSPRGFXDIR)/010_0.4bpp \ + $(BTLANMSPRGFXDIR)/010_1.4bpp \ + $(BTLANMSPRGFXDIR)/010_2.4bpp \ + $(BTLANMSPRGFXDIR)/010_3.4bpp @cat $^ >$@ -$(unusedgfxdir)/obi_palpak1.gbapal: $(unusedgfxdir)/old_pal1.gbapal \ - $(unusedgfxdir)/old_pal2.gbapal \ - $(unusedgfxdir)/old_pal3.gbapal +$(UNUSEDGFXDIR)/obi_palpak1.gbapal: $(UNUSEDGFXDIR)/old_pal1.gbapal \ + $(UNUSEDGFXDIR)/old_pal2.gbapal \ + $(UNUSEDGFXDIR)/old_pal3.gbapal @cat $^ >$@ -$(unusedgfxdir)/obi_palpak3.gbapal: $(unusedgfxdir)/old_pal5.gbapal \ - $(unusedgfxdir)/old_pal6.gbapal \ - $(unusedgfxdir)/old_pal7.gbapal +$(UNUSEDGFXDIR)/obi_palpak3.gbapal: $(UNUSEDGFXDIR)/old_pal5.gbapal \ + $(UNUSEDGFXDIR)/old_pal6.gbapal \ + $(UNUSEDGFXDIR)/old_pal7.gbapal @cat $^ >$@ -$(unusedgfxdir)/obi1.4bpp: $(unusedgfxdir)/old_bulbasaur.4bpp \ - $(unusedgfxdir)/old_charizard.4bpp +$(UNUSEDGFXDIR)/obi1.4bpp: $(UNUSEDGFXDIR)/old_bulbasaur.4bpp \ + $(UNUSEDGFXDIR)/old_charizard.4bpp @cat $^ >$@ -$(unusedgfxdir)/obi2.4bpp: $(unusedgfxdir)/old_bulbasaur2.4bpp \ - $(unusedgfxdir)/old_battle_interface_1.4bpp \ - $(unusedgfxdir)/old_battle_interface_2.4bpp \ - $(unusedgfxdir)/old_battle_interface_3.4bpp +$(UNUSEDGFXDIR)/obi2.4bpp: $(UNUSEDGFXDIR)/old_bulbasaur2.4bpp \ + $(UNUSEDGFXDIR)/old_battle_interface_1.4bpp \ + $(UNUSEDGFXDIR)/old_battle_interface_2.4bpp \ + $(UNUSEDGFXDIR)/old_battle_interface_3.4bpp @cat $^ >$@ -$(menudir)/hp_numbers.4bpp: $(menudir)/hpbar_anim.4bpp \ - $(menudir)/numbers1.4bpp \ - $(menudir)/numbers2.4bpp +$(MENUGFXDIR)/hp_numbers.4bpp: $(MENUGFXDIR)/hpbar_anim.4bpp \ + $(MENUGFXDIR)/numbers1.4bpp \ + $(MENUGFXDIR)/numbers2.4bpp @cat $^ >$@ -$(unusedgfxdir)/redyellowgreen_frame.bin: $(unusedgfxdir)/red_frame.bin \ - $(unusedgfxdir)/yellow_frame.bin \ - $(unusedgfxdir)/green_frame.bin \ - $(unusedgfxdir)/blank_frame.bin +$(UNUSEDGFXDIR)/redyellowgreen_frame.bin: $(UNUSEDGFXDIR)/red_frame.bin \ + $(UNUSEDGFXDIR)/yellow_frame.bin \ + $(UNUSEDGFXDIR)/green_frame.bin \ + $(UNUSEDGFXDIR)/blank_frame.bin @cat $^ >$@ -$(unusedgfxdir)/color_frames.4bpp: %.4bpp: %.png +$(UNUSEDGFXDIR)/color_frames.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 353 -$(btintgfxdir)/unused_window2bar.4bpp: %.4bpp: %.png +$(BATINTGFXDIR)/unused_window2bar.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 5 -$(unusedgfxdir)/old_contest.4bpp: $(unusedgfxdir)/old_contest_frame_1.4bpp \ - $(unusedgfxdir)/old_contest_floor.4bpp \ - $(unusedgfxdir)/old_contest_frame_2.4bpp \ - $(unusedgfxdir)/old_contest_symbols.4bpp \ - $(unusedgfxdir)/old_contest_meter.4bpp \ - $(unusedgfxdir)/old_contest_classes.4bpp \ - $(unusedgfxdir)/old_contest_numbers.4bpp +$(UNUSEDGFXDIR)/old_contest.4bpp: $(UNUSEDGFXDIR)/old_contest_frame_1.4bpp \ + $(UNUSEDGFXDIR)/old_contest_floor.4bpp \ + $(UNUSEDGFXDIR)/old_contest_frame_2.4bpp \ + $(UNUSEDGFXDIR)/old_contest_symbols.4bpp \ + $(UNUSEDGFXDIR)/old_contest_meter.4bpp \ + $(UNUSEDGFXDIR)/old_contest_classes.4bpp \ + $(UNUSEDGFXDIR)/old_contest_numbers.4bpp @cat $^ >$@ -$(unusedgfxdir)/old_contest_2.4bpp: $(unusedgfxdir)/old_contest_2_1.4bpp \ - $(unusedgfxdir)/old_contest_2_2.4bpp +$(UNUSEDGFXDIR)/old_contest_2.4bpp: $(UNUSEDGFXDIR)/old_contest_2_1.4bpp \ + $(UNUSEDGFXDIR)/old_contest_2_2.4bpp @cat $^ >$@ -$(unknowngfxdir)/unknown_C19470.4bpp: %.4bpp: %.png +$(UNKNOWNGFXDIR)/unknown_C19470.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 36 -$(btanimgfxdir)/141.4bpp: $(btanimgfxdir)/141_0.4bpp \ - $(btanimgfxdir)/141_1.4bpp \ - $(btanimgfxdir)/141_2.4bpp \ - $(btanimgfxdir)/141_3.4bpp \ - $(btanimgfxdir)/141_4.4bpp +$(BTLANMSPRGFXDIR)/141.4bpp: $(BTLANMSPRGFXDIR)/141_0.4bpp \ + $(BTLANMSPRGFXDIR)/141_1.4bpp \ + $(BTLANMSPRGFXDIR)/141_2.4bpp \ + $(BTLANMSPRGFXDIR)/141_3.4bpp \ + $(BTLANMSPRGFXDIR)/141_4.4bpp @cat $^ >$@ -$(btanimgfxdir)/074.4bpp: $(btanimgfxdir)/074_0.4bpp \ - $(btanimgfxdir)/074_1.4bpp +$(BTLANMSPRGFXDIR)/074.4bpp: $(BTLANMSPRGFXDIR)/074_0.4bpp \ + $(BTLANMSPRGFXDIR)/074_1.4bpp @cat $^ >$@ -$(btanimgfxdir)/159.4bpp: $(btanimgfxdir)/159_0.4bpp \ - $(btanimgfxdir)/159_1.4bpp +$(BTLANMSPRGFXDIR)/159.4bpp: $(BTLANMSPRGFXDIR)/159_0.4bpp \ + $(BTLANMSPRGFXDIR)/159_1.4bpp @cat $^ >$@ -$(btanimgfxdir)/001.4bpp: $(btanimgfxdir)/001_0.4bpp \ - $(btanimgfxdir)/001_1.4bpp +$(BTLANMSPRGFXDIR)/001.4bpp: $(BTLANMSPRGFXDIR)/001_0.4bpp \ + $(BTLANMSPRGFXDIR)/001_1.4bpp @cat $^ >$@ -$(masksgfxdir)/unknown_C2EA50.4bpp: %.4bpp: %.png +$(MASKSGFXDIR)/unknown_C2EA50.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 14 -$(bttransgfxdir)/vs_frame.4bpp: %.4bpp: %.png +$(BATTRANSGFXDIR)/vs_frame.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 16 -$(menudir)/party_menu_misc.4bpp: %.4bpp: %.png +$(MENUGFXDIR)/party_menu_misc.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 62 -$(typesdir)/move_types.4bpp: $(types:%=$(typesdir)/%.4bpp) $(contest_types:%=$(typesdir)/contest_%.4bpp) +$(TYPESGFXDIR)/move_types.4bpp: $(types:%=$(TYPESGFXDIR)/%.4bpp) $(contest_types:%=$(TYPESGFXDIR)/contest_%.4bpp) @cat $^ >$@ -$(typesdir)/move_types.gbapal: $(typesdir)/move_types_1.gbapal \ - $(typesdir)/move_types_2.gbapal \ - $(typesdir)/move_types_3.gbapal +$(TYPESGFXDIR)/move_types.gbapal: $(TYPESGFXDIR)/move_types_1.gbapal \ + $(TYPESGFXDIR)/move_types_2.gbapal \ + $(TYPESGFXDIR)/move_types_3.gbapal @cat $^ >$@ -$(menudir)/bag_screen.4bpp: %.4bpp: %.png +$(MENUGFXDIR)/bag_screen.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 53 -$(rayquazadir)/rayquaza.8bpp: %.8bpp: %.png +$(RAYQUAZAGFXDIR)/rayquaza.8bpp: %.8bpp: %.png $(GFX) $< $@ -num_tiles 227 -$(rayquazadir)/overcast.4bpp: %.4bpp: %.png +$(RAYQUAZAGFXDIR)/overcast.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 313 -$(rayquazadir)/rayquaza_fly1.4bpp: %.4bpp: %.png +$(RAYQUAZAGFXDIR)/rayquaza_fly1.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 124 -$(rayquazadir)/rayquaza_tail_fix.4bpp: $(rayquazadir)/rayquaza_tail.4bpp +$(RAYQUAZAGFXDIR)/rayquaza_tail_fix.4bpp: $(RAYQUAZAGFXDIR)/rayquaza_tail.4bpp cp $< $@ head -c 12 /dev/zero >> $@ -$(rayquazadir)/chase_streaks.4bpp: %.4bpp: %.png +$(RAYQUAZAGFXDIR)/chase_streaks.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 19 -$(rayquazadir)/rayquaza_chase.4bpp: %.4bpp: %.png +$(RAYQUAZAGFXDIR)/rayquaza_chase.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 155 graphics/picture_frame/frame5.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 86 -$(roulettegfxdir)/roulette_tilt.4bpp: $(roulettegfxdir)/shroomish.4bpp \ - $(roulettegfxdir)/tailow.4bpp +$(ROULETTEGFXDIR)/roulette_tilt.4bpp: $(ROULETTEGFXDIR)/shroomish.4bpp \ + $(ROULETTEGFXDIR)/tailow.4bpp @cat $^ >$@ -$(roulettegfxdir)/poke_icons2.4bpp: $(roulettegfxdir)/wynaut.4bpp \ - $(roulettegfxdir)/azurill.4bpp \ - $(roulettegfxdir)/skitty.4bpp \ - $(roulettegfxdir)/makuhita.4bpp +$(ROULETTEGFXDIR)/poke_icons2.4bpp: $(ROULETTEGFXDIR)/wynaut.4bpp \ + $(ROULETTEGFXDIR)/azurill.4bpp \ + $(ROULETTEGFXDIR)/skitty.4bpp \ + $(ROULETTEGFXDIR)/makuhita.4bpp @cat $^ >$@ -$(bttransgfxdir)/85BBC14.4bpp: %.4bpp: %.png +$(BATTRANSGFXDIR)/85BBC14.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 53 -$(bttransgfxdir)/rayquaza.4bpp: %.4bpp: %.png +$(BATTRANSGFXDIR)/rayquaza.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 938 -$(bttransgfxdir)/frontier_square_1.4bpp: $(bttransgfxdir)/frontier_squares_blanktiles.4bpp \ - $(bttransgfxdir)/frontier_squares_1.4bpp +$(BATTRANSGFXDIR)/frontier_square_1.4bpp: $(BATTRANSGFXDIR)/frontier_squares_blanktiles.4bpp \ + $(BATTRANSGFXDIR)/frontier_squares_1.4bpp @cat $^ >$@ -$(bttransgfxdir)/frontier_square_2.4bpp: $(bttransgfxdir)/frontier_squares_blanktiles.4bpp \ - $(bttransgfxdir)/frontier_squares_2.4bpp +$(BATTRANSGFXDIR)/frontier_square_2.4bpp: $(BATTRANSGFXDIR)/frontier_squares_blanktiles.4bpp \ + $(BATTRANSGFXDIR)/frontier_squares_2.4bpp @cat $^ >$@ -$(bttransgfxdir)/frontier_square_3.4bpp: $(bttransgfxdir)/frontier_squares_blanktiles.4bpp \ - $(bttransgfxdir)/frontier_squares_3.4bpp +$(BATTRANSGFXDIR)/frontier_square_3.4bpp: $(BATTRANSGFXDIR)/frontier_squares_blanktiles.4bpp \ + $(BATTRANSGFXDIR)/frontier_squares_3.4bpp @cat $^ >$@ -$(bttransgfxdir)/frontier_square_4.4bpp: $(bttransgfxdir)/frontier_squares_blanktiles.4bpp \ - $(bttransgfxdir)/frontier_squares_4.4bpp +$(BATTRANSGFXDIR)/frontier_square_4.4bpp: $(BATTRANSGFXDIR)/frontier_squares_blanktiles.4bpp \ + $(BATTRANSGFXDIR)/frontier_squares_4.4bpp @cat $^ >$@ -$(pknvoptionsdir)/options.4bpp: $(pknvoptionsdir)/hoenn_map.4bpp \ - $(pknvoptionsdir)/condition.4bpp \ - $(pknvoptionsdir)/match_call.4bpp \ - $(pknvoptionsdir)/ribbons.4bpp \ - $(pknvoptionsdir)/switch_off.4bpp \ - $(pknvoptionsdir)/party.4bpp \ - $(pknvoptionsdir)/search.4bpp \ - $(pknvoptionsdir)/cool.4bpp \ - $(pknvoptionsdir)/beauty.4bpp \ - $(pknvoptionsdir)/cute.4bpp \ - $(pknvoptionsdir)/smart.4bpp \ - $(pknvoptionsdir)/tough.4bpp \ - $(pknvoptionsdir)/cancel.4bpp +$(PKNAVOPTIONSGFXDIR)/options.4bpp: $(PKNAVOPTIONSGFXDIR)/hoenn_map.4bpp \ + $(PKNAVOPTIONSGFXDIR)/condition.4bpp \ + $(PKNAVOPTIONSGFXDIR)/match_call.4bpp \ + $(PKNAVOPTIONSGFXDIR)/ribbons.4bpp \ + $(PKNAVOPTIONSGFXDIR)/switch_off.4bpp \ + $(PKNAVOPTIONSGFXDIR)/party.4bpp \ + $(PKNAVOPTIONSGFXDIR)/search.4bpp \ + $(PKNAVOPTIONSGFXDIR)/cool.4bpp \ + $(PKNAVOPTIONSGFXDIR)/beauty.4bpp \ + $(PKNAVOPTIONSGFXDIR)/cute.4bpp \ + $(PKNAVOPTIONSGFXDIR)/smart.4bpp \ + $(PKNAVOPTIONSGFXDIR)/tough.4bpp \ + $(PKNAVOPTIONSGFXDIR)/cancel.4bpp @cat $^ >$@ -$(pknvdir)/header.4bpp: %.4bpp: %.png +$(PKNAVGFXDIR)/header.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 53 -$(unusedgfxdir)/intro_birch_beauty.4bpp: %.4bpp: %.png +$(UNUSEDGFXDIR)/intro_birch_beauty.4bpp: %.4bpp: %.png $(GFX) $< $@ -num_tiles 374 + +$(PSSGFXDIR)/forest_frame.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 55 + +$(PSSGFXDIR)/forest.4bpp: $(PSSGFXDIR)/forest_frame.4bpp $(PSSGFXDIR)/forest_bg.4bpp + @cat $(PSSGFXDIR)/forest_frame.4bpp $(PSSGFXDIR)/forest_bg.4bpp >$@ + +$(PSSGFXDIR)/city_frame.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 52 + +$(PSSGFXDIR)/city.4bpp: $(PSSGFXDIR)/city_frame.4bpp $(PSSGFXDIR)/city_bg.4bpp + @cat $(PSSGFXDIR)/city_frame.4bpp $(PSSGFXDIR)/city_bg.4bpp >$@ + +$(PSSGFXDIR)/desert.4bpp: $(PSSGFXDIR)/desert_frame.4bpp $(PSSGFXDIR)/desert_bg.4bpp + @cat $(PSSGFXDIR)/desert_frame.4bpp $(PSSGFXDIR)/desert_bg.4bpp >$@ + +$(PSSGFXDIR)/savanna_frame.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 45 + +$(PSSGFXDIR)/savanna_bg.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 23 + +$(PSSGFXDIR)/savanna.4bpp: $(PSSGFXDIR)/savanna_frame.4bpp $(PSSGFXDIR)/savanna_bg.4bpp + @cat $(PSSGFXDIR)/savanna_frame.4bpp $(PSSGFXDIR)/savanna_bg.4bpp >$@ + +$(PSSGFXDIR)/crag_frame.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 49 + +$(PSSGFXDIR)/crag.4bpp: $(PSSGFXDIR)/crag_frame.4bpp $(PSSGFXDIR)/crag_bg.4bpp + @cat $(PSSGFXDIR)/crag_frame.4bpp $(PSSGFXDIR)/crag_bg.4bpp >$@ + +$(PSSGFXDIR)/volcano_frame.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 56 + +$(PSSGFXDIR)/volcano.4bpp: $(PSSGFXDIR)/volcano_frame.4bpp $(PSSGFXDIR)/volcano_bg.4bpp + @cat $(PSSGFXDIR)/volcano_frame.4bpp $(PSSGFXDIR)/volcano_bg.4bpp >$@ + +$(PSSGFXDIR)/snow_frame.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 57 + +$(PSSGFXDIR)/snow.4bpp: $(PSSGFXDIR)/snow_frame.4bpp $(PSSGFXDIR)/snow_bg.4bpp + @cat $(PSSGFXDIR)/snow_frame.4bpp $(PSSGFXDIR)/snow_bg.4bpp >$@ + +$(PSSGFXDIR)/cave_frame.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 55 + +$(PSSGFXDIR)/cave.4bpp: $(PSSGFXDIR)/cave_frame.4bpp $(PSSGFXDIR)/cave_bg.4bpp + @cat $(PSSGFXDIR)/cave_frame.4bpp $(PSSGFXDIR)/cave_bg.4bpp >$@ + +$(PSSGFXDIR)/beach_frame.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 46 + +$(PSSGFXDIR)/beach_bg.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 23 + +$(PSSGFXDIR)/beach.4bpp: $(PSSGFXDIR)/beach_frame.4bpp $(PSSGFXDIR)/beach_bg.4bpp + @cat $(PSSGFXDIR)/beach_frame.4bpp $(PSSGFXDIR)/beach_bg.4bpp >$@ + +$(PSSGFXDIR)/seafloor_frame.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 54 + +$(PSSGFXDIR)/seafloor.4bpp: $(PSSGFXDIR)/seafloor_frame.4bpp $(PSSGFXDIR)/seafloor_bg.4bpp + @cat $(PSSGFXDIR)/seafloor_frame.4bpp $(PSSGFXDIR)/seafloor_bg.4bpp >$@ + +$(PSSGFXDIR)/river_frame.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 51 + +$(PSSGFXDIR)/river_bg.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 11 + +$(PSSGFXDIR)/river.4bpp: $(PSSGFXDIR)/river_frame.4bpp $(PSSGFXDIR)/river_bg.4bpp + @cat $(PSSGFXDIR)/river_frame.4bpp $(PSSGFXDIR)/river_bg.4bpp >$@ + +$(PSSGFXDIR)/sky_frame.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 45 + +$(PSSGFXDIR)/sky.4bpp: $(PSSGFXDIR)/sky_frame.4bpp $(PSSGFXDIR)/sky_bg.4bpp + @cat $(PSSGFXDIR)/sky_frame.4bpp $(PSSGFXDIR)/sky_bg.4bpp >$@ + +$(PSSGFXDIR)/bubbles_frame.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 54 + +$(PSSGFXDIR)/bubbles.4bpp: $(PSSGFXDIR)/bubbles_frame.4bpp $(PSSGFXDIR)/bubbles_bg.4bpp + @cat $(PSSGFXDIR)/bubbles_frame.4bpp $(PSSGFXDIR)/bubbles_bg.4bpp >$@ + +$(PSSGFXDIR)/pokecenter_frame.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 35 + +$(PSSGFXDIR)/pokecenter.4bpp: $(PSSGFXDIR)/pokecenter_frame.4bpp $(PSSGFXDIR)/pokecenter_bg.4bpp + @cat $(PSSGFXDIR)/pokecenter_frame.4bpp $(PSSGFXDIR)/pokecenter_bg.4bpp >$@ + +$(PSSGFXDIR)/machine_frame.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 33 + +$(PSSGFXDIR)/machine.4bpp: $(PSSGFXDIR)/machine_frame.4bpp $(PSSGFXDIR)/machine_bg.4bpp + @cat $(PSSGFXDIR)/machine_frame.4bpp $(PSSGFXDIR)/machine_bg.4bpp >$@ + +$(PSSGFXDIR)/plain_frame.4bpp: %.4bpp: %.png + $(GFX) $< $@ -num_tiles 18 + +$(PSSGFXDIR)/plain.4bpp: $(PSSGFXDIR)/plain_frame.4bpp $(PSSGFXDIR)/plain_bg.4bpp + @cat $(PSSGFXDIR)/plain_frame.4bpp $(PSSGFXDIR)/plain_bg.4bpp >$@ |
