diff options
| author | yenatch <yenatch@gmail.com> | 2016-06-28 23:46:18 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2016-06-28 23:46:18 -0400 |
| commit | e9e1b988f9925a26518b76d74677d0d0dceb3b7c (patch) | |
| tree | a259348294888df8b467a9bfcf06fc796ef5583e /graphics/interface | |
| parent | 2a4b3d91fd9c9e928c9cd9ad6163f15de6a9eb8d (diff) | |
| parent | f68fbc7b5e84671f779ae2d4dc5ee20d32edb0df (diff) | |
Merge remote-tracking branch 'origin/master'
Conflicts:
data/data2.s
Diffstat (limited to 'graphics/interface')
| -rwxr-xr-x | graphics/interface/gba2.pal | 99 | ||||
| -rwxr-xr-x | graphics/interface/gba2.png | bin | 0 -> 1207 bytes | |||
| -rwxr-xr-x | graphics/interface/map.pal | 259 | ||||
| -rwxr-xr-x | graphics/interface/map.png | bin | 0 -> 3959 bytes | |||
| -rwxr-xr-x | graphics/interface/rolling_ball.png | bin | 0 -> 464 bytes | |||
| -rwxr-xr-x | graphics/interface/trade_cableend.pal | 19 | ||||
| -rwxr-xr-x | graphics/interface/trade_cableend.png | bin | 0 -> 194 bytes | |||
| -rwxr-xr-x | graphics/interface/trade_gbascreen.png | bin | 0 -> 170 bytes | |||
| -rwxr-xr-x | graphics/interface/trade_glow.png | bin | 0 -> 195 bytes | |||
| -rwxr-xr-x | graphics/interface/trade_glow2.png | bin | 0 -> 190 bytes | |||
| -rwxr-xr-x | graphics/interface/trade_misc.pal | 19 |
11 files changed, 396 insertions, 0 deletions
diff --git a/graphics/interface/gba2.pal b/graphics/interface/gba2.pal new file mode 100755 index 000000000..0017b212e --- /dev/null +++ b/graphics/interface/gba2.pal @@ -0,0 +1,99 @@ +JASC-PAL +0100 +96 +0 0 0 +230 82 189 +246 213 16 +90 197 16 +90 197 16 +90 197 189 +0 90 197 +0 0 0 +0 0 0 +0 0 0 +16 222 197 +32 156 82 +82 74 205 +49 222 205 +0 0 0 +0 0 0 +0 0 0 +255 57 8 +255 90 8 +255 131 8 +255 172 8 +255 213 8 +255 255 8 +255 255 131 +255 255 255 +255 255 0 +65 0 0 +115 16 0 +172 32 0 +230 57 8 +0 0 0 +0 0 0 +0 0 0 +255 255 255 +222 230 238 +189 205 230 +156 180 222 +131 131 139 +98 98 123 +65 74 106 +41 49 90 +230 230 230 +205 205 205 +180 180 180 +156 156 156 +213 180 106 +205 156 82 +49 255 106 +0 0 0 +255 255 255 +222 230 238 +189 205 230 +156 180 222 +0 16 172 +32 32 106 +16 16 90 +0 0 74 +255 255 189 +230 230 164 +205 205 148 +189 180 115 +139 139 90 +74 74 57 +32 32 32 +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 +0 0 0 +0 0 0 +255 156 123 +164 123 197 +41 255 115 +0 139 255 +255 255 74 +255 255 255 +106 106 106 +255 156 123 +255 156 123 +255 156 123 +255 156 123 +255 156 123 +255 156 123 +255 156 123 +255 156 123 diff --git a/graphics/interface/gba2.png b/graphics/interface/gba2.png Binary files differnew file mode 100755 index 000000000..aa4432951 --- /dev/null +++ b/graphics/interface/gba2.png diff --git a/graphics/interface/map.pal b/graphics/interface/map.pal new file mode 100755 index 000000000..4fca67ade --- /dev/null +++ b/graphics/interface/map.pal @@ -0,0 +1,259 @@ +JASC-PAL +0100 +256 +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 +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 +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 +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 +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 +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 +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 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +156 213 255 +164 180 255 +123 180 213 +74 156 230 +41 131 230 +65 106 205 +0 115 172 +32 74 197 +0 57 139 +213 255 123 +172 238 49 +98 213 0 +57 172 8 +0 115 0 +205 205 148 +0 0 0 +255 255 255 +238 230 172 +238 230 115 +238 189 57 +246 213 82 +230 164 0 +255 172 16 +255 57 16 +246 0 0 +148 0 0 +205 205 205 +98 98 98 +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 +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 +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 +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 +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 +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 +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 +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/interface/map.png b/graphics/interface/map.png Binary files differnew file mode 100755 index 000000000..08df6eb29 --- /dev/null +++ b/graphics/interface/map.png diff --git a/graphics/interface/rolling_ball.png b/graphics/interface/rolling_ball.png Binary files differnew file mode 100755 index 000000000..97cc86a6f --- /dev/null +++ b/graphics/interface/rolling_ball.png diff --git a/graphics/interface/trade_cableend.pal b/graphics/interface/trade_cableend.pal new file mode 100755 index 000000000..64a442293 --- /dev/null +++ b/graphics/interface/trade_cableend.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +255 255 255 +222 230 238 +189 205 230 +156 180 222 +131 131 139 +98 98 123 +65 74 106 +41 49 90 +230 230 230 +205 205 205 +180 180 180 +156 156 156 +213 180 106 +205 156 82 +49 255 106 diff --git a/graphics/interface/trade_cableend.png b/graphics/interface/trade_cableend.png Binary files differnew file mode 100755 index 000000000..1d7828a00 --- /dev/null +++ b/graphics/interface/trade_cableend.png diff --git a/graphics/interface/trade_gbascreen.png b/graphics/interface/trade_gbascreen.png Binary files differnew file mode 100755 index 000000000..4220e5e0d --- /dev/null +++ b/graphics/interface/trade_gbascreen.png diff --git a/graphics/interface/trade_glow.png b/graphics/interface/trade_glow.png Binary files differnew file mode 100755 index 000000000..e223d97ce --- /dev/null +++ b/graphics/interface/trade_glow.png diff --git a/graphics/interface/trade_glow2.png b/graphics/interface/trade_glow2.png Binary files differnew file mode 100755 index 000000000..e7729bc84 --- /dev/null +++ b/graphics/interface/trade_glow2.png diff --git a/graphics/interface/trade_misc.pal b/graphics/interface/trade_misc.pal new file mode 100755 index 000000000..32fafddfc --- /dev/null +++ b/graphics/interface/trade_misc.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +255 156 123 +164 123 197 +41 255 115 +0 139 255 +255 255 74 +255 255 255 +106 106 106 +255 156 123 +255 156 123 +255 156 123 +255 156 123 +255 156 123 +255 156 123 +255 156 123 +255 156 123 |
