Merge branch 'master' into doc-frontierpass2

18 files changed, 19 insertions, 0 deletions

diff --git a/graphics/contest/misc_2_tilemap_3.bin b/graphics/contest/results_screen/bg.bin
index 5055ab79e..5055ab79e 100644
--- a/graphics/contest/misc_2_tilemap_3.bin
+++ b/graphics/contest/results_screen/bg.bin
diff --git a/graphics/contest/misc_2_tilemap_2.bin b/graphics/contest/results_screen/interface.bin
index b31126836..b31126836 100644
--- a/graphics/contest/misc_2_tilemap_2.bin
+++ b/graphics/contest/results_screen/interface.bin
diff --git a/graphics/contest/results_screen/text_window.pal b/graphics/contest/results_screen/text_window.pal
new file mode 100644
index 000000000..1c10c781f
--- /dev/null
+++ b/graphics/contest/results_screen/text_window.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+74 74 74
+255 0 0
+0 255 0
+0 0 255
+255 255 0
+0 255 255
+255 0 255
+213 213 205
+0 0 0
+0 0 0
+230 230 238
+255 255 255
+156 205 255
+123 189 230
+255 255 255
diff --git a/graphics/contest/results_screen/text_window.png b/graphics/contest/results_screen/text_window.png
new file mode 100644
index 000000000..da421b501
--- /dev/null
+++ b/graphics/contest/results_screen/text_window.png
diff --git a/graphics/contest/results_screen.pal b/graphics/contest/results_screen/tiles.pal
index 869aef9e1..869aef9e1 100644
--- a/graphics/contest/results_screen.pal
+++ b/graphics/contest/results_screen/tiles.pal
diff --git a/graphics/contest/results_screen.png b/graphics/contest/results_screen/tiles.png
index 106b975cf..106b975cf 100644
--- a/graphics/contest/results_screen.png
+++ b/graphics/contest/results_screen/tiles.png
diff --git a/graphics/contest/results_screen.bin b/graphics/contest/results_screen/title.bin
index 3b46e00b8..3b46e00b8 100644
--- a/graphics/contest/results_screen.bin
+++ b/graphics/contest/results_screen/title.bin
diff --git a/graphics/contest/results_screen_beauty.bin b/graphics/contest/results_screen/title_beauty.bin
index fe02ec0b5..fe02ec0b5 100644
--- a/graphics/contest/results_screen_beauty.bin
+++ b/graphics/contest/results_screen/title_beauty.bin
diff --git a/graphics/contest/results_screen_cool.bin b/graphics/contest/results_screen/title_cool.bin
index f3939831e..f3939831e 100644
--- a/graphics/contest/results_screen_cool.bin
+++ b/graphics/contest/results_screen/title_cool.bin
diff --git a/graphics/contest/results_screen_cute.bin b/graphics/contest/results_screen/title_cute.bin
index d37d6df3c..d37d6df3c 100644
--- a/graphics/contest/results_screen_cute.bin
+++ b/graphics/contest/results_screen/title_cute.bin
diff --git a/graphics/contest/results_screen_hyper.bin b/graphics/contest/results_screen/title_hyper.bin
index d4bb7bae7..d4bb7bae7 100644
--- a/graphics/contest/results_screen_hyper.bin
+++ b/graphics/contest/results_screen/title_hyper.bin
diff --git a/graphics/contest/results_screen_link.bin b/graphics/contest/results_screen/title_link.bin
index cc07b0f1a..cc07b0f1a 100644
--- a/graphics/contest/results_screen_link.bin
+++ b/graphics/contest/results_screen/title_link.bin
diff --git a/graphics/contest/results_screen_master.bin b/graphics/contest/results_screen/title_master.bin
index 32f24abd6..32f24abd6 100644
--- a/graphics/contest/results_screen_master.bin
+++ b/graphics/contest/results_screen/title_master.bin
diff --git a/graphics/contest/results_screen_normal.bin b/graphics/contest/results_screen/title_normal.bin
index e22f21839..e22f21839 100644
--- a/graphics/contest/results_screen_normal.bin
+++ b/graphics/contest/results_screen/title_normal.bin
diff --git a/graphics/contest/results_screen_smart.bin b/graphics/contest/results_screen/title_smart.bin
index 79d2e3fbb..79d2e3fbb 100644
--- a/graphics/contest/results_screen_smart.bin
+++ b/graphics/contest/results_screen/title_smart.bin
diff --git a/graphics/contest/results_screen_super.bin b/graphics/contest/results_screen/title_super.bin
index 21c804d12..21c804d12 100644
--- a/graphics/contest/results_screen_super.bin
+++ b/graphics/contest/results_screen/title_super.bin
diff --git a/graphics/contest/results_screen_tough.bin b/graphics/contest/results_screen/title_tough.bin
index 2a91bb78d..2a91bb78d 100644
--- a/graphics/contest/results_screen_tough.bin
+++ b/graphics/contest/results_screen/title_tough.bin
diff --git a/graphics/contest/misc_2_tilemap_1.bin b/graphics/contest/results_screen/winner_banner.bin
index 197e88cee..197e88cee 100644
--- a/graphics/contest/misc_2_tilemap_1.bin
+++ b/graphics/contest/results_screen/winner_banner.bin