summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiegoisawesome <diego@domoreaweso.me>2018-01-20 00:49:43 -0600
committerDiegoisawesome <diego@domoreaweso.me>2018-01-20 00:49:43 -0600
commit4cb2853344b6442d5b7f2fdab8fdd981d1fe63b5 (patch)
treeb76aac6a84fdda701fd83a3b2d2134f78ad84c1c
parentce3ab413ba48d3bca6b83ef0117f396d349c3f02 (diff)
parent098671750b2ccc4be5815da7cab6d78c8b7eccc4 (diff)
Merge branch 'dump_data' of https://github.com/Diegoisawesome/pokeemerald
-rw-r--r--data/graphics.s6
-rw-r--r--data/text_window.s270
-rwxr-xr-xgraphics/interface/textbox.pngbin198 -> 0 bytes
-rw-r--r--graphics/text_window/1.pngbin0 -> 199 bytes
-rw-r--r--graphics/text_window/10.pngbin0 -> 316 bytes
-rw-r--r--graphics/text_window/11.pngbin0 -> 285 bytes
-rw-r--r--graphics/text_window/12.pngbin0 -> 354 bytes
-rw-r--r--graphics/text_window/13.pngbin0 -> 276 bytes
-rw-r--r--graphics/text_window/14.pngbin0 -> 320 bytes
-rw-r--r--graphics/text_window/15.pngbin0 -> 327 bytes
-rw-r--r--graphics/text_window/16.pngbin0 -> 292 bytes
-rw-r--r--graphics/text_window/17.pngbin0 -> 385 bytes
-rw-r--r--graphics/text_window/18.pngbin0 -> 284 bytes
-rw-r--r--graphics/text_window/19.pngbin0 -> 346 bytes
-rw-r--r--graphics/text_window/2.pngbin0 -> 183 bytes
-rw-r--r--graphics/text_window/20.pngbin0 -> 314 bytes
-rw-r--r--graphics/text_window/3.pngbin0 -> 272 bytes
-rw-r--r--graphics/text_window/4.pngbin0 -> 242 bytes
-rw-r--r--graphics/text_window/5.pngbin0 -> 323 bytes
-rw-r--r--graphics/text_window/6.pngbin0 -> 268 bytes
-rw-r--r--graphics/text_window/7.pngbin0 -> 394 bytes
-rw-r--r--graphics/text_window/8.pngbin0 -> 241 bytes
-rw-r--r--graphics/text_window/9.pngbin0 -> 325 bytes
-rw-r--r--graphics/text_window/message_box.pngbin0 -> 241 bytes
-rw-r--r--graphics/text_window/text_pal1.pal19
-rw-r--r--graphics/text_window/text_pal2.pal19
-rw-r--r--graphics/text_window/text_pal3.pal19
-rw-r--r--graphics/text_window/text_pal4.pal19
-rwxr-xr-xsrc/save_failed_screen.c8
-rw-r--r--src/text_window.c4
30 files changed, 233 insertions, 131 deletions
diff --git a/data/graphics.s b/data/graphics.s
index c1ca77035..ce7c2c3ba 100644
--- a/data/graphics.s
+++ b/data/graphics.s
@@ -5042,11 +5042,11 @@ gUnknown_08DDD704:: @ 8DDD704
.align 2
gUnknown_08DDD728:: @ 8DDD728
- .incbin "graphics/interface/textbox.gbapal" @ textbox palette?
+ .incbin "graphics/text_window/message_box.gbapal"
.align 2
-gUnknown_08DDD748:: @ 8DDD748
- .incbin "graphics/interface/textbox.4bpp"
+gMessageBox_Gfx:: @ 8DDD748
+ .incbin "graphics/text_window/message_box.4bpp"
.align 2
gWallpaperIcon_Cross::
diff --git a/data/text_window.s b/data/text_window.s
index 716425100..8acbe5a25 100644
--- a/data/text_window.s
+++ b/data/text_window.s
@@ -2,169 +2,195 @@
.include "constants/constants.inc"
.section .rodata
- .align 2, 0
-gUnknown_0850E87C:: @ 850E87C
- .incbin "baserom.gba", 0x50e87c, 0x120
+ .align 2
+gTextWindowFrame1_Gfx:: @ 850E87C
+ .incbin "graphics/text_window/1.4bpp"
-gUnknown_0850E99C:: @ 850E99C
- .incbin "baserom.gba", 0x50e99c, 0x120
+ .align 2
+gTextWindowFrame2_Gfx:: @ 850E99C
+ .incbin "graphics/text_window/2.4bpp"
-gUnknown_0850EABC:: @ 850EABC
- .incbin "baserom.gba", 0x50eabc, 0x120
+ .align 2
+gTextWindowFrame3_Gfx:: @ 850EABC
+ .incbin "graphics/text_window/3.4bpp"
-gUnknown_0850EBDC:: @ 850EBDC
- .incbin "baserom.gba", 0x50ebdc, 0x120
+ .align 2
+gTextWindowFrame4_Gfx:: @ 850EBDC
+ .incbin "graphics/text_window/4.4bpp"
-gUnknown_0850ECFC:: @ 850ECFC
- .incbin "baserom.gba", 0x50ecfc, 0x120
+ .align 2
+gTextWindowFrame5_Gfx:: @ 850ECFC
+ .incbin "graphics/text_window/5.4bpp"
-gUnknown_0850EE1C:: @ 850EE1C
- .incbin "baserom.gba", 0x50ee1c, 0x120
+ .align 2
+gTextWindowFrame6_Gfx:: @ 850EE1C
+ .incbin "graphics/text_window/6.4bpp"
-gUnknown_0850EF3C:: @ 850EF3C
- .incbin "baserom.gba", 0x50ef3c, 0x120
+ .align 2
+gTextWindowFrame7_Gfx:: @ 850EF3C
+ .incbin "graphics/text_window/7.4bpp"
-gUnknown_0850F05C:: @ 850F05C
- .incbin "baserom.gba", 0x50f05c, 0x120
+ .align 2
+gTextWindowFrame8_Gfx:: @ 850F05C
+ .incbin "graphics/text_window/8.4bpp"
-gUnknown_0850F17C:: @ 850F17C
- .incbin "baserom.gba", 0x50f17c, 0x120
+ .align 2
+gTextWindowFrame9_Gfx:: @ 850F17C
+ .incbin "graphics/text_window/9.4bpp"
-gUnknown_0850F29C:: @ 850F29C
- .incbin "baserom.gba", 0x50f29c, 0x120
+ .align 2
+gTextWindowFrame10_Gfx:: @ 850F29C
+ .incbin "graphics/text_window/10.4bpp"
-gUnknown_0850F3BC:: @ 850F3BC
- .incbin "baserom.gba", 0x50f3bc, 0x120
+ .align 2
+gTextWindowFrame11_Gfx:: @ 850F3BC
+ .incbin "graphics/text_window/11.4bpp"
-gUnknown_0850F4DC:: @ 850F4DC
- .incbin "baserom.gba", 0x50f4dc, 0x120
+ .align 2
+gTextWindowFrame12_Gfx:: @ 850F4DC
+ .incbin "graphics/text_window/12.4bpp"
-gUnknown_0850F5FC:: @ 850F5FC
- .incbin "baserom.gba", 0x50f5fc, 0x120
+ .align 2
+gTextWindowFrame13_Gfx:: @ 850F5FC
+ .incbin "graphics/text_window/13.4bpp"
-gUnknown_0850F71C:: @ 850F71C
- .incbin "baserom.gba", 0x50f71c, 0x120
+ .align 2
+gTextWindowFrame14_Gfx:: @ 850F71C
+ .incbin "graphics/text_window/14.4bpp"
-gUnknown_0850F83C:: @ 850F83C
- .incbin "baserom.gba", 0x50f83c, 0x120
+ .align 2
+gTextWindowFrame15_Gfx:: @ 850F83C
+ .incbin "graphics/text_window/15.4bpp"
-gUnknown_0850F95C:: @ 850F95C
- .incbin "baserom.gba", 0x50f95c, 0x120
+ .align 2
+gTextWindowFrame16_Gfx:: @ 850F95C
+ .incbin "graphics/text_window/16.4bpp"
-gUnknown_0850FA7C:: @ 850FA7C
- .incbin "baserom.gba", 0x50fa7c, 0x120
+ .align 2
+gTextWindowFrame17_Gfx:: @ 850FA7C
+ .incbin "graphics/text_window/17.4bpp"
-gUnknown_0850FB9C:: @ 850FB9C
- .incbin "baserom.gba", 0x50fb9c, 0x120
+ .align 2
+gTextWindowFrame18_Gfx:: @ 850FB9C
+ .incbin "graphics/text_window/18.4bpp"
-gUnknown_0850FCBC:: @ 850FCBC
- .incbin "baserom.gba", 0x50fcbc, 0x120
+ .align 2
+gTextWindowFrame19_Gfx:: @ 850FCBC
+ .incbin "graphics/text_window/19.4bpp"
-gUnknown_0850FDDC:: @ 850FDDC
- .incbin "baserom.gba", 0x50fddc, 0x120
+ .align 2
+gTextWindowFrame20_Gfx:: @ 850FDDC
+ .incbin "graphics/text_window/20.4bpp"
-gUnknown_0850FEFC:: @ 850FEFC
- .incbin "baserom.gba", 0x50fefc, 0x20
+ .align 2
+gTextWindowFrame1_Pal:: @ 850FEFC
+ .incbin "graphics/text_window/1.gbapal"
-gUnknown_0850FF1C:: @ 850FF1C
- .incbin "baserom.gba", 0x50ff1c, 0x20
+ .align 2
+gTextWindowFrame2_Pal:: @ 850FF1C
+ .incbin "graphics/text_window/2.gbapal"
-gUnknown_0850FF3C:: @ 850FF3C
- .incbin "baserom.gba", 0x50ff3c, 0x20
+ .align 2
+gTextWindowFrame3_Pal:: @ 850FF3C
+ .incbin "graphics/text_window/3.gbapal"
-gUnknown_0850FF5C:: @ 850FF5C
- .incbin "baserom.gba", 0x50ff5c, 0x20
+ .align 2
+gTextWindowFrame4_Pal:: @ 850FF5C
+ .incbin "graphics/text_window/4.gbapal"
-gUnknown_0850FF7C:: @ 850FF7C
- .incbin "baserom.gba", 0x50ff7c, 0x20
+ .align 2
+gTextWindowFrame5_Pal:: @ 850FF7C
+ .incbin "graphics/text_window/5.gbapal"
-gUnknown_0850FF9C:: @ 850FF9C
- .incbin "baserom.gba", 0x50ff9c, 0x20
+ .align 2
+gTextWindowFrame6_Pal:: @ 850FF9C
+ .incbin "graphics/text_window/6.gbapal"
-gUnknown_0850FFBC:: @ 850FFBC
- .incbin "baserom.gba", 0x50ffbc, 0x20
+ .align 2
+gTextWindowFrame7_Pal:: @ 850FFBC
+ .incbin "graphics/text_window/7.gbapal"
-gUnknown_0850FFDC:: @ 850FFDC
- .incbin "baserom.gba", 0x50ffdc, 0x20
+ .align 2
+gTextWindowFrame8_Pal:: @ 850FFDC
+ .incbin "graphics/text_window/8.gbapal"
-gUnknown_0850FFFC:: @ 850FFFC
- .incbin "baserom.gba", 0x50fffc, 0x20
+ .align 2
+gTextWindowFrame9_Pal:: @ 850FFFC
+ .incbin "graphics/text_window/9.gbapal"
-gUnknown_0851001C:: @ 851001C
- .incbin "baserom.gba", 0x51001c, 0x20
+ .align 2
+gTextWindowFrame10_Pal:: @ 851001C
+ .incbin "graphics/text_window/10.gbapal"
-gUnknown_0851003C:: @ 851003C
- .incbin "baserom.gba", 0x51003c, 0x20
+ .align 2
+gTextWindowFrame11_Pal:: @ 851003C
+ .incbin "graphics/text_window/11.gbapal"
-gUnknown_0851005C:: @ 851005C
- .incbin "baserom.gba", 0x51005c, 0x20
+ .align 2
+gTextWindowFrame12_Pal:: @ 851005C
+ .incbin "graphics/text_window/12.gbapal"
-gUnknown_0851007C:: @ 851007C
- .incbin "baserom.gba", 0x51007c, 0x20
+ .align 2
+gTextWindowFrame13_Pal:: @ 851007C
+ .incbin "graphics/text_window/13.gbapal"
-gUnknown_0851009C:: @ 851009C
- .incbin "baserom.gba", 0x51009c, 0x20
+ .align 2
+gTextWindowFrame14_Pal:: @ 851009C
+ .incbin "graphics/text_window/14.gbapal"
-gUnknown_085100BC:: @ 85100BC
- .incbin "baserom.gba", 0x5100bc, 0x20
+ .align 2
+gTextWindowFrame15_Pal:: @ 85100BC
+ .incbin "graphics/text_window/15.gbapal"
-gUnknown_085100DC:: @ 85100DC
- .incbin "baserom.gba", 0x5100dc, 0x20
+ .align 2
+gTextWindowFrame16_Pal:: @ 85100DC
+ .incbin "graphics/text_window/16.gbapal"
-gUnknown_085100FC:: @ 85100FC
- .incbin "baserom.gba", 0x5100fc, 0x20
+ .align 2
+gTextWindowFrame17_Pal:: @ 85100FC
+ .incbin "graphics/text_window/17.gbapal"
-gUnknown_0851011C:: @ 851011C
- .incbin "baserom.gba", 0x51011c, 0x20
+ .align 2
+gTextWindowFrame18_Pal:: @ 851011C
+ .incbin "graphics/text_window/18.gbapal"
-gUnknown_0851013C:: @ 851013C
- .incbin "baserom.gba", 0x51013c, 0x20
+ .align 2
+gTextWindowFrame19_Pal:: @ 851013C
+ .incbin "graphics/text_window/19.gbapal"
-gUnknown_0851015C:: @ 851015C
- .incbin "baserom.gba", 0x51015c, 0x20
+ .align 2
+gTextWindowFrame20_Pal:: @ 851015C
+ .incbin "graphics/text_window/20.gbapal"
+ .align 2
gUnknown_0851017C:: @ 851017C
- .incbin "baserom.gba", 0x51017c, 0xA0
+ .incbin "graphics/text_window/message_box.gbapal"
+ .incbin "graphics/text_window/text_pal1.gbapal"
+ .incbin "graphics/text_window/text_pal2.gbapal"
+ .incbin "graphics/text_window/text_pal3.gbapal"
+ .incbin "graphics/text_window/text_pal4.gbapal"
+
+ .align 2
gUnknown_0851021C:: @ 851021C
- .4byte gUnknown_0850E87C
- .4byte gUnknown_0850FEFC
- .4byte gUnknown_0850E99C
- .4byte gUnknown_0850FF1C
- .4byte gUnknown_0850EABC
- .4byte gUnknown_0850FF3C
- .4byte gUnknown_0850EBDC
- .4byte gUnknown_0850FF5C
- .4byte gUnknown_0850ECFC
- .4byte gUnknown_0850FF7C
- .4byte gUnknown_0850EE1C
- .4byte gUnknown_0850FF9C
- .4byte gUnknown_0850EF3C
- .4byte gUnknown_0850FFBC
- .4byte gUnknown_0850F05C
- .4byte gUnknown_0850FFDC
- .4byte gUnknown_0850F17C
- .4byte gUnknown_0850FFFC
- .4byte gUnknown_0850F29C
- .4byte gUnknown_0851001C
- .4byte gUnknown_0850F3BC
- .4byte gUnknown_0851003C
- .4byte gUnknown_0850F4DC
- .4byte gUnknown_0851005C
- .4byte gUnknown_0850F5FC
- .4byte gUnknown_0851007C
- .4byte gUnknown_0850F71C
- .4byte gUnknown_0851009C
- .4byte gUnknown_0850F83C
- .4byte gUnknown_085100BC
- .4byte gUnknown_0850F95C
- .4byte gUnknown_085100DC
- .4byte gUnknown_0850FA7C
- .4byte gUnknown_085100FC
- .4byte gUnknown_0850FB9C
- .4byte gUnknown_0851011C
- .4byte gUnknown_0850FCBC
- .4byte gUnknown_0851013C
- .4byte gUnknown_0850FDDC
- .4byte gUnknown_0851015C
+ .4byte gTextWindowFrame1_Gfx, gTextWindowFrame1_Pal
+ .4byte gTextWindowFrame2_Gfx, gTextWindowFrame2_Pal
+ .4byte gTextWindowFrame3_Gfx, gTextWindowFrame3_Pal
+ .4byte gTextWindowFrame4_Gfx, gTextWindowFrame4_Pal
+ .4byte gTextWindowFrame5_Gfx, gTextWindowFrame5_Pal
+ .4byte gTextWindowFrame6_Gfx, gTextWindowFrame6_Pal
+ .4byte gTextWindowFrame7_Gfx, gTextWindowFrame7_Pal
+ .4byte gTextWindowFrame8_Gfx, gTextWindowFrame8_Pal
+ .4byte gTextWindowFrame9_Gfx, gTextWindowFrame9_Pal
+ .4byte gTextWindowFrame10_Gfx, gTextWindowFrame10_Pal
+ .4byte gTextWindowFrame11_Gfx, gTextWindowFrame11_Pal
+ .4byte gTextWindowFrame12_Gfx, gTextWindowFrame12_Pal
+ .4byte gTextWindowFrame13_Gfx, gTextWindowFrame13_Pal
+ .4byte gTextWindowFrame14_Gfx, gTextWindowFrame14_Pal
+ .4byte gTextWindowFrame15_Gfx, gTextWindowFrame15_Pal
+ .4byte gTextWindowFrame16_Gfx, gTextWindowFrame16_Pal
+ .4byte gTextWindowFrame17_Gfx, gTextWindowFrame17_Pal
+ .4byte gTextWindowFrame18_Gfx, gTextWindowFrame18_Pal
+ .4byte gTextWindowFrame19_Gfx, gTextWindowFrame19_Pal
+ .4byte gTextWindowFrame20_Gfx, gTextWindowFrame20_Pal
diff --git a/graphics/interface/textbox.png b/graphics/interface/textbox.png
deleted file mode 100755
index ed8cd92ee..000000000
--- a/graphics/interface/textbox.png
+++ /dev/null
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
diff --git a/src/save_failed_screen.c b/src/save_failed_screen.c
index 218ef68d7..efe38fbae 100755
--- a/src/save_failed_screen.c
+++ b/src/save_failed_screen.c
@@ -21,9 +21,9 @@ extern const u8 gBirchHelpGfx[];
extern const u8 gBirchBagTilemap[];
extern const u8 gBirchGrassTilemap[];
extern const u16 gBirchBagGrassPal[];
-extern const u16 gUnknown_0850FEFC[];
+extern const u16 gTextWindowFrame1_Pal[];
extern const u16 gUnknown_0860F074[];
-extern const u32 gUnknown_0850E87C[];
+extern const u32 gTextWindowFrame1_Gfx[];
extern struct SaveSection gSaveDataBuffer;
extern u8 gText_SaveFailedCheckingBackup[];
@@ -226,7 +226,7 @@ static void CB2_SaveFailedScreen(void)
InitBgsFromTemplates(0, gUnknown_085EFD88, 3);
SetBgTilemapBuffer(0, (void *)&gDecompressionBuffer[0x2000]);
CpuFill32(0, &gDecompressionBuffer[0x2000], 0x800);
- LoadBgTiles(0, gUnknown_0850E87C, 0x120, 0x214);
+ LoadBgTiles(0, gTextWindowFrame1_Gfx, 0x120, 0x214);
InitWindows(gUnknown_085EFD94);
// AddWindowWithoutTileMap returns a u16/integer, but the info is clobbered into a u8 here resulting in lost info. Bug?
gSaveFailedWindowIds[TEXT_WIN_ID] = AddWindowWithoutTileMap(gUnknown_085EFD9C);
@@ -239,7 +239,7 @@ static void CB2_SaveFailedScreen(void)
ResetPaletteFade();
LoadPalette(gBirchBagGrassPal, 0, 0x40);
LoadPalette(sSaveFailedClockPal, 0x100, 0x20);
- LoadPalette(gUnknown_0850FEFC, 0xE0, 0x20);
+ LoadPalette(gTextWindowFrame1_Pal, 0xE0, 0x20);
LoadPalette(gUnknown_0860F074, 0xF0, 0x20);
SetWindowBorderStyle(gSaveFailedWindowIds[TEXT_WIN_ID], FALSE, 0x214, 0xE);
SetWindowBorderStyle(gSaveFailedWindowIds[CLOCK_WIN_ID], FALSE, 0x214, 0xE);
diff --git a/src/text_window.c b/src/text_window.c
index 336536c04..c5334b11e 100644
--- a/src/text_window.c
+++ b/src/text_window.c
@@ -8,7 +8,7 @@ extern u8 LoadBgTiles(u8 bg, const void *src, u16 size, u16 destOffset);
extern void FillBgTilemapBufferRect(u8 bg, u16 tileNum, u8 x, u8 y, u8 width, u8 height, u8 palette);
extern const struct TilesPal gUnknown_0851021C[];
-extern const u32 gUnknown_08DDD748[];
+extern const u32 gMessageBox_Gfx[];
extern const u16 gUnknown_0851017C[];
extern const u16 gUnknown_08DDD728[];
@@ -22,7 +22,7 @@ const struct TilesPal* sub_8098758(u8 id)
void copy_textbox_border_tile_patterns_to_vram(u8 windowId, u16 destOffset, u8 palOffset)
{
- LoadBgTiles(GetWindowAttribute(windowId, WINDOW_PRIORITY), gUnknown_08DDD748, 0x1C0, destOffset);
+ LoadBgTiles(GetWindowAttribute(windowId, WINDOW_PRIORITY), gMessageBox_Gfx, 0x1C0, destOffset);
LoadPalette(GetOverworldTextboxPalettePtr(), palOffset, 0x20);
}