Clean up some palette stuff, update main.asm and layout.link.

11 files changed, 211 insertions, 214 deletions

diff --git a/gfx/font/font_inversed.1bpp b/gfx/font/font_inversed.1bpp
new file mode 100644
index 00000000..39a7e73d
--- /dev/null
+++ b/gfx/font/font_inversed.1bpp
@@ -0,0 +1 @@
+��׻�}}�{{}}�ý���{}}}{�

�
�ýa}���}}}
}}}�����������www��{woO7{}�
�}9Um}}}�}=]muy}�ǻ}}}���}}�ǻ}}u���}}w{}��{��}��
�������}}}}}���}}������}}mU99}�9���׻9�}�������
���߿
���������������������������������������������������û����������������������������ý�������������������������������������������������������������mmmm�����������ý������������������������������ÿ�����������������������������}mmU����;��׹��������������߁���������������������������������������������������׻�}}��ǻ}}����}}}}�������û����ý��������������������������������������������������������������������������������������������=�}�����7�w�����?�i�����?�l�����?�a�����?�A�����?�]�������������������������������������������������������������������������������������ouu���'Www�����������������������������1���������������������ϗ�ͥ3���?ý�����������������������������

������ǫmǻ�����ߏߏ������׻�������������߿���������ǻ������dz99������������9�
������9����Ó3
����9����?99���
9�������9�99����99����
\ No newline at end of file
diff --git a/gfx/font/font_inversed.png b/gfx/font/font_inversed.png
new file mode 100644
index 00000000..519339f3
--- /dev/null
+++ b/gfx/font/font_inversed.png
diff --git a/gfx/pokemon/egg/front.png b/gfx/pokemon/egg/front.png
index 0642c28c..e28f5892 100644
--- a/gfx/pokemon/egg/front.png
+++ b/gfx/pokemon/egg/front.png
diff --git a/gfx/pokemon/egg/normal.pal b/gfx/pokemon/egg/normal.pal
new file mode 100644
index 00000000..a24d6f55
--- /dev/null
+++ b/gfx/pokemon/egg/normal.pal
@@ -0,0 +1,2 @@
+	RGB 30, 26, 11
+	RGB 23, 16, 00
diff --git a/gfx/pokemon/egg/shiny.pal b/gfx/pokemon/egg/shiny.pal
new file mode 100644
index 00000000..a24d6f55
--- /dev/null
+++ b/gfx/pokemon/egg/shiny.pal
@@ -0,0 +1,2 @@
+	RGB 30, 26, 11
+	RGB 23, 16, 00
diff --git a/gfx/slots/slots.pal b/gfx/slots/slots.pal
deleted file mode 100644
index 0121d294..00000000
--- a/gfx/slots/slots.pal
+++ /dev/null
@@ -1,162 +0,0 @@
-IF DEF(_GOLD)
-	RGB 31, 31, 31
-	RGB 24, 25, 28
-	RGB 24, 24, 09
-	RGB 00, 00, 00
-
-	RGB 31, 31, 31
-	RGB 30, 10, 06
-	RGB 24, 24, 09
-	RGB 00, 00, 00
-
-	RGB 31, 31, 31
-	RGB 15, 31, 00
-	RGB 24, 24, 09
-	RGB 00, 00, 00
-
-	RGB 31, 31, 31
-	RGB 31, 15, 31
-	RGB 24, 24, 09
-	RGB 00, 00, 00
-
-	RGB 31, 31, 31
-	RGB 15, 21, 31
-	RGB 24, 24, 09
-	RGB 00, 00, 00
-
-	RGB 31, 31, 11
-	RGB 31, 31, 06
-	RGB 24, 24, 09
-	RGB 00, 00, 00
-
-	RGB 31, 31, 31
-	RGB 16, 19, 29
-	RGB 25, 22, 00
-	RGB 00, 00, 00
-
-	RGB 31, 31, 31
-	RGB 21, 21, 21
-	RGB 13, 13, 13
-	RGB 00, 00, 00
-
-	RGB 31, 31, 31
-	RGB 30, 10, 06
-	RGB 31, 00, 00
-	RGB 00, 00, 00
-
-	RGB 31, 31, 31
-	RGB 12, 25, 01
-	RGB 05, 14, 00
-	RGB 00, 00, 00
-
-	RGB 31, 31, 31
-	RGB 12, 25, 01
-	RGB 30, 10, 06
-	RGB 00, 00, 00
-
-	RGB 31, 31, 31
-	RGB 31, 31, 06
-	RGB 20, 15, 03
-	RGB 00, 00, 00
-
-	RGB 31, 31, 31
-	RGB 31, 31, 06
-	RGB 15, 21, 31
-	RGB 00, 00, 00
-
-	RGB 31, 31, 31
-	RGB 31, 31, 06
-	RGB 20, 15, 03
-	RGB 00, 00, 00
-
-	RGB 31, 31, 31
-	RGB 31, 24, 21
-	RGB 31, 13, 31
-	RGB 00, 00, 00
-
-	RGB 31, 31, 31
-	RGB 31, 31, 31
-	RGB 00, 00, 00
-	RGB 00, 00, 00
-
-ELIF DEF(_SILVER)
-	RGB 31, 31, 31
-	RGB 25, 26, 14
-	RGB 20, 17, 31
-	RGB  0,  0,  0
-
-	RGB 31, 31, 31
-	RGB 30, 10,  6
-	RGB 20, 17, 31
-	RGB  0,  0,  0
-
-	RGB 31, 31, 31
-	RGB 15, 31,  0
-	RGB 20, 17, 31
-	RGB  0,  0,  0
-
-	RGB 31, 31, 31
-	RGB 31, 15, 31
-	RGB 20, 17, 31
-	RGB  0,  0,  0
-
-	RGB 31, 31, 31
-	RGB 15, 21, 31
-	RGB 20, 17, 31
-	RGB  0,  0,  0
-
-	RGB 31, 31, 11
-	RGB 31, 31,  6
-	RGB 20, 17, 31
-	RGB  0,  0,  0
-
-	RGB 31, 31, 31
-	RGB 16, 19, 29
-	RGB 25, 22,  0
-	RGB  0,  0,  0
-
-	RGB 31, 31, 31
-	RGB 21, 21, 21
-	RGB 13, 13, 13
-	RGB  0,  0,  0
-
-	RGB 31, 31, 31
-	RGB 30, 10,  6
-	RGB 31,  0,  0
-	RGB  0,  0,  0
-
-	RGB 31, 31, 31
-	RGB 12, 25,  1
-	RGB  5, 14,  0
-	RGB  0,  0,  0
-
-	RGB 31, 31, 31
-	RGB 12, 25,  1
-	RGB 30, 10,  6
-	RGB  0,  0,  0
-
-	RGB 31, 31, 31
-	RGB 31, 31,  6
-	RGB 20, 15,  3
-	RGB  0,  0,  0
-
-	RGB 31, 31, 31
-	RGB 31, 31,  6
-	RGB 15, 21, 31
-	RGB  0,  0,  0
-
-	RGB 31, 31, 31
-	RGB 31, 31,  6
-	RGB 20, 15,  3
-	RGB  0,  0,  0
-
-	RGB 31, 31, 31
-	RGB 31, 24, 21
-	RGB 31, 13, 31
-	RGB  0,  0,  0
-
-	RGB 31, 31, 31
-	RGB 31, 31, 31
-	RGB  0,  0,  0
-	RGB  0,  0,  0
-ENDC
diff --git a/gfx/slots/slots_gold.pal b/gfx/slots/slots_gold.pal
new file mode 100644
index 00000000..0eec479f
--- /dev/null
+++ b/gfx/slots/slots_gold.pal
@@ -0,0 +1,79 @@
+	RGB 31, 31, 31
+	RGB 24, 25, 28
+	RGB 24, 24, 09
+	RGB 00, 00, 00
+
+	RGB 31, 31, 31
+	RGB 30, 10, 06
+	RGB 24, 24, 09
+	RGB 00, 00, 00
+
+	RGB 31, 31, 31
+	RGB 15, 31, 00
+	RGB 24, 24, 09
+	RGB 00, 00, 00
+
+	RGB 31, 31, 31
+	RGB 31, 15, 31
+	RGB 24, 24, 09
+	RGB 00, 00, 00
+
+	RGB 31, 31, 31
+	RGB 15, 21, 31
+	RGB 24, 24, 09
+	RGB 00, 00, 00
+
+	RGB 31, 31, 11
+	RGB 31, 31, 06
+	RGB 24, 24, 09
+	RGB 00, 00, 00
+
+	RGB 31, 31, 31
+	RGB 16, 19, 29
+	RGB 25, 22, 00
+	RGB 00, 00, 00
+
+	RGB 31, 31, 31
+	RGB 21, 21, 21
+	RGB 13, 13, 13
+	RGB 00, 00, 00
+
+	RGB 31, 31, 31
+	RGB 30, 10, 06
+	RGB 31, 00, 00
+	RGB 00, 00, 00
+
+	RGB 31, 31, 31
+	RGB 12, 25, 01
+	RGB 05, 14, 00
+	RGB 00, 00, 00
+
+	RGB 31, 31, 31
+	RGB 12, 25, 01
+	RGB 30, 10, 06
+	RGB 00, 00, 00
+
+	RGB 31, 31, 31
+	RGB 31, 31, 06
+	RGB 20, 15, 03
+	RGB 00, 00, 00
+
+	RGB 31, 31, 31
+	RGB 31, 31, 06
+	RGB 15, 21, 31
+	RGB 00, 00, 00
+
+	RGB 31, 31, 31
+	RGB 31, 31, 06
+	RGB 20, 15, 03
+	RGB 00, 00, 00
+
+	RGB 31, 31, 31
+	RGB 31, 24, 21
+	RGB 31, 13, 31
+	RGB 00, 00, 00
+
+	RGB 31, 31, 31
+	RGB 31, 31, 31
+	RGB 00, 00, 00
+	RGB 00, 00, 00
diff --git a/gfx/slots/slots_silver.pal b/gfx/slots/slots_silver.pal
new file mode 100644
index 00000000..1e935af0
--- /dev/null
+++ b/gfx/slots/slots_silver.pal
@@ -0,0 +1,79 @@
+	RGB 31, 31, 31
+	RGB 25, 26, 14
+	RGB 20, 17, 31
+	RGB 00, 00, 00
+
+	RGB 31, 31, 31
+	RGB 30, 10, 06
+	RGB 20, 17, 31
+	RGB 00, 00, 00
+
+	RGB 31, 31, 31
+	RGB 15, 31, 00
+	RGB 20, 17, 31
+	RGB 00, 00, 00
+
+	RGB 31, 31, 31
+	RGB 31, 15, 31
+	RGB 20, 17, 31
+	RGB 00, 00, 00
+
+	RGB 31, 31, 31
+	RGB 15, 21, 31
+	RGB 20, 17, 31
+	RGB 00, 00, 00
+
+	RGB 31, 31, 11
+	RGB 31, 31, 06
+	RGB 20, 17, 31
+	RGB 00, 00, 00
+
+	RGB 31, 31, 31
+	RGB 16, 19, 29
+	RGB 25, 22, 00
+	RGB 00, 00, 00
+
+	RGB 31, 31, 31
+	RGB 21, 21, 21
+	RGB 13, 13, 13
+	RGB 00, 00, 00
+
+	RGB 31, 31, 31
+	RGB 30, 10, 06
+	RGB 31, 00, 00
+	RGB 00, 00, 00
+
+	RGB 31, 31, 31
+	RGB 12, 25, 01
+	RGB 05, 14, 00
+	RGB 00, 00, 00
+
+	RGB 31, 31, 31
+	RGB 12, 25, 01
+	RGB 30, 10, 06
+	RGB 00, 00, 00
+
+	RGB 31, 31, 31
+	RGB 31, 31, 06
+	RGB 20, 15, 03
+	RGB 00, 00, 00
+
+	RGB 31, 31, 31
+	RGB 31, 31, 06
+	RGB 15, 21, 31
+	RGB 00, 00, 00
+
+	RGB 31, 31, 31
+	RGB 31, 31, 06
+	RGB 20, 15, 03
+	RGB 00, 00, 00
+
+	RGB 31, 31, 31
+	RGB 31, 24, 21
+	RGB 31, 13, 31
+	RGB 00, 00, 00
+
+	RGB 31, 31, 31
+	RGB 31, 31, 31
+	RGB 00, 00, 00
+	RGB 00, 00, 00
diff --git a/gfx/title/title_bg.pal b/gfx/title/title_bg.pal
deleted file mode 100644
index c1e2690f..00000000
--- a/gfx/title/title_bg.pal
+++ /dev/null
@@ -1,52 +0,0 @@
-IF DEF(_GOLD)
-	RGB 31, 31, 31
-	RGB 18, 23, 31
-	RGB 15, 20, 31
-	RGB  0,  0,  0
-
-	RGB 31, 21,  0
-	RGB 12, 14, 12
-	RGB 15, 20, 31
-	RGB  0,  0, 17
-
-	RGB 31, 31, 31
-	RGB 31,  0,  0
-	RGB 15, 20, 31
-	RGB  0,  0,  0
-
-	RGB 31, 31, 31
-	RGB 29, 25,  0
-	RGB 15, 20, 31
-	RGB 17, 10,  1
-
-	RGB 31, 31, 31
-	RGB 23, 26, 31
-	RGB 18, 23, 31
-	RGB  0,  0,  0
-
-ELIF DEF(_SILVER)
-	RGB 31, 31, 31
-	RGB  0, 12, 15
-	RGB  4,  8, 21
-	RGB  0,  0,  0
-
-	RGB 31, 21,  0
-	RGB 15, 17, 15
-	RGB  4,  8, 21
-	RGB  0,  0, 17
-
-	RGB 31, 31, 31
-	RGB 31,  0,  0
-	RGB  4,  8, 21
-	RGB  0,  0,  0
-
-	RGB 31, 31, 31
-	RGB 24, 23, 25
-	RGB  4,  8, 21
-	RGB  8,  8,  9
-
-	RGB 31, 31, 31
-	RGB  5, 10, 11
-	RGB  0, 12, 15
-	RGB  0,  0,  0
-ENDC
diff --git a/gfx/title/title_bg_gold.pal b/gfx/title/title_bg_gold.pal
new file mode 100644
index 00000000..88be368c
--- /dev/null
+++ b/gfx/title/title_bg_gold.pal
@@ -0,0 +1,24 @@
+	RGB 31, 31, 31
+	RGB 18, 23, 31
+	RGB 15, 20, 31
+	RGB 00, 00, 00
+
+	RGB 31, 21, 00
+	RGB 12, 14, 12
+	RGB 15, 20, 31
+	RGB 00, 00, 17
+
+	RGB 31, 31, 31
+	RGB 31, 00, 00
+	RGB 15, 20, 31
+	RGB 00, 00, 00
+
+	RGB 31, 31, 31
+	RGB 29, 25, 00
+	RGB 15, 20, 31
+	RGB 17, 10, 01
+
+	RGB 31, 31, 31
+	RGB 23, 26, 31
+	RGB 18, 23, 31
+	RGB 00, 00, 00
diff --git a/gfx/title/title_bg_silver.pal b/gfx/title/title_bg_silver.pal
new file mode 100644
index 00000000..9103edab
--- /dev/null
+++ b/gfx/title/title_bg_silver.pal
@@ -0,0 +1,24 @@
+	RGB 31, 31, 31
+	RGB 00, 12, 15
+	RGB 04, 08, 21
+	RGB 00, 00, 00
+
+	RGB 31, 21, 00
+	RGB 15, 17, 15
+	RGB 04, 08, 21
+	RGB 00, 00, 17
+
+	RGB 31, 31, 31
+	RGB 31, 00, 00
+	RGB 04, 08, 21
+	RGB 00, 00, 00
+
+	RGB 31, 31, 31
+	RGB 24, 23, 25
+	RGB 04, 08, 21
+	RGB 08, 08, 09
+
+	RGB 31, 31, 31
+	RGB 05, 10, 11
+	RGB 00, 12, 15
+	RGB 00, 00, 00