summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile1
-rwxr-xr-xdelete_palettes.sh20
-rw-r--r--graphics/battle_anims/backgrounds/00.pal19
-rw-r--r--graphics/battle_anims/backgrounds/02.pal19
-rw-r--r--graphics/battle_anims/backgrounds/03.pal19
-rw-r--r--graphics/battle_anims/backgrounds/04.pal19
-rw-r--r--graphics/battle_anims/backgrounds/07.pal19
-rw-r--r--graphics/battle_anims/backgrounds/09.pal19
-rw-r--r--graphics/battle_anims/backgrounds/11.pal19
-rw-r--r--graphics/battle_anims/backgrounds/12.pal19
-rw-r--r--graphics/battle_anims/backgrounds/15.pal19
-rw-r--r--graphics/battle_anims/backgrounds/16.pal19
-rw-r--r--graphics/battle_anims/backgrounds/17.pal19
-rw-r--r--graphics/battle_anims/backgrounds/20.pal19
-rw-r--r--graphics/battle_anims/backgrounds/21.pal19
-rw-r--r--graphics/battle_anims/backgrounds/attract.pal19
-rw-r--r--graphics/battle_anims/backgrounds/scary_face.pal19
-rw-r--r--graphics/battle_anims/backgrounds/water.pal19
-rw-r--r--graphics/battle_anims/masks/cure_bubbles.pal19
-rw-r--r--graphics/battle_anims/masks/metal_shine.pal19
-rw-r--r--graphics/battle_anims/masks/morning_sun.pal19
21 files changed, 21 insertions, 361 deletions
diff --git a/Makefile b/Makefile
index 5ef851b1c..073835112 100644
--- a/Makefile
+++ b/Makefile
@@ -83,6 +83,7 @@ include override.mk
%.4bpp: %.png ; $(GFX) $< $@
%.8bpp: %.png ; $(GFX) $< $@
%.gbapal: %.pal ; $(GFX) $< $@
+%.gbapal: %.png ; $(GFX) $< $@
%.lz: % ; $(GFX) $< $@
%.rl: % ; $(GFX) $< $@
sound/direct_sound_samples/cry_%.bin: sound/direct_sound_samples/cry_%.aif ; $(AIF) $< $@ --compress
diff --git a/delete_palettes.sh b/delete_palettes.sh
new file mode 100755
index 000000000..0951e3d15
--- /dev/null
+++ b/delete_palettes.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+palfiles=$(find graphics -type f -name '*.gbapal')
+
+for f in $palfiles
+do
+ base=$(echo $f | cut -f 1 -d '.')
+ if [ -e "$base.png" ]
+ then
+ tools/gbagfx/gbagfx "$base.png" "$base.new.gbapal"
+ cmp "$f" "$base.new.gbapal"
+ if [ $? ]
+ then
+ echo "warning: $base.png contains a nonmatching palette"
+ else
+ rm "$base.pal"
+ fi
+ rm "$base.new.gbapal"
+ fi
+done
diff --git a/graphics/battle_anims/backgrounds/00.pal b/graphics/battle_anims/backgrounds/00.pal
deleted file mode 100644
index a46b57c02..000000000
--- a/graphics/battle_anims/backgrounds/00.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-0 139 0
-230 57 156
-197 41 123
-164 32 98
-123 24 74
-82 16 49
-41 8 24
-0 0 0
-255 82 180
-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/battle_anims/backgrounds/02.pal b/graphics/battle_anims/backgrounds/02.pal
deleted file mode 100644
index c32ecc328..000000000
--- a/graphics/battle_anims/backgrounds/02.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-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
-106 156 255
-123 139 222
-148 123 189
-164 106 156
-189 98 123
-205 82 90
-230 65 57
-255 57 32
diff --git a/graphics/battle_anims/backgrounds/03.pal b/graphics/battle_anims/backgrounds/03.pal
deleted file mode 100644
index 0c87ad045..000000000
--- a/graphics/battle_anims/backgrounds/03.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-0 0 0
-255 0 0
-164 0 0
-82 0 0
-0 0 0
-41 0 57
-82 0 115
-123 0 172
-148 0 131
-172 0 98
-197 0 65
-222 0 32
-0 0 0
-0 0 0
-0 0 0
-0 0 0
diff --git a/graphics/battle_anims/backgrounds/04.pal b/graphics/battle_anims/backgrounds/04.pal
deleted file mode 100644
index 020e93b7a..000000000
--- a/graphics/battle_anims/backgrounds/04.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-115 164 115
-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
diff --git a/graphics/battle_anims/backgrounds/07.pal b/graphics/battle_anims/backgrounds/07.pal
deleted file mode 100644
index d9c7f07f3..000000000
--- a/graphics/battle_anims/backgrounds/07.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-0 0 0
-106 49 49
-222 0 0
-189 0 0
-156 0 0
-123 0 0
-98 0 0
-0 0 0
-255 255 255
-255 255 164
-255 255 82
-255 255 0
-255 164 0
-255 82 0
-255 0 0
-0 0 0
diff --git a/graphics/battle_anims/backgrounds/09.pal b/graphics/battle_anims/backgrounds/09.pal
deleted file mode 100644
index 4f3613621..000000000
--- a/graphics/battle_anims/backgrounds/09.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-0 0 0
-106 106 255
-123 131 255
-139 156 255
-156 180 255
-172 205 255
-189 230 255
-205 255 255
-230 255 255
-255 255 255
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
diff --git a/graphics/battle_anims/backgrounds/11.pal b/graphics/battle_anims/backgrounds/11.pal
deleted file mode 100644
index 496e1b13c..000000000
--- a/graphics/battle_anims/backgrounds/11.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-0 0 0
-131 82 115
-148 106 131
-172 131 148
-189 156 164
-213 189 189
-222 205 205
-230 222 222
-238 238 238
-255 255 255
-0 32 98
-82 106 148
-164 180 197
-246 0 0
-246 0 0
-246 0 0
diff --git a/graphics/battle_anims/backgrounds/12.pal b/graphics/battle_anims/backgrounds/12.pal
deleted file mode 100644
index 5d4e8b23d..000000000
--- a/graphics/battle_anims/backgrounds/12.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-0 0 0
-246 0 0
-115 90 82
-131 106 65
-148 131 57
-172 156 41
-189 180 32
-213 205 16
-230 230 8
-255 255 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
diff --git a/graphics/battle_anims/backgrounds/15.pal b/graphics/battle_anims/backgrounds/15.pal
deleted file mode 100644
index 90f103423..000000000
--- a/graphics/battle_anims/backgrounds/15.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-0 0 0
-255 255 255
-222 238 246
-197 230 238
-164 213 238
-139 205 230
-115 189 222
-82 139 213
-57 98 213
-32 57 213
-0 0 0
-0 0 115
-0 0 0
-0 0 0
-0 0 0
-0 0 0
diff --git a/graphics/battle_anims/backgrounds/16.pal b/graphics/battle_anims/backgrounds/16.pal
deleted file mode 100644
index 162b80179..000000000
--- a/graphics/battle_anims/backgrounds/16.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-0 0 0
-0 8 65
-32 49 90
-65 98 115
-0 24 205
-255 255 82
-205 148 82
-255 172 115
-213 65 41
-180 255 197
-90 139 197
-255 90 197
-156 90 156
-0 0 0
-0 0 0
-255 255 255
diff --git a/graphics/battle_anims/backgrounds/17.pal b/graphics/battle_anims/backgrounds/17.pal
deleted file mode 100644
index e02a042a2..000000000
--- a/graphics/battle_anims/backgrounds/17.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-0 0 0
-98 189 222
-106 164 222
-123 139 222
-131 115 222
-148 90 222
-255 255 222
-255 255 106
-255 205 98
-205 172 148
-213 172 0
-189 131 0
-172 90 0
-156 57 0
-0 0 0
-0 0 0
diff --git a/graphics/battle_anims/backgrounds/20.pal b/graphics/battle_anims/backgrounds/20.pal
deleted file mode 100644
index 1f4e13d64..000000000
--- a/graphics/battle_anims/backgrounds/20.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-0 0 0
-24 131 98
-41 139 106
-57 156 123
-82 172 139
-98 180 148
-115 197 164
-139 213 180
-172 230 197
-205 255 222
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
diff --git a/graphics/battle_anims/backgrounds/21.pal b/graphics/battle_anims/backgrounds/21.pal
deleted file mode 100644
index 0f999d51b..000000000
--- a/graphics/battle_anims/backgrounds/21.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-0 0 0
-246 222 197
-230 189 148
-213 156 98
-205 123 49
-172 90 32
-139 57 16
-115 24 0
-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/battle_anims/backgrounds/attract.pal b/graphics/battle_anims/backgrounds/attract.pal
deleted file mode 100644
index a3a183566..000000000
--- a/graphics/battle_anims/backgrounds/attract.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-0 0 0
-255 172 205
-255 189 213
-255 205 222
-255 222 230
-148 8 0
-255 205 230
-255 180 213
-255 164 197
-255 148 189
-255 131 172
-246 106 139
-238 82 115
-238 57 90
-230 32 65
-230 8 41
diff --git a/graphics/battle_anims/backgrounds/scary_face.pal b/graphics/battle_anims/backgrounds/scary_face.pal
deleted file mode 100644
index 580360ac0..000000000
--- a/graphics/battle_anims/backgrounds/scary_face.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-0 0 0
-123 98 0
-189 172 0
-255 255 0
-255 189 0
-255 123 0
-255 57 0
-255 0 0
-230 8 16
-205 16 32
-180 24 49
-156 32 65
-131 41 82
-106 49 98
-0 0 0
-0 0 0
diff --git a/graphics/battle_anims/backgrounds/water.pal b/graphics/battle_anims/backgrounds/water.pal
deleted file mode 100644
index ee7a7b6e2..000000000
--- a/graphics/battle_anims/backgrounds/water.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-106 148 139
-98 90 255
-115 106 255
-139 131 255
-164 156 255
-180 180 255
-205 205 255
-230 230 255
-255 255 255
-98 90 255
-115 106 255
-197 197 255
-238 238 255
-255 255 255
-0 0 0
-0 0 0
diff --git a/graphics/battle_anims/masks/cure_bubbles.pal b/graphics/battle_anims/masks/cure_bubbles.pal
deleted file mode 100644
index 2868f2479..000000000
--- a/graphics/battle_anims/masks/cure_bubbles.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-0 0 0
-255 255 255
-189 255 255
-123 255 255
-57 255 255
-57 205 238
-57 156 230
-57 106 213
-65 57 205
-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/battle_anims/masks/metal_shine.pal b/graphics/battle_anims/masks/metal_shine.pal
deleted file mode 100644
index 019a17c3f..000000000
--- a/graphics/battle_anims/masks/metal_shine.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-82 172 255
-255 255 255
-164 148 139
-98 131 41
-123 156 65
-148 180 90
-172 205 115
-197 230 139
-222 255 164
-82 172 0
-98 180 24
-123 197 49
-148 213 74
-172 222 98
-197 238 123
-222 255 148
diff --git a/graphics/battle_anims/masks/morning_sun.pal b/graphics/battle_anims/masks/morning_sun.pal
deleted file mode 100644
index 08249a43c..000000000
--- a/graphics/battle_anims/masks/morning_sun.pal
+++ /dev/null
@@ -1,19 +0,0 @@
-JASC-PAL
-0100
-16
-0 0 0
-255 255 255
-222 246 246
-189 238 238
-156 230 238
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0