From b85b24492ca07262b519d5c162474a8a2b7dfab2 Mon Sep 17 00:00:00 2001 From: IIMarckus Date: Mon, 2 Feb 2015 01:35:34 -0700 Subject: Generate presjpegs from source .jpg files. --- .gitmodules | 6 - stadiumgs/Makefile | 231 +++++++++++---------- stadiumgs/academygfx/0x22303c0.jpg | Bin 0 -> 2105 bytes stadiumgs/academygfx/0x2230c10.jpg | Bin 0 -> 2208 bytes stadiumgs/academygfx/0x22314c0.jpg | Bin 0 -> 2444 bytes stadiumgs/academygfx/0x2231e60.jpg | Bin 0 -> 2847 bytes stadiumgs/academygfx/0x2232990.jpg | Bin 0 -> 2930 bytes stadiumgs/academygfx/0x2233520.jpg | Bin 0 -> 2429 bytes stadiumgs/academygfx/0x2233eb0.jpg | Bin 0 -> 2604 bytes stadiumgs/academygfx/0x22348f0.jpg | Bin 0 -> 2566 bytes stadiumgs/academygfx/0x2235310.jpg | Bin 0 -> 2312 bytes stadiumgs/academygfx/0x2235c30.jpg | Bin 0 -> 1886 bytes stadiumgs/academygfx/0x22363a0.jpg | Bin 0 -> 3880 bytes stadiumgs/academygfx/0x22372e0.jpg | Bin 0 -> 3006 bytes stadiumgs/academygfx/0x2237eb0.jpg | Bin 0 -> 2729 bytes stadiumgs/academygfx/0x2238970.jpg | Bin 0 -> 2904 bytes stadiumgs/academygfx/0x22394e0.jpg | Bin 0 -> 2792 bytes stadiumgs/academygfx/0x2239fe0.jpg | Bin 0 -> 2492 bytes stadiumgs/academygfx/0x223a9b0.jpg | Bin 0 -> 2259 bytes stadiumgs/academygfx/0x223b2a0.jpg | Bin 0 -> 2390 bytes stadiumgs/academygfx/0x223bc10.jpg | Bin 0 -> 2596 bytes stadiumgs/academygfx/0x223c650.jpg | Bin 0 -> 1938 bytes stadiumgs/academygfx/0x223ce00.jpg | Bin 0 -> 1708 bytes stadiumgs/academygfx/0x223d4c0.jpg | Bin 0 -> 1869 bytes stadiumgs/academygfx/0x223dc20.jpg | Bin 0 -> 2252 bytes stadiumgs/academygfx/0x223e500.jpg | Bin 0 -> 3129 bytes stadiumgs/academygfx/0x223f150.jpg | Bin 0 -> 2104 bytes stadiumgs/academygfx/0x223f9a0.jpg | Bin 0 -> 2755 bytes stadiumgs/academygfx/0x2240480.jpg | Bin 0 -> 3002 bytes stadiumgs/academygfx/0x2241050.jpg | Bin 0 -> 2759 bytes stadiumgs/academygfx/0x2241b30.jpg | Bin 0 -> 2507 bytes stadiumgs/academygfx/0x2242510.jpg | Bin 0 -> 2643 bytes stadiumgs/academygfx/0x2242f80.jpg | Bin 0 -> 2382 bytes stadiumgs/academygfx/0x22438e0.jpg | Bin 0 -> 1773 bytes stadiumgs/academygfx/0x2243fe0.jpg | Bin 0 -> 1984 bytes stadiumgs/academygfx/0x22447b0.jpg | Bin 0 -> 1436 bytes stadiumgs/academygfx/0x2244d60.jpg | Bin 0 -> 1332 bytes stadiumgs/academygfx/0x22452b0.jpg | Bin 0 -> 1884 bytes stadiumgs/academygfx/0x2245a20.jpg | Bin 0 -> 1670 bytes stadiumgs/academygfx/0x22460c0.jpg | Bin 0 -> 2427 bytes stadiumgs/academygfx/0x2246a50.jpg | Bin 0 -> 2275 bytes stadiumgs/academygfx/0x2247350.jpg | Bin 0 -> 2207 bytes stadiumgs/academygfx/0x2247c00.jpg | Bin 0 -> 2041 bytes stadiumgs/academygfx/0x2248410.jpg | Bin 0 -> 2444 bytes stadiumgs/academygfx/0x2248db0.jpg | Bin 0 -> 2410 bytes stadiumgs/academygfx/0x2249730.jpg | Bin 0 -> 2760 bytes stadiumgs/academygfx/0x224a210.jpg | Bin 0 -> 6813 bytes stadiumgs/academygfx/0x224bcc0.jpg | Bin 0 -> 6573 bytes stadiumgs/academygfx/0x224d680.jpg | Bin 0 -> 5563 bytes stadiumgs/academygfx/0x224ec50.jpg | Bin 0 -> 1922 bytes stadiumgs/academygfx/0x224f3f0.jpg | Bin 0 -> 1466 bytes stadiumgs/academygfx/0x224f9c0.jpg | Bin 0 -> 12170 bytes stadiumgs/academygfx/0x2252960.jpg | Bin 0 -> 12289 bytes stadiumgs/academygfx/0x2255980.jpg | Bin 0 -> 8887 bytes stadiumgs/academygfx/0x2257c50.jpg | Bin 0 -> 2482 bytes stadiumgs/academygfx/0x2258620.jpg | Bin 0 -> 1986 bytes stadiumgs/academygfx/0x2258e00.jpg | Bin 0 -> 5205 bytes stadiumgs/academygfx/0x225a270.jpg | Bin 0 -> 330 bytes stadiumgs/academygfx/0x225a3d0.jpg | Bin 0 -> 343 bytes stadiumgs/academygfx/0x225a540.jpg | Bin 0 -> 343 bytes stadiumgs/academygfx/0x225a6b0.jpg | Bin 0 -> 343 bytes stadiumgs/backgrounds | 1 - stadiumgs/backgrounds/0x1f079c0.jpg | Bin 0 -> 31392 bytes stadiumgs/backgrounds/0x1f225e0.jpg | Bin 0 -> 29604 bytes stadiumgs/backgrounds/0x1f48620.jpg | Bin 0 -> 26209 bytes stadiumgs/backgrounds/0x1f4eca0.jpg | Bin 0 -> 14025 bytes stadiumgs/backgrounds/0x1fe3520.jpg | Bin 0 -> 28673 bytes stadiumgs/backgrounds/0x1fea540.jpg | Bin 0 -> 18803 bytes stadiumgs/backgrounds/castlejohto.jpg | Bin 0 -> 65906 bytes stadiumgs/backgrounds/castlekanto.jpg | Bin 0 -> 61270 bytes stadiumgs/backgrounds/castleplateau.jpg | Bin 0 -> 21454 bytes stadiumgs/backgrounds/classroom1.jpg | Bin 0 -> 28956 bytes stadiumgs/backgrounds/classroom2.jpg | Bin 0 -> 33792 bytes stadiumgs/backgrounds/credits/blainevspryce.jpg | Bin 0 -> 27791 bytes stadiumgs/backgrounds/credits/bugsyvskaren.jpg | Bin 0 -> 31119 bytes stadiumgs/backgrounds/credits/chuckvsbruno.jpg | Bin 0 -> 27339 bytes stadiumgs/backgrounds/credits/falknervserika.jpg | Bin 0 -> 20688 bytes stadiumgs/backgrounds/credits/janinevskoga.jpg | Bin 0 -> 26954 bytes stadiumgs/backgrounds/credits/jasminevsbrock.jpg | Bin 0 -> 27425 bytes stadiumgs/backgrounds/credits/lancevsclair.jpg | Bin 0 -> 26386 bytes stadiumgs/backgrounds/credits/mistyvswhitney.jpg | Bin 0 -> 27708 bytes stadiumgs/backgrounds/credits/redvsblue.jpg | Bin 0 -> 27650 bytes stadiumgs/backgrounds/credits/rivalvskris.jpg | Bin 0 -> 27646 bytes stadiumgs/backgrounds/credits/sabrinavswill.jpg | Bin 0 -> 24248 bytes stadiumgs/backgrounds/credits/surgevsmorty.jpg | Bin 0 -> 24527 bytes stadiumgs/backgrounds/freebattle.jpg | Bin 0 -> 27014 bytes stadiumgs/backgrounds/gamepakcheck.jpg | Bin 0 -> 3948 bytes stadiumgs/backgrounds/hoohlugia.jpg | Bin 0 -> 82977 bytes stadiumgs/backgrounds/lab.jpg | Bin 0 -> 70815 bytes stadiumgs/backgrounds/labmachine.jpg | Bin 0 -> 14248 bytes stadiumgs/backgrounds/library1.jpg | Bin 0 -> 30121 bytes stadiumgs/backgrounds/library2.jpg | Bin 0 -> 31506 bytes stadiumgs/backgrounds/library3.jpg | Bin 0 -> 31506 bytes stadiumgs/backgrounds/minigames.jpg | Bin 0 -> 29396 bytes stadiumgs/backgrounds/myroom.jpg | Bin 0 -> 18596 bytes stadiumgs/backgrounds/mysterygift.jpg | Bin 0 -> 30688 bytes stadiumgs/backgrounds/pleaseselect.jpg | Bin 0 -> 16669 bytes stadiumgs/backgrounds/pokedex.jpg | Bin 0 -> 12691 bytes stadiumgs/backgrounds/quiz.jpg | Bin 0 -> 41085 bytes stadiumgs/backgrounds/selectpokemon/0x1f449b0.jpg | Bin 0 -> 15452 bytes stadiumgs/backgrounds/selectpokemon/battlenow.jpg | Bin 0 -> 22544 bytes .../backgrounds/selectpokemon/challengecup.jpg | Bin 0 -> 23355 bytes stadiumgs/backgrounds/selectpokemon/littlecup.jpg | Bin 0 -> 20428 bytes stadiumgs/backgrounds/selectpokemon/pokecup.jpg | Bin 0 -> 21706 bytes stadiumgs/backgrounds/selectpokemon/primecup.jpg | Bin 0 -> 23218 bytes stadiumgs/backgrounds/stadium.jpg | Bin 0 -> 85638 bytes stadiumgs/backgrounds/title1.jpg | Bin 0 -> 72192 bytes stadiumgs/backgrounds/title2.jpg | Bin 0 -> 69852 bytes stadiumgs/backgrounds/whitecity1.jpg | Bin 0 -> 75352 bytes stadiumgs/backgrounds/whitecity2.jpg | Bin 0 -> 69276 bytes stadiumgs/presjpeg | 1 - utils/Makefile | 6 +- 112 files changed, 122 insertions(+), 123 deletions(-) create mode 100644 stadiumgs/academygfx/0x22303c0.jpg create mode 100644 stadiumgs/academygfx/0x2230c10.jpg create mode 100644 stadiumgs/academygfx/0x22314c0.jpg create mode 100644 stadiumgs/academygfx/0x2231e60.jpg create mode 100644 stadiumgs/academygfx/0x2232990.jpg create mode 100644 stadiumgs/academygfx/0x2233520.jpg create mode 100644 stadiumgs/academygfx/0x2233eb0.jpg create mode 100644 stadiumgs/academygfx/0x22348f0.jpg create mode 100644 stadiumgs/academygfx/0x2235310.jpg create mode 100644 stadiumgs/academygfx/0x2235c30.jpg create mode 100644 stadiumgs/academygfx/0x22363a0.jpg create mode 100644 stadiumgs/academygfx/0x22372e0.jpg create mode 100644 stadiumgs/academygfx/0x2237eb0.jpg create mode 100644 stadiumgs/academygfx/0x2238970.jpg create mode 100644 stadiumgs/academygfx/0x22394e0.jpg create mode 100644 stadiumgs/academygfx/0x2239fe0.jpg create mode 100644 stadiumgs/academygfx/0x223a9b0.jpg create mode 100644 stadiumgs/academygfx/0x223b2a0.jpg create mode 100644 stadiumgs/academygfx/0x223bc10.jpg create mode 100644 stadiumgs/academygfx/0x223c650.jpg create mode 100644 stadiumgs/academygfx/0x223ce00.jpg create mode 100644 stadiumgs/academygfx/0x223d4c0.jpg create mode 100644 stadiumgs/academygfx/0x223dc20.jpg create mode 100644 stadiumgs/academygfx/0x223e500.jpg create mode 100644 stadiumgs/academygfx/0x223f150.jpg create mode 100644 stadiumgs/academygfx/0x223f9a0.jpg create mode 100644 stadiumgs/academygfx/0x2240480.jpg create mode 100644 stadiumgs/academygfx/0x2241050.jpg create mode 100644 stadiumgs/academygfx/0x2241b30.jpg create mode 100644 stadiumgs/academygfx/0x2242510.jpg create mode 100644 stadiumgs/academygfx/0x2242f80.jpg create mode 100644 stadiumgs/academygfx/0x22438e0.jpg create mode 100644 stadiumgs/academygfx/0x2243fe0.jpg create mode 100644 stadiumgs/academygfx/0x22447b0.jpg create mode 100644 stadiumgs/academygfx/0x2244d60.jpg create mode 100644 stadiumgs/academygfx/0x22452b0.jpg create mode 100644 stadiumgs/academygfx/0x2245a20.jpg create mode 100644 stadiumgs/academygfx/0x22460c0.jpg create mode 100644 stadiumgs/academygfx/0x2246a50.jpg create mode 100644 stadiumgs/academygfx/0x2247350.jpg create mode 100644 stadiumgs/academygfx/0x2247c00.jpg create mode 100644 stadiumgs/academygfx/0x2248410.jpg create mode 100644 stadiumgs/academygfx/0x2248db0.jpg create mode 100644 stadiumgs/academygfx/0x2249730.jpg create mode 100644 stadiumgs/academygfx/0x224a210.jpg create mode 100644 stadiumgs/academygfx/0x224bcc0.jpg create mode 100644 stadiumgs/academygfx/0x224d680.jpg create mode 100644 stadiumgs/academygfx/0x224ec50.jpg create mode 100644 stadiumgs/academygfx/0x224f3f0.jpg create mode 100644 stadiumgs/academygfx/0x224f9c0.jpg create mode 100644 stadiumgs/academygfx/0x2252960.jpg create mode 100644 stadiumgs/academygfx/0x2255980.jpg create mode 100644 stadiumgs/academygfx/0x2257c50.jpg create mode 100644 stadiumgs/academygfx/0x2258620.jpg create mode 100644 stadiumgs/academygfx/0x2258e00.jpg create mode 100644 stadiumgs/academygfx/0x225a270.jpg create mode 100644 stadiumgs/academygfx/0x225a3d0.jpg create mode 100644 stadiumgs/academygfx/0x225a540.jpg create mode 100644 stadiumgs/academygfx/0x225a6b0.jpg delete mode 160000 stadiumgs/backgrounds create mode 100644 stadiumgs/backgrounds/0x1f079c0.jpg create mode 100644 stadiumgs/backgrounds/0x1f225e0.jpg create mode 100644 stadiumgs/backgrounds/0x1f48620.jpg create mode 100644 stadiumgs/backgrounds/0x1f4eca0.jpg create mode 100644 stadiumgs/backgrounds/0x1fe3520.jpg create mode 100644 stadiumgs/backgrounds/0x1fea540.jpg create mode 100644 stadiumgs/backgrounds/castlejohto.jpg create mode 100644 stadiumgs/backgrounds/castlekanto.jpg create mode 100644 stadiumgs/backgrounds/castleplateau.jpg create mode 100644 stadiumgs/backgrounds/classroom1.jpg create mode 100644 stadiumgs/backgrounds/classroom2.jpg create mode 100644 stadiumgs/backgrounds/credits/blainevspryce.jpg create mode 100644 stadiumgs/backgrounds/credits/bugsyvskaren.jpg create mode 100644 stadiumgs/backgrounds/credits/chuckvsbruno.jpg create mode 100644 stadiumgs/backgrounds/credits/falknervserika.jpg create mode 100644 stadiumgs/backgrounds/credits/janinevskoga.jpg create mode 100644 stadiumgs/backgrounds/credits/jasminevsbrock.jpg create mode 100644 stadiumgs/backgrounds/credits/lancevsclair.jpg create mode 100644 stadiumgs/backgrounds/credits/mistyvswhitney.jpg create mode 100644 stadiumgs/backgrounds/credits/redvsblue.jpg create mode 100644 stadiumgs/backgrounds/credits/rivalvskris.jpg create mode 100644 stadiumgs/backgrounds/credits/sabrinavswill.jpg create mode 100644 stadiumgs/backgrounds/credits/surgevsmorty.jpg create mode 100644 stadiumgs/backgrounds/freebattle.jpg create mode 100644 stadiumgs/backgrounds/gamepakcheck.jpg create mode 100644 stadiumgs/backgrounds/hoohlugia.jpg create mode 100644 stadiumgs/backgrounds/lab.jpg create mode 100644 stadiumgs/backgrounds/labmachine.jpg create mode 100644 stadiumgs/backgrounds/library1.jpg create mode 100644 stadiumgs/backgrounds/library2.jpg create mode 100644 stadiumgs/backgrounds/library3.jpg create mode 100644 stadiumgs/backgrounds/minigames.jpg create mode 100644 stadiumgs/backgrounds/myroom.jpg create mode 100644 stadiumgs/backgrounds/mysterygift.jpg create mode 100644 stadiumgs/backgrounds/pleaseselect.jpg create mode 100644 stadiumgs/backgrounds/pokedex.jpg create mode 100644 stadiumgs/backgrounds/quiz.jpg create mode 100644 stadiumgs/backgrounds/selectpokemon/0x1f449b0.jpg create mode 100644 stadiumgs/backgrounds/selectpokemon/battlenow.jpg create mode 100644 stadiumgs/backgrounds/selectpokemon/challengecup.jpg create mode 100644 stadiumgs/backgrounds/selectpokemon/littlecup.jpg create mode 100644 stadiumgs/backgrounds/selectpokemon/pokecup.jpg create mode 100644 stadiumgs/backgrounds/selectpokemon/primecup.jpg create mode 100644 stadiumgs/backgrounds/stadium.jpg create mode 100644 stadiumgs/backgrounds/title1.jpg create mode 100644 stadiumgs/backgrounds/title2.jpg create mode 100644 stadiumgs/backgrounds/whitecity1.jpg create mode 100644 stadiumgs/backgrounds/whitecity2.jpg delete mode 160000 stadiumgs/presjpeg diff --git a/.gitmodules b/.gitmodules index 9b12a4f..ba08241 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,3 @@ -[submodule "stadiumgs/backgrounds"] - path = stadiumgs/backgrounds - url = https://github.com/iimarckus/stadiumgs-backgrounds/ [submodule "stadiumgs/0x1e40000"] path = stadiumgs/0x1e40000 url = https://github.com/iimarckus/stadiumgs-0x1e40000 @@ -13,9 +10,6 @@ [submodule "stadiumgs/0x2000000"] path = stadiumgs/0x2000000 url = https://github.com/iimarckus/stadiumgs-0x2000000 -[submodule "stadiumgs/presjpeg"] - path = stadiumgs/presjpeg - url = https://github.com/iimarckus/stadiumgs-presjpeg [submodule "stadiumgs/faces"] path = stadiumgs/faces url = https://github.com/iimarckus/stadiumgs-faces diff --git a/stadiumgs/Makefile b/stadiumgs/Makefile index f762523..1958881 100644 --- a/stadiumgs/Makefile +++ b/stadiumgs/Makefile @@ -8,7 +8,7 @@ TABLES = \ 0x1e40000.tbl \ backgrounds.tbl \ 0x2000000.tbl \ - presjpegs.tbl \ + academygfx.tbl \ faces.tbl # md5 of part2.bin: 9771bc97a32a71d6153dda1e30acf1e0 @@ -372,66 +372,66 @@ FACES = \ faces/dual.bin \ faces/pichu.bin -PRESJPEGS = \ - presjpeg/0x22303c0.bin \ - presjpeg/0x2230c10.bin \ - presjpeg/0x22314c0.bin \ - presjpeg/0x2231e60.bin \ - presjpeg/0x2232990.bin \ - presjpeg/0x2233520.bin \ - presjpeg/0x2233eb0.bin \ - presjpeg/0x22348f0.bin \ - presjpeg/0x2235310.bin \ - presjpeg/0x2235c30.bin \ - presjpeg/0x22363a0.bin \ - presjpeg/0x22372e0.bin \ - presjpeg/0x2237eb0.bin \ - presjpeg/0x2238970.bin \ - presjpeg/0x22394e0.bin \ - presjpeg/0x2239fe0.bin \ - presjpeg/0x223a9b0.bin \ - presjpeg/0x223b2a0.bin \ - presjpeg/0x223bc10.bin \ - presjpeg/0x223c650.bin \ - presjpeg/0x223ce00.bin \ - presjpeg/0x223d4c0.bin \ - presjpeg/0x223dc20.bin \ - presjpeg/0x223e500.bin \ - presjpeg/0x223f150.bin \ - presjpeg/0x223f9a0.bin \ - presjpeg/0x2240480.bin \ - presjpeg/0x2241050.bin \ - presjpeg/0x2241b30.bin \ - presjpeg/0x2242510.bin \ - presjpeg/0x2242f80.bin \ - presjpeg/0x22438e0.bin \ - presjpeg/0x2243fe0.bin \ - presjpeg/0x22447b0.bin \ - presjpeg/0x2244d60.bin \ - presjpeg/0x22452b0.bin \ - presjpeg/0x2245a20.bin \ - presjpeg/0x22460c0.bin \ - presjpeg/0x2246a50.bin \ - presjpeg/0x2247350.bin \ - presjpeg/0x2247c00.bin \ - presjpeg/0x2248410.bin \ - presjpeg/0x2248db0.bin \ - presjpeg/0x2249730.bin \ - presjpeg/0x224a210.bin \ - presjpeg/0x224bcc0.bin \ - presjpeg/0x224d680.bin \ - presjpeg/0x224ec50.bin \ - presjpeg/0x224f3f0.bin \ - presjpeg/0x224f9c0.bin \ - presjpeg/0x2252960.bin \ - presjpeg/0x2255980.bin \ - presjpeg/0x2257c50.bin \ - presjpeg/0x2258620.bin \ - presjpeg/0x2258e00.bin \ - presjpeg/0x225a270.bin \ - presjpeg/0x225a3d0.bin \ - presjpeg/0x225a540.bin \ - presjpeg/0x225a6b0.bin +ACADEMYGFX = \ + academygfx/0x22303c0.presjpeg \ + academygfx/0x2230c10.presjpeg \ + academygfx/0x22314c0.presjpeg \ + academygfx/0x2231e60.presjpeg \ + academygfx/0x2232990.presjpeg \ + academygfx/0x2233520.presjpeg \ + academygfx/0x2233eb0.presjpeg \ + academygfx/0x22348f0.presjpeg \ + academygfx/0x2235310.presjpeg \ + academygfx/0x2235c30.presjpeg \ + academygfx/0x22363a0.presjpeg \ + academygfx/0x22372e0.presjpeg \ + academygfx/0x2237eb0.presjpeg \ + academygfx/0x2238970.presjpeg \ + academygfx/0x22394e0.presjpeg \ + academygfx/0x2239fe0.presjpeg \ + academygfx/0x223a9b0.presjpeg \ + academygfx/0x223b2a0.presjpeg \ + academygfx/0x223bc10.presjpeg \ + academygfx/0x223c650.presjpeg \ + academygfx/0x223ce00.presjpeg \ + academygfx/0x223d4c0.presjpeg \ + academygfx/0x223dc20.presjpeg \ + academygfx/0x223e500.presjpeg \ + academygfx/0x223f150.presjpeg \ + academygfx/0x223f9a0.presjpeg \ + academygfx/0x2240480.presjpeg \ + academygfx/0x2241050.presjpeg \ + academygfx/0x2241b30.presjpeg \ + academygfx/0x2242510.presjpeg \ + academygfx/0x2242f80.presjpeg \ + academygfx/0x22438e0.presjpeg \ + academygfx/0x2243fe0.presjpeg \ + academygfx/0x22447b0.presjpeg \ + academygfx/0x2244d60.presjpeg \ + academygfx/0x22452b0.presjpeg \ + academygfx/0x2245a20.presjpeg \ + academygfx/0x22460c0.presjpeg \ + academygfx/0x2246a50.presjpeg \ + academygfx/0x2247350.presjpeg \ + academygfx/0x2247c00.presjpeg \ + academygfx/0x2248410.presjpeg \ + academygfx/0x2248db0.presjpeg \ + academygfx/0x2249730.presjpeg \ + academygfx/0x224a210.presjpeg \ + academygfx/0x224bcc0.presjpeg \ + academygfx/0x224d680.presjpeg \ + academygfx/0x224ec50.presjpeg \ + academygfx/0x224f3f0.presjpeg \ + academygfx/0x224f9c0.presjpeg \ + academygfx/0x2252960.presjpeg \ + academygfx/0x2255980.presjpeg \ + academygfx/0x2257c50.presjpeg \ + academygfx/0x2258620.presjpeg \ + academygfx/0x2258e00.presjpeg \ + academygfx/0x225a270.presjpeg \ + academygfx/0x225a3d0.presjpeg \ + academygfx/0x225a540.presjpeg \ + academygfx/0x225a6b0.presjpeg X0x1898000 = \ 0x1898000/0x1899c90.bin \ @@ -2045,56 +2045,56 @@ STRTBLS = \ text/academy/skilltest/elitefour/julian.bin BACKGROUNDS = \ - backgrounds/title1.bin \ - backgrounds/title2.bin \ - backgrounds/whitecity1.bin \ - backgrounds/lab.bin \ - backgrounds/classroom1.bin \ - backgrounds/pokedex.bin \ - backgrounds/gamepakcheck.bin \ - backgrounds/pleaseselect.bin \ - backgrounds/selectpokemon/littlecup.bin \ - backgrounds/selectpokemon/pokecup.bin \ - backgrounds/selectpokemon/primecup.bin \ - backgrounds/selectpokemon/challengecup.bin \ - backgrounds/stadium.bin \ - backgrounds/castlekanto.bin \ - backgrounds/classroom2.bin \ - backgrounds/0x1f079c0.bin \ - backgrounds/library1.bin \ - backgrounds/myroom.bin \ - backgrounds/minigames.bin \ - backgrounds/0x1f225e0.bin \ - backgrounds/labmachine.bin \ - backgrounds/whitecity2.bin \ - backgrounds/freebattle.bin \ - backgrounds/selectpokemon/0x1f449b0.bin \ - backgrounds/0x1f48620.bin \ - backgrounds/0x1f4eca0.bin \ - backgrounds/castlejohto.bin \ - backgrounds/castleplateau.bin \ - backgrounds/hoohlugia.bin \ - backgrounds/quiz.bin \ - backgrounds/library2.bin \ - backgrounds/credits/lancevsclair.bin \ - backgrounds/library3.bin \ - backgrounds/credits/bugsyvskaren.bin \ - backgrounds/credits/falknervserika.bin \ - backgrounds/credits/mistyvswhitney.bin \ - backgrounds/credits/surgevsmorty.bin \ - backgrounds/credits/jasminevsbrock.bin \ - backgrounds/credits/blainevspryce.bin \ - backgrounds/credits/sabrinavswill.bin \ - backgrounds/credits/janinevskoga.bin \ - backgrounds/credits/chuckvsbruno.bin \ - backgrounds/credits/rivalvskris.bin \ - backgrounds/credits/redvsblue.bin \ - backgrounds/0x1fe3520.bin \ - backgrounds/0x1fea540.bin \ - backgrounds/selectpokemon/battlenow.bin \ - backgrounds/mysterygift.bin + backgrounds/title1.presjpeg \ + backgrounds/title2.presjpeg \ + backgrounds/whitecity1.presjpeg \ + backgrounds/lab.presjpeg \ + backgrounds/classroom1.presjpeg \ + backgrounds/pokedex.presjpeg \ + backgrounds/gamepakcheck.presjpeg \ + backgrounds/pleaseselect.presjpeg \ + backgrounds/selectpokemon/littlecup.presjpeg \ + backgrounds/selectpokemon/pokecup.presjpeg \ + backgrounds/selectpokemon/primecup.presjpeg \ + backgrounds/selectpokemon/challengecup.presjpeg \ + backgrounds/stadium.presjpeg \ + backgrounds/castlekanto.presjpeg \ + backgrounds/classroom2.presjpeg \ + backgrounds/0x1f079c0.presjpeg \ + backgrounds/library1.presjpeg \ + backgrounds/myroom.presjpeg \ + backgrounds/minigames.presjpeg \ + backgrounds/0x1f225e0.presjpeg \ + backgrounds/labmachine.presjpeg \ + backgrounds/whitecity2.presjpeg \ + backgrounds/freebattle.presjpeg \ + backgrounds/selectpokemon/0x1f449b0.presjpeg \ + backgrounds/0x1f48620.presjpeg \ + backgrounds/0x1f4eca0.presjpeg \ + backgrounds/castlejohto.presjpeg \ + backgrounds/castleplateau.presjpeg \ + backgrounds/hoohlugia.presjpeg \ + backgrounds/quiz.presjpeg \ + backgrounds/library2.presjpeg \ + backgrounds/credits/lancevsclair.presjpeg \ + backgrounds/library3.presjpeg \ + backgrounds/credits/bugsyvskaren.presjpeg \ + backgrounds/credits/falknervserika.presjpeg \ + backgrounds/credits/mistyvswhitney.presjpeg \ + backgrounds/credits/surgevsmorty.presjpeg \ + backgrounds/credits/jasminevsbrock.presjpeg \ + backgrounds/credits/blainevspryce.presjpeg \ + backgrounds/credits/sabrinavswill.presjpeg \ + backgrounds/credits/janinevskoga.presjpeg \ + backgrounds/credits/chuckvsbruno.presjpeg \ + backgrounds/credits/rivalvskris.presjpeg \ + backgrounds/credits/redvsblue.presjpeg \ + backgrounds/0x1fe3520.presjpeg \ + backgrounds/0x1fea540.presjpeg \ + backgrounds/selectpokemon/battlenow.presjpeg \ + backgrounds/mysterygift.presjpeg -.SUFFIXES: .txt .json .bin +.SUFFIXES: .txt .json .bin .presjpeg .jpg .txt.bin: ../utils/txt2strtbl $< > $@ @@ -2102,6 +2102,9 @@ BACKGROUNDS = \ .json.bin: ../utils/json2rostertbl $< > $@ +.jpg.presjpeg: + ../utils/presjpeg $< > $@ + # md5 of rosters.tbl: afa0dc919e83d6803a404f08c1517f4c rosters.tbl: ${ROSTERS} ../utils/cattbl -x 0x10000 ${ROSTERS} > $@ @@ -2130,9 +2133,9 @@ backgrounds.tbl: ${BACKGROUNDS} 0x2000000.tbl: ${X0x2000000} ../utils/cattbl -f 0x230000 ${X0x2000000} > $@ -# md5 of presjpegs.tbl: 4c6b9a153190ed45d85c391d62f47050 -presjpegs.tbl: ${PRESJPEGS} - ../utils/cattbl -f 0x38000 ${PRESJPEGS} > $@ +# md5 of academygfx.tbl: 4c6b9a153190ed45d85c391d62f47050 +academygfx.tbl: ${ACADEMYGFX} + ../utils/cattbl -f 0x38000 ${ACADEMYGFX} > $@ # md5 of faces.tbl: 70e499025672e8758db4ed2094354b77 faces.tbl: ${FACES} @@ -2148,6 +2151,6 @@ faces.tbl: ${FACES} clean: rm -f text.tbl ${STRTBLS} rosters.tbl ${ROSTERS} backgrounds.tbl - rm -f 0x1e40000.tbl presjpegs.tbl faces.tbl 0x2000000.tbl 0x1898000.tbl + rm -f 0x1e40000.tbl academygfx.tbl faces.tbl 0x2000000.tbl 0x1898000.tbl rm -f 0x1718000.tbl 0x2000000.tbl part2.bin 0x3fed000.bin part4.bin rm -f 0x3fd5000.tbl diff --git a/stadiumgs/academygfx/0x22303c0.jpg b/stadiumgs/academygfx/0x22303c0.jpg new file mode 100644 index 0000000..f1ba0fe Binary files /dev/null and b/stadiumgs/academygfx/0x22303c0.jpg differ diff --git a/stadiumgs/academygfx/0x2230c10.jpg b/stadiumgs/academygfx/0x2230c10.jpg new file mode 100644 index 0000000..f06ed0c Binary files /dev/null and b/stadiumgs/academygfx/0x2230c10.jpg differ diff --git a/stadiumgs/academygfx/0x22314c0.jpg b/stadiumgs/academygfx/0x22314c0.jpg new file mode 100644 index 0000000..5f3c5c9 Binary files /dev/null and b/stadiumgs/academygfx/0x22314c0.jpg differ diff --git a/stadiumgs/academygfx/0x2231e60.jpg b/stadiumgs/academygfx/0x2231e60.jpg new file mode 100644 index 0000000..108eb77 Binary files /dev/null and b/stadiumgs/academygfx/0x2231e60.jpg differ diff --git a/stadiumgs/academygfx/0x2232990.jpg b/stadiumgs/academygfx/0x2232990.jpg new file mode 100644 index 0000000..2dd7289 Binary files /dev/null and b/stadiumgs/academygfx/0x2232990.jpg differ diff --git a/stadiumgs/academygfx/0x2233520.jpg b/stadiumgs/academygfx/0x2233520.jpg new file mode 100644 index 0000000..60e5800 Binary files /dev/null and b/stadiumgs/academygfx/0x2233520.jpg differ diff --git a/stadiumgs/academygfx/0x2233eb0.jpg b/stadiumgs/academygfx/0x2233eb0.jpg new file mode 100644 index 0000000..bb43505 Binary files /dev/null and b/stadiumgs/academygfx/0x2233eb0.jpg differ diff --git a/stadiumgs/academygfx/0x22348f0.jpg b/stadiumgs/academygfx/0x22348f0.jpg new file mode 100644 index 0000000..dd93eb0 Binary files /dev/null and b/stadiumgs/academygfx/0x22348f0.jpg differ diff --git a/stadiumgs/academygfx/0x2235310.jpg b/stadiumgs/academygfx/0x2235310.jpg new file mode 100644 index 0000000..e311f90 Binary files /dev/null and b/stadiumgs/academygfx/0x2235310.jpg differ diff --git a/stadiumgs/academygfx/0x2235c30.jpg b/stadiumgs/academygfx/0x2235c30.jpg new file mode 100644 index 0000000..ff77832 Binary files /dev/null and b/stadiumgs/academygfx/0x2235c30.jpg differ diff --git a/stadiumgs/academygfx/0x22363a0.jpg b/stadiumgs/academygfx/0x22363a0.jpg new file mode 100644 index 0000000..6243534 Binary files /dev/null and b/stadiumgs/academygfx/0x22363a0.jpg differ diff --git a/stadiumgs/academygfx/0x22372e0.jpg b/stadiumgs/academygfx/0x22372e0.jpg new file mode 100644 index 0000000..ad50e9a Binary files /dev/null and b/stadiumgs/academygfx/0x22372e0.jpg differ diff --git a/stadiumgs/academygfx/0x2237eb0.jpg b/stadiumgs/academygfx/0x2237eb0.jpg new file mode 100644 index 0000000..a18625e Binary files /dev/null and b/stadiumgs/academygfx/0x2237eb0.jpg differ diff --git a/stadiumgs/academygfx/0x2238970.jpg b/stadiumgs/academygfx/0x2238970.jpg new file mode 100644 index 0000000..af9e50a Binary files /dev/null and b/stadiumgs/academygfx/0x2238970.jpg differ diff --git a/stadiumgs/academygfx/0x22394e0.jpg b/stadiumgs/academygfx/0x22394e0.jpg new file mode 100644 index 0000000..283c901 Binary files /dev/null and b/stadiumgs/academygfx/0x22394e0.jpg differ diff --git a/stadiumgs/academygfx/0x2239fe0.jpg b/stadiumgs/academygfx/0x2239fe0.jpg new file mode 100644 index 0000000..f899581 Binary files /dev/null and b/stadiumgs/academygfx/0x2239fe0.jpg differ diff --git a/stadiumgs/academygfx/0x223a9b0.jpg b/stadiumgs/academygfx/0x223a9b0.jpg new file mode 100644 index 0000000..76f4da3 Binary files /dev/null and b/stadiumgs/academygfx/0x223a9b0.jpg differ diff --git a/stadiumgs/academygfx/0x223b2a0.jpg b/stadiumgs/academygfx/0x223b2a0.jpg new file mode 100644 index 0000000..a9b1eaf Binary files /dev/null and b/stadiumgs/academygfx/0x223b2a0.jpg differ diff --git a/stadiumgs/academygfx/0x223bc10.jpg b/stadiumgs/academygfx/0x223bc10.jpg new file mode 100644 index 0000000..bd9493a Binary files /dev/null and b/stadiumgs/academygfx/0x223bc10.jpg differ diff --git a/stadiumgs/academygfx/0x223c650.jpg b/stadiumgs/academygfx/0x223c650.jpg new file mode 100644 index 0000000..c9543dc Binary files /dev/null and b/stadiumgs/academygfx/0x223c650.jpg differ diff --git a/stadiumgs/academygfx/0x223ce00.jpg b/stadiumgs/academygfx/0x223ce00.jpg new file mode 100644 index 0000000..30ce3f0 Binary files /dev/null and b/stadiumgs/academygfx/0x223ce00.jpg differ diff --git a/stadiumgs/academygfx/0x223d4c0.jpg b/stadiumgs/academygfx/0x223d4c0.jpg new file mode 100644 index 0000000..616e7b0 Binary files /dev/null and b/stadiumgs/academygfx/0x223d4c0.jpg differ diff --git a/stadiumgs/academygfx/0x223dc20.jpg b/stadiumgs/academygfx/0x223dc20.jpg new file mode 100644 index 0000000..1bad285 Binary files /dev/null and b/stadiumgs/academygfx/0x223dc20.jpg differ diff --git a/stadiumgs/academygfx/0x223e500.jpg b/stadiumgs/academygfx/0x223e500.jpg new file mode 100644 index 0000000..a029568 Binary files /dev/null and b/stadiumgs/academygfx/0x223e500.jpg differ diff --git a/stadiumgs/academygfx/0x223f150.jpg b/stadiumgs/academygfx/0x223f150.jpg new file mode 100644 index 0000000..2010456 Binary files /dev/null and b/stadiumgs/academygfx/0x223f150.jpg differ diff --git a/stadiumgs/academygfx/0x223f9a0.jpg b/stadiumgs/academygfx/0x223f9a0.jpg new file mode 100644 index 0000000..4d651f7 Binary files /dev/null and b/stadiumgs/academygfx/0x223f9a0.jpg differ diff --git a/stadiumgs/academygfx/0x2240480.jpg b/stadiumgs/academygfx/0x2240480.jpg new file mode 100644 index 0000000..0b0c2e9 Binary files /dev/null and b/stadiumgs/academygfx/0x2240480.jpg differ diff --git a/stadiumgs/academygfx/0x2241050.jpg b/stadiumgs/academygfx/0x2241050.jpg new file mode 100644 index 0000000..71d9063 Binary files /dev/null and b/stadiumgs/academygfx/0x2241050.jpg differ diff --git a/stadiumgs/academygfx/0x2241b30.jpg b/stadiumgs/academygfx/0x2241b30.jpg new file mode 100644 index 0000000..ffef055 Binary files /dev/null and b/stadiumgs/academygfx/0x2241b30.jpg differ diff --git a/stadiumgs/academygfx/0x2242510.jpg b/stadiumgs/academygfx/0x2242510.jpg new file mode 100644 index 0000000..2553338 Binary files /dev/null and b/stadiumgs/academygfx/0x2242510.jpg differ diff --git a/stadiumgs/academygfx/0x2242f80.jpg b/stadiumgs/academygfx/0x2242f80.jpg new file mode 100644 index 0000000..82287e9 Binary files /dev/null and b/stadiumgs/academygfx/0x2242f80.jpg differ diff --git a/stadiumgs/academygfx/0x22438e0.jpg b/stadiumgs/academygfx/0x22438e0.jpg new file mode 100644 index 0000000..2fdfd76 Binary files /dev/null and b/stadiumgs/academygfx/0x22438e0.jpg differ diff --git a/stadiumgs/academygfx/0x2243fe0.jpg b/stadiumgs/academygfx/0x2243fe0.jpg new file mode 100644 index 0000000..396a05b Binary files /dev/null and b/stadiumgs/academygfx/0x2243fe0.jpg differ diff --git a/stadiumgs/academygfx/0x22447b0.jpg b/stadiumgs/academygfx/0x22447b0.jpg new file mode 100644 index 0000000..7177d99 Binary files /dev/null and b/stadiumgs/academygfx/0x22447b0.jpg differ diff --git a/stadiumgs/academygfx/0x2244d60.jpg b/stadiumgs/academygfx/0x2244d60.jpg new file mode 100644 index 0000000..04e8cda Binary files /dev/null and b/stadiumgs/academygfx/0x2244d60.jpg differ diff --git a/stadiumgs/academygfx/0x22452b0.jpg b/stadiumgs/academygfx/0x22452b0.jpg new file mode 100644 index 0000000..3b112bc Binary files /dev/null and b/stadiumgs/academygfx/0x22452b0.jpg differ diff --git a/stadiumgs/academygfx/0x2245a20.jpg b/stadiumgs/academygfx/0x2245a20.jpg new file mode 100644 index 0000000..75e7a49 Binary files /dev/null and b/stadiumgs/academygfx/0x2245a20.jpg differ diff --git a/stadiumgs/academygfx/0x22460c0.jpg b/stadiumgs/academygfx/0x22460c0.jpg new file mode 100644 index 0000000..ca09a71 Binary files /dev/null and b/stadiumgs/academygfx/0x22460c0.jpg differ diff --git a/stadiumgs/academygfx/0x2246a50.jpg b/stadiumgs/academygfx/0x2246a50.jpg new file mode 100644 index 0000000..a6f5f23 Binary files /dev/null and b/stadiumgs/academygfx/0x2246a50.jpg differ diff --git a/stadiumgs/academygfx/0x2247350.jpg b/stadiumgs/academygfx/0x2247350.jpg new file mode 100644 index 0000000..f02db34 Binary files /dev/null and b/stadiumgs/academygfx/0x2247350.jpg differ diff --git a/stadiumgs/academygfx/0x2247c00.jpg b/stadiumgs/academygfx/0x2247c00.jpg new file mode 100644 index 0000000..27ca4ed Binary files /dev/null and b/stadiumgs/academygfx/0x2247c00.jpg differ diff --git a/stadiumgs/academygfx/0x2248410.jpg b/stadiumgs/academygfx/0x2248410.jpg new file mode 100644 index 0000000..a4f2a16 Binary files /dev/null and b/stadiumgs/academygfx/0x2248410.jpg differ diff --git a/stadiumgs/academygfx/0x2248db0.jpg b/stadiumgs/academygfx/0x2248db0.jpg new file mode 100644 index 0000000..5e62f87 Binary files /dev/null and b/stadiumgs/academygfx/0x2248db0.jpg differ diff --git a/stadiumgs/academygfx/0x2249730.jpg b/stadiumgs/academygfx/0x2249730.jpg new file mode 100644 index 0000000..bac790f Binary files /dev/null and b/stadiumgs/academygfx/0x2249730.jpg differ diff --git a/stadiumgs/academygfx/0x224a210.jpg b/stadiumgs/academygfx/0x224a210.jpg new file mode 100644 index 0000000..dc55e4b Binary files /dev/null and b/stadiumgs/academygfx/0x224a210.jpg differ diff --git a/stadiumgs/academygfx/0x224bcc0.jpg b/stadiumgs/academygfx/0x224bcc0.jpg new file mode 100644 index 0000000..dadabee Binary files /dev/null and b/stadiumgs/academygfx/0x224bcc0.jpg differ diff --git a/stadiumgs/academygfx/0x224d680.jpg b/stadiumgs/academygfx/0x224d680.jpg new file mode 100644 index 0000000..0e15808 Binary files /dev/null and b/stadiumgs/academygfx/0x224d680.jpg differ diff --git a/stadiumgs/academygfx/0x224ec50.jpg b/stadiumgs/academygfx/0x224ec50.jpg new file mode 100644 index 0000000..d5fde80 Binary files /dev/null and b/stadiumgs/academygfx/0x224ec50.jpg differ diff --git a/stadiumgs/academygfx/0x224f3f0.jpg b/stadiumgs/academygfx/0x224f3f0.jpg new file mode 100644 index 0000000..d43e8e3 Binary files /dev/null and b/stadiumgs/academygfx/0x224f3f0.jpg differ diff --git a/stadiumgs/academygfx/0x224f9c0.jpg b/stadiumgs/academygfx/0x224f9c0.jpg new file mode 100644 index 0000000..4da4e64 Binary files /dev/null and b/stadiumgs/academygfx/0x224f9c0.jpg differ diff --git a/stadiumgs/academygfx/0x2252960.jpg b/stadiumgs/academygfx/0x2252960.jpg new file mode 100644 index 0000000..75801f8 Binary files /dev/null and b/stadiumgs/academygfx/0x2252960.jpg differ diff --git a/stadiumgs/academygfx/0x2255980.jpg b/stadiumgs/academygfx/0x2255980.jpg new file mode 100644 index 0000000..791ea0a Binary files /dev/null and b/stadiumgs/academygfx/0x2255980.jpg differ diff --git a/stadiumgs/academygfx/0x2257c50.jpg b/stadiumgs/academygfx/0x2257c50.jpg new file mode 100644 index 0000000..fc061ab Binary files /dev/null and b/stadiumgs/academygfx/0x2257c50.jpg differ diff --git a/stadiumgs/academygfx/0x2258620.jpg b/stadiumgs/academygfx/0x2258620.jpg new file mode 100644 index 0000000..14dfac4 Binary files /dev/null and b/stadiumgs/academygfx/0x2258620.jpg differ diff --git a/stadiumgs/academygfx/0x2258e00.jpg b/stadiumgs/academygfx/0x2258e00.jpg new file mode 100644 index 0000000..940f629 Binary files /dev/null and b/stadiumgs/academygfx/0x2258e00.jpg differ diff --git a/stadiumgs/academygfx/0x225a270.jpg b/stadiumgs/academygfx/0x225a270.jpg new file mode 100644 index 0000000..d8cf425 Binary files /dev/null and b/stadiumgs/academygfx/0x225a270.jpg differ diff --git a/stadiumgs/academygfx/0x225a3d0.jpg b/stadiumgs/academygfx/0x225a3d0.jpg new file mode 100644 index 0000000..3836dfe Binary files /dev/null and b/stadiumgs/academygfx/0x225a3d0.jpg differ diff --git a/stadiumgs/academygfx/0x225a540.jpg b/stadiumgs/academygfx/0x225a540.jpg new file mode 100644 index 0000000..3836dfe Binary files /dev/null and b/stadiumgs/academygfx/0x225a540.jpg differ diff --git a/stadiumgs/academygfx/0x225a6b0.jpg b/stadiumgs/academygfx/0x225a6b0.jpg new file mode 100644 index 0000000..3836dfe Binary files /dev/null and b/stadiumgs/academygfx/0x225a6b0.jpg differ diff --git a/stadiumgs/backgrounds b/stadiumgs/backgrounds deleted file mode 160000 index def8062..0000000 --- a/stadiumgs/backgrounds +++ /dev/null @@ -1 +0,0 @@ -Subproject commit def8062c9bc0918ce37da79bbcad92c1082006c9 diff --git a/stadiumgs/backgrounds/0x1f079c0.jpg b/stadiumgs/backgrounds/0x1f079c0.jpg new file mode 100644 index 0000000..e02f272 Binary files /dev/null and b/stadiumgs/backgrounds/0x1f079c0.jpg differ diff --git a/stadiumgs/backgrounds/0x1f225e0.jpg b/stadiumgs/backgrounds/0x1f225e0.jpg new file mode 100644 index 0000000..221f324 Binary files /dev/null and b/stadiumgs/backgrounds/0x1f225e0.jpg differ diff --git a/stadiumgs/backgrounds/0x1f48620.jpg b/stadiumgs/backgrounds/0x1f48620.jpg new file mode 100644 index 0000000..a2d6a2d Binary files /dev/null and b/stadiumgs/backgrounds/0x1f48620.jpg differ diff --git a/stadiumgs/backgrounds/0x1f4eca0.jpg b/stadiumgs/backgrounds/0x1f4eca0.jpg new file mode 100644 index 0000000..fe7d38f Binary files /dev/null and b/stadiumgs/backgrounds/0x1f4eca0.jpg differ diff --git a/stadiumgs/backgrounds/0x1fe3520.jpg b/stadiumgs/backgrounds/0x1fe3520.jpg new file mode 100644 index 0000000..d692ac7 Binary files /dev/null and b/stadiumgs/backgrounds/0x1fe3520.jpg differ diff --git a/stadiumgs/backgrounds/0x1fea540.jpg b/stadiumgs/backgrounds/0x1fea540.jpg new file mode 100644 index 0000000..0972b79 Binary files /dev/null and b/stadiumgs/backgrounds/0x1fea540.jpg differ diff --git a/stadiumgs/backgrounds/castlejohto.jpg b/stadiumgs/backgrounds/castlejohto.jpg new file mode 100644 index 0000000..c10fe4e Binary files /dev/null and b/stadiumgs/backgrounds/castlejohto.jpg differ diff --git a/stadiumgs/backgrounds/castlekanto.jpg b/stadiumgs/backgrounds/castlekanto.jpg new file mode 100644 index 0000000..0770855 Binary files /dev/null and b/stadiumgs/backgrounds/castlekanto.jpg differ diff --git a/stadiumgs/backgrounds/castleplateau.jpg b/stadiumgs/backgrounds/castleplateau.jpg new file mode 100644 index 0000000..7ad2a06 Binary files /dev/null and b/stadiumgs/backgrounds/castleplateau.jpg differ diff --git a/stadiumgs/backgrounds/classroom1.jpg b/stadiumgs/backgrounds/classroom1.jpg new file mode 100644 index 0000000..029710e Binary files /dev/null and b/stadiumgs/backgrounds/classroom1.jpg differ diff --git a/stadiumgs/backgrounds/classroom2.jpg b/stadiumgs/backgrounds/classroom2.jpg new file mode 100644 index 0000000..c32fae5 Binary files /dev/null and b/stadiumgs/backgrounds/classroom2.jpg differ diff --git a/stadiumgs/backgrounds/credits/blainevspryce.jpg b/stadiumgs/backgrounds/credits/blainevspryce.jpg new file mode 100644 index 0000000..bb762ef Binary files /dev/null and b/stadiumgs/backgrounds/credits/blainevspryce.jpg differ diff --git a/stadiumgs/backgrounds/credits/bugsyvskaren.jpg b/stadiumgs/backgrounds/credits/bugsyvskaren.jpg new file mode 100644 index 0000000..07eca8e Binary files /dev/null and b/stadiumgs/backgrounds/credits/bugsyvskaren.jpg differ diff --git a/stadiumgs/backgrounds/credits/chuckvsbruno.jpg b/stadiumgs/backgrounds/credits/chuckvsbruno.jpg new file mode 100644 index 0000000..700546d Binary files /dev/null and b/stadiumgs/backgrounds/credits/chuckvsbruno.jpg differ diff --git a/stadiumgs/backgrounds/credits/falknervserika.jpg b/stadiumgs/backgrounds/credits/falknervserika.jpg new file mode 100644 index 0000000..000c232 Binary files /dev/null and b/stadiumgs/backgrounds/credits/falknervserika.jpg differ diff --git a/stadiumgs/backgrounds/credits/janinevskoga.jpg b/stadiumgs/backgrounds/credits/janinevskoga.jpg new file mode 100644 index 0000000..7918d3e Binary files /dev/null and b/stadiumgs/backgrounds/credits/janinevskoga.jpg differ diff --git a/stadiumgs/backgrounds/credits/jasminevsbrock.jpg b/stadiumgs/backgrounds/credits/jasminevsbrock.jpg new file mode 100644 index 0000000..485643d Binary files /dev/null and b/stadiumgs/backgrounds/credits/jasminevsbrock.jpg differ diff --git a/stadiumgs/backgrounds/credits/lancevsclair.jpg b/stadiumgs/backgrounds/credits/lancevsclair.jpg new file mode 100644 index 0000000..2029a6c Binary files /dev/null and b/stadiumgs/backgrounds/credits/lancevsclair.jpg differ diff --git a/stadiumgs/backgrounds/credits/mistyvswhitney.jpg b/stadiumgs/backgrounds/credits/mistyvswhitney.jpg new file mode 100644 index 0000000..5854aa2 Binary files /dev/null and b/stadiumgs/backgrounds/credits/mistyvswhitney.jpg differ diff --git a/stadiumgs/backgrounds/credits/redvsblue.jpg b/stadiumgs/backgrounds/credits/redvsblue.jpg new file mode 100644 index 0000000..89339da Binary files /dev/null and b/stadiumgs/backgrounds/credits/redvsblue.jpg differ diff --git a/stadiumgs/backgrounds/credits/rivalvskris.jpg b/stadiumgs/backgrounds/credits/rivalvskris.jpg new file mode 100644 index 0000000..b859f84 Binary files /dev/null and b/stadiumgs/backgrounds/credits/rivalvskris.jpg differ diff --git a/stadiumgs/backgrounds/credits/sabrinavswill.jpg b/stadiumgs/backgrounds/credits/sabrinavswill.jpg new file mode 100644 index 0000000..2f21a6b Binary files /dev/null and b/stadiumgs/backgrounds/credits/sabrinavswill.jpg differ diff --git a/stadiumgs/backgrounds/credits/surgevsmorty.jpg b/stadiumgs/backgrounds/credits/surgevsmorty.jpg new file mode 100644 index 0000000..34c1ccb Binary files /dev/null and b/stadiumgs/backgrounds/credits/surgevsmorty.jpg differ diff --git a/stadiumgs/backgrounds/freebattle.jpg b/stadiumgs/backgrounds/freebattle.jpg new file mode 100644 index 0000000..e2ce18a Binary files /dev/null and b/stadiumgs/backgrounds/freebattle.jpg differ diff --git a/stadiumgs/backgrounds/gamepakcheck.jpg b/stadiumgs/backgrounds/gamepakcheck.jpg new file mode 100644 index 0000000..85e646c Binary files /dev/null and b/stadiumgs/backgrounds/gamepakcheck.jpg differ diff --git a/stadiumgs/backgrounds/hoohlugia.jpg b/stadiumgs/backgrounds/hoohlugia.jpg new file mode 100644 index 0000000..ef9605c Binary files /dev/null and b/stadiumgs/backgrounds/hoohlugia.jpg differ diff --git a/stadiumgs/backgrounds/lab.jpg b/stadiumgs/backgrounds/lab.jpg new file mode 100644 index 0000000..2756622 Binary files /dev/null and b/stadiumgs/backgrounds/lab.jpg differ diff --git a/stadiumgs/backgrounds/labmachine.jpg b/stadiumgs/backgrounds/labmachine.jpg new file mode 100644 index 0000000..a06c8b5 Binary files /dev/null and b/stadiumgs/backgrounds/labmachine.jpg differ diff --git a/stadiumgs/backgrounds/library1.jpg b/stadiumgs/backgrounds/library1.jpg new file mode 100644 index 0000000..1b91bd4 Binary files /dev/null and b/stadiumgs/backgrounds/library1.jpg differ diff --git a/stadiumgs/backgrounds/library2.jpg b/stadiumgs/backgrounds/library2.jpg new file mode 100644 index 0000000..7462ff0 Binary files /dev/null and b/stadiumgs/backgrounds/library2.jpg differ diff --git a/stadiumgs/backgrounds/library3.jpg b/stadiumgs/backgrounds/library3.jpg new file mode 100644 index 0000000..7462ff0 Binary files /dev/null and b/stadiumgs/backgrounds/library3.jpg differ diff --git a/stadiumgs/backgrounds/minigames.jpg b/stadiumgs/backgrounds/minigames.jpg new file mode 100644 index 0000000..38feb41 Binary files /dev/null and b/stadiumgs/backgrounds/minigames.jpg differ diff --git a/stadiumgs/backgrounds/myroom.jpg b/stadiumgs/backgrounds/myroom.jpg new file mode 100644 index 0000000..2b073fd Binary files /dev/null and b/stadiumgs/backgrounds/myroom.jpg differ diff --git a/stadiumgs/backgrounds/mysterygift.jpg b/stadiumgs/backgrounds/mysterygift.jpg new file mode 100644 index 0000000..0021527 Binary files /dev/null and b/stadiumgs/backgrounds/mysterygift.jpg differ diff --git a/stadiumgs/backgrounds/pleaseselect.jpg b/stadiumgs/backgrounds/pleaseselect.jpg new file mode 100644 index 0000000..ee09fb7 Binary files /dev/null and b/stadiumgs/backgrounds/pleaseselect.jpg differ diff --git a/stadiumgs/backgrounds/pokedex.jpg b/stadiumgs/backgrounds/pokedex.jpg new file mode 100644 index 0000000..07c0e84 Binary files /dev/null and b/stadiumgs/backgrounds/pokedex.jpg differ diff --git a/stadiumgs/backgrounds/quiz.jpg b/stadiumgs/backgrounds/quiz.jpg new file mode 100644 index 0000000..172668a Binary files /dev/null and b/stadiumgs/backgrounds/quiz.jpg differ diff --git a/stadiumgs/backgrounds/selectpokemon/0x1f449b0.jpg b/stadiumgs/backgrounds/selectpokemon/0x1f449b0.jpg new file mode 100644 index 0000000..44c3ed7 Binary files /dev/null and b/stadiumgs/backgrounds/selectpokemon/0x1f449b0.jpg differ diff --git a/stadiumgs/backgrounds/selectpokemon/battlenow.jpg b/stadiumgs/backgrounds/selectpokemon/battlenow.jpg new file mode 100644 index 0000000..eb7d309 Binary files /dev/null and b/stadiumgs/backgrounds/selectpokemon/battlenow.jpg differ diff --git a/stadiumgs/backgrounds/selectpokemon/challengecup.jpg b/stadiumgs/backgrounds/selectpokemon/challengecup.jpg new file mode 100644 index 0000000..507820f Binary files /dev/null and b/stadiumgs/backgrounds/selectpokemon/challengecup.jpg differ diff --git a/stadiumgs/backgrounds/selectpokemon/littlecup.jpg b/stadiumgs/backgrounds/selectpokemon/littlecup.jpg new file mode 100644 index 0000000..8061975 Binary files /dev/null and b/stadiumgs/backgrounds/selectpokemon/littlecup.jpg differ diff --git a/stadiumgs/backgrounds/selectpokemon/pokecup.jpg b/stadiumgs/backgrounds/selectpokemon/pokecup.jpg new file mode 100644 index 0000000..9939dc2 Binary files /dev/null and b/stadiumgs/backgrounds/selectpokemon/pokecup.jpg differ diff --git a/stadiumgs/backgrounds/selectpokemon/primecup.jpg b/stadiumgs/backgrounds/selectpokemon/primecup.jpg new file mode 100644 index 0000000..179fa61 Binary files /dev/null and b/stadiumgs/backgrounds/selectpokemon/primecup.jpg differ diff --git a/stadiumgs/backgrounds/stadium.jpg b/stadiumgs/backgrounds/stadium.jpg new file mode 100644 index 0000000..5394f81 Binary files /dev/null and b/stadiumgs/backgrounds/stadium.jpg differ diff --git a/stadiumgs/backgrounds/title1.jpg b/stadiumgs/backgrounds/title1.jpg new file mode 100644 index 0000000..83e9cda Binary files /dev/null and b/stadiumgs/backgrounds/title1.jpg differ diff --git a/stadiumgs/backgrounds/title2.jpg b/stadiumgs/backgrounds/title2.jpg new file mode 100644 index 0000000..afa839a Binary files /dev/null and b/stadiumgs/backgrounds/title2.jpg differ diff --git a/stadiumgs/backgrounds/whitecity1.jpg b/stadiumgs/backgrounds/whitecity1.jpg new file mode 100644 index 0000000..623557d Binary files /dev/null and b/stadiumgs/backgrounds/whitecity1.jpg differ diff --git a/stadiumgs/backgrounds/whitecity2.jpg b/stadiumgs/backgrounds/whitecity2.jpg new file mode 100644 index 0000000..071f336 Binary files /dev/null and b/stadiumgs/backgrounds/whitecity2.jpg differ diff --git a/stadiumgs/presjpeg b/stadiumgs/presjpeg deleted file mode 160000 index bedcfd6..0000000 --- a/stadiumgs/presjpeg +++ /dev/null @@ -1 +0,0 @@ -Subproject commit bedcfd6ab0b22a3f4882f70ca5cdd634784ebef4 diff --git a/utils/Makefile b/utils/Makefile index edbdf23..602686e 100644 --- a/utils/Makefile +++ b/utils/Makefile @@ -6,7 +6,8 @@ BINARIES = \ json2rostertbl \ extractbin \ face2png \ - padff + padff \ + presjpeg all: ${BINARIES} @@ -16,5 +17,8 @@ json2rostertbl: json2rostertbl.c constants.h face2png: face2png.c cc `pkg-config --cflags --libs libpng` -o $@ face2png.c +presjpeg: presjpeg.c + cc -I/usr/local/include -L/usr/local/lib -ljpeg -o $@ presjpeg.c + clean: rm -f ${BINARIES} -- cgit v1.2.3