diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-12-23 12:57:46 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-12-23 12:57:46 -0500 |
| commit | fdd7e7cb848747a1e0ace8a63d29aaa22dfd1140 (patch) | |
| tree | 6ddaed4de52bfcc517d573a8f30c5bd0a1650782 /graphics | |
| parent | bb8f652504f886af296ffcaac57bf76cdc893c97 (diff) | |
| parent | 1c1ce902515ccb3ccecde29611711c9b1a3ce955 (diff) | |
Merge branch 'master' into cable_car
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/battle_anims/backgrounds/fog.bin (renamed from graphics/weather/fog1.bin) | bin | 2048 -> 2048 bytes | |||
| -rwxr-xr-x | graphics/birch_speech/blank_pal.pal | 11 | ||||
| -rw-r--r-- | graphics/trade/gba.png | bin | 1039 -> 895 bytes | |||
| -rw-r--r-- | graphics/unknown/unknown_E94550.bin | bin | 128 -> 64 bytes | |||
| -rw-r--r-- | graphics/unknown/unknown_E94590.bin | bin | 0 -> 64 bytes | |||
| -rw-r--r-- | graphics/weather/fog2.png (renamed from graphics/weather/fog0.png) | bin | 928 -> 928 bytes |
6 files changed, 11 insertions, 0 deletions
diff --git a/graphics/weather/fog1.bin b/graphics/battle_anims/backgrounds/fog.bin Binary files differindex 1f9d53f95..1f9d53f95 100644 --- a/graphics/weather/fog1.bin +++ b/graphics/battle_anims/backgrounds/fog.bin diff --git a/graphics/birch_speech/blank_pal.pal b/graphics/birch_speech/blank_pal.pal new file mode 100755 index 000000000..7dc528e38 --- /dev/null +++ b/graphics/birch_speech/blank_pal.pal @@ -0,0 +1,11 @@ +JASC-PAL +0100 +8 +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/trade/gba.png b/graphics/trade/gba.png Binary files differindex 61ce32b4f..03519c998 100644 --- a/graphics/trade/gba.png +++ b/graphics/trade/gba.png diff --git a/graphics/unknown/unknown_E94550.bin b/graphics/unknown/unknown_E94550.bin Binary files differindex ba6830b73..ed5feb3d6 100644 --- a/graphics/unknown/unknown_E94550.bin +++ b/graphics/unknown/unknown_E94550.bin diff --git a/graphics/unknown/unknown_E94590.bin b/graphics/unknown/unknown_E94590.bin Binary files differnew file mode 100644 index 000000000..bed9142e8 --- /dev/null +++ b/graphics/unknown/unknown_E94590.bin diff --git a/graphics/weather/fog0.png b/graphics/weather/fog2.png Binary files differindex 198c6f494..198c6f494 100644 --- a/graphics/weather/fog0.png +++ b/graphics/weather/fog2.png |
