option menu fix conflicts

25 files changed, 76 insertions, 0 deletions

diff --git a/graphics/text_window/1.png b/graphics/text_window/1.png
new file mode 100644
index 000000000..5d8020eff
--- /dev/null
+++ b/graphics/text_window/1.png
diff --git a/graphics/text_window/10.png b/graphics/text_window/10.png
new file mode 100644
index 000000000..b01a75c6a
--- /dev/null
+++ b/graphics/text_window/10.png
diff --git a/graphics/text_window/11.png b/graphics/text_window/11.png
new file mode 100644
index 000000000..a0e576fce
--- /dev/null
+++ b/graphics/text_window/11.png
diff --git a/graphics/text_window/12.png b/graphics/text_window/12.png
new file mode 100644
index 000000000..8bff592ba
--- /dev/null
+++ b/graphics/text_window/12.png
diff --git a/graphics/text_window/13.png b/graphics/text_window/13.png
new file mode 100644
index 000000000..706d13451
--- /dev/null
+++ b/graphics/text_window/13.png
diff --git a/graphics/text_window/14.png b/graphics/text_window/14.png
new file mode 100644
index 000000000..d50862250
--- /dev/null
+++ b/graphics/text_window/14.png
diff --git a/graphics/text_window/15.png b/graphics/text_window/15.png
new file mode 100644
index 000000000..b5d2dbfcd
--- /dev/null
+++ b/graphics/text_window/15.png
diff --git a/graphics/text_window/16.png b/graphics/text_window/16.png
new file mode 100644
index 000000000..eb8ed2cea
--- /dev/null
+++ b/graphics/text_window/16.png
diff --git a/graphics/text_window/17.png b/graphics/text_window/17.png
new file mode 100644
index 000000000..62211b431
--- /dev/null
+++ b/graphics/text_window/17.png
diff --git a/graphics/text_window/18.png b/graphics/text_window/18.png
new file mode 100644
index 000000000..c03fd75f5
--- /dev/null
+++ b/graphics/text_window/18.png
diff --git a/graphics/text_window/19.png b/graphics/text_window/19.png
new file mode 100644
index 000000000..e60d8d579
--- /dev/null
+++ b/graphics/text_window/19.png
diff --git a/graphics/text_window/2.png b/graphics/text_window/2.png
new file mode 100644
index 000000000..5e89b4116
--- /dev/null
+++ b/graphics/text_window/2.png
diff --git a/graphics/text_window/20.png b/graphics/text_window/20.png
new file mode 100644
index 000000000..5786ae140
--- /dev/null
+++ b/graphics/text_window/20.png
diff --git a/graphics/text_window/3.png b/graphics/text_window/3.png
new file mode 100644
index 000000000..b7af18de7
--- /dev/null
+++ b/graphics/text_window/3.png
diff --git a/graphics/text_window/4.png b/graphics/text_window/4.png
new file mode 100644
index 000000000..c33ed48af
--- /dev/null
+++ b/graphics/text_window/4.png
diff --git a/graphics/text_window/5.png b/graphics/text_window/5.png
new file mode 100644
index 000000000..94a0bcdd9
--- /dev/null
+++ b/graphics/text_window/5.png
diff --git a/graphics/text_window/6.png b/graphics/text_window/6.png
new file mode 100644
index 000000000..a0be4e49d
--- /dev/null
+++ b/graphics/text_window/6.png
diff --git a/graphics/text_window/7.png b/graphics/text_window/7.png
new file mode 100644
index 000000000..514f8b554
--- /dev/null
+++ b/graphics/text_window/7.png
diff --git a/graphics/text_window/8.png b/graphics/text_window/8.png
new file mode 100644
index 000000000..480751a02
--- /dev/null
+++ b/graphics/text_window/8.png
diff --git a/graphics/text_window/9.png b/graphics/text_window/9.png
new file mode 100644
index 000000000..7ac3ba811
--- /dev/null
+++ b/graphics/text_window/9.png
diff --git a/graphics/text_window/message_box.png b/graphics/text_window/message_box.png
new file mode 100644
index 000000000..edc2d3d3a
--- /dev/null
+++ b/graphics/text_window/message_box.png
diff --git a/graphics/text_window/text_pal1.pal b/graphics/text_window/text_pal1.pal
new file mode 100644
index 000000000..df5d3c337
--- /dev/null
+++ b/graphics/text_window/text_pal1.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 205 164
+255 255 255
+98 98 98
+213 213 205
+230 8 8
+255 189 115
+32 156 8
+148 246 148
+49 82 205
+164 197 246
+255 255 255
+205 205 222
+205 205 222
+230 246 255
+205 205 222
+106 115 123
diff --git a/graphics/text_window/text_pal2.pal b/graphics/text_window/text_pal2.pal
new file mode 100644
index 000000000..25f63978a
--- /dev/null
+++ b/graphics/text_window/text_pal2.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 205 164
+255 255 255
+98 98 98
+213 213 205
+230 8 8
+255 189 115
+32 156 8
+148 246 148
+49 82 205
+164 197 246
+255 255 255
+74 205 238
+49 164 238
+0 90 131
+24 98 197
+16 115 230
diff --git a/graphics/text_window/text_pal3.pal b/graphics/text_window/text_pal3.pal
new file mode 100644
index 000000000..9cbcdad4c
--- /dev/null
+++ b/graphics/text_window/text_pal3.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 205 164
+255 255 255
+98 98 98
+213 213 205
+230 8 8
+255 189 115
+32 156 8
+148 246 148
+49 82 205
+164 197 246
+255 0 255
+205 213 213
+156 205 222
+98 115 123
+65 172 230
+131 164 180
diff --git a/graphics/text_window/text_pal4.pal b/graphics/text_window/text_pal4.pal
new file mode 100644
index 000000000..a004a081a
--- /dev/null
+++ b/graphics/text_window/text_pal4.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 205 164
+255 255 255
+98 98 98
+213 213 205
+230 8 8
+255 189 115
+32 156 8
+148 246 148
+49 82 205
+164 197 246
+57 98 115
+131 131 131
+164 164 164
+197 197 205
+230 230 238
+65 90 106