summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xdata/rom.s24
-rw-r--r--graphics/options/background.binbin0 -> 2048 bytes
-rw-r--r--graphics/options/background.pal259
-rw-r--r--graphics/options/background.pngbin0 -> 546 bytes
-rw-r--r--graphics/options/text.binbin0 -> 2048 bytes
-rw-r--r--graphics/options/text.pngbin0 -> 833 bytes
-rw-r--r--src/options.c20
7 files changed, 283 insertions, 20 deletions
diff --git a/data/rom.s b/data/rom.s
index ef2d7ea..4505e1b 100755
--- a/data/rom.s
+++ b/data/rom.s
@@ -1799,20 +1799,24 @@ gUnknown_08527F08:: @ 0x08527F08
gUnknown_08527F18:: @ 0x08527F18
.incbin "baserom.gba", 0x527F18, 0x110
-gUnknown_08528028:: @ 0x08528028
- .incbin "baserom.gba", 0x528028, 0x800
+gOptionsText_Tilemap:: @ 0x08528028
+ .incbin "graphics/options/text.bin"
-gUnknown_08528828:: @ 0x08528828
- .incbin "baserom.gba", 0x528828, 0x1820
+gOptionsText_Gfx:: @ 0x08528828
+ .incbin "graphics/options/text.4bpp"
-gUnknown_0852A048:: @ 0x0852A048
- .incbin "baserom.gba", 0x52A048, 0x800
+ .incbin "baserom.gba", 0x52A028, 0x20
-gUnknown_0852A848:: @ 0x0852A848
- .incbin "baserom.gba", 0x52A848, 0xC20
+gOptionsBackground_Tilemap:: @ 0x0852A048
+ .incbin "graphics/options/background.bin"
-gUnknown_0852B468:: @ 0x0852B468
- .incbin "baserom.gba", 0x52B468, 0x200
+gOptionsBackground_Gfx:: @ 0x0852A848
+ .incbin "graphics/options/background.4bpp"
+
+ .incbin "baserom.gba", 0x52B448, 0x20
+
+gOptionsBackground_Pals:: @ 0x0852B468
+ .incbin "graphics/options/background.gbapal"
gGBAButtonIcons_Pals:: @ 0x0852B668
.incbin "graphics/gba_buttons.gbapal"
diff --git a/graphics/options/background.bin b/graphics/options/background.bin
new file mode 100644
index 0000000..2836259
--- /dev/null
+++ b/graphics/options/background.bin
Binary files differ
diff --git a/graphics/options/background.pal b/graphics/options/background.pal
new file mode 100644
index 0000000..01cce88
--- /dev/null
+++ b/graphics/options/background.pal
@@ -0,0 +1,259 @@
+JASC-PAL
+0100
+256
+255 98 255
+255 255 255
+131 74 0
+255 164 0
+255 115 0
+255 213 131
+49 82 156
+255 238 0
+255 213 0
+230 230 230
+255 255 255
+123 123 123
+189 189 189
+0 0 0
+255 0 0
+0 0 0
+255 98 255
+255 255 255
+255 172 98
+255 131 16
+222 74 0
+139 74 0
+255 222 65
+197 156 24
+131 106 16
+255 230 139
+197 172 98
+123 106 65
+189 189 189
+205 205 205
+49 82 156
+0 0 0
+255 98 255
+255 255 255
+131 74 0
+255 164 0
+255 115 0
+255 213 131
+49 82 156
+255 238 0
+255 213 0
+230 230 230
+255 255 255
+123 123 123
+189 189 189
+0 0 0
+255 0 0
+123 123 123
+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
+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
+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
+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
+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
+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
+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
+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
+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
+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
+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
+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
+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
+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
+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
+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
+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
+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
+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
diff --git a/graphics/options/background.png b/graphics/options/background.png
new file mode 100644
index 0000000..887da7e
--- /dev/null
+++ b/graphics/options/background.png
Binary files differ
diff --git a/graphics/options/text.bin b/graphics/options/text.bin
new file mode 100644
index 0000000..c8bd150
--- /dev/null
+++ b/graphics/options/text.bin
Binary files differ
diff --git a/graphics/options/text.png b/graphics/options/text.png
new file mode 100644
index 0000000..69fd4ab
--- /dev/null
+++ b/graphics/options/text.png
Binary files differ
diff --git a/src/options.c b/src/options.c
index 73e6f4a..b296eff 100644
--- a/src/options.c
+++ b/src/options.c
@@ -39,11 +39,11 @@ extern struct OptionsData gOptionsData;
extern s16 gUnknown_0200B204[][2];
extern u8 gUnknown_02031B18[];
-extern const u16 gUnknown_0852B468[];
-extern const u8 gUnknown_08528828[];
-extern const u8 gUnknown_0852A848[];
-extern const u8 gUnknown_08528028[];
-extern const u8 gUnknown_0852A048[];
+extern const u16 gOptionsBackground_Pals[];
+extern const u8 gOptionsText_Gfx[];
+extern const u8 gOptionsBackground_Gfx[];
+extern const u8 gOptionsText_Tilemap[];
+extern const u8 gOptionsBackground_Tilemap[];
void OptionsMain(void)
{
@@ -62,10 +62,10 @@ void sub_51240(void)
gMain.unk16 = REG_DISPCNT;
- DmaCopy16(3, gUnknown_0852B468, (void *)PLTT, 0x200);
- DmaCopy16(3, gUnknown_08528828, (void *)(VRAM + 0x4000), 0x1800);
- DmaCopy16(3, gUnknown_0852A848, (void *)(VRAM + 0x8000), 0xC00);
- DmaCopy16(3, gUnknown_08528028, gUnknown_03005C00, 0x800);
+ DmaCopy16(3, gOptionsBackground_Pals, (void *)PLTT, 0x200);
+ DmaCopy16(3, gOptionsText_Gfx, (void *)(VRAM + 0x4000), 0x1800);
+ DmaCopy16(3, gOptionsBackground_Gfx, (void *)(VRAM + 0x8000), 0xC00);
+ DmaCopy16(3, gOptionsText_Tilemap, gUnknown_03005C00, 0x800);
DmaCopy16(3, gUnknown_03005C00, (void *)VRAM, 0x800);
if (gGameBoyPlayerEnabled != 1)
@@ -75,7 +75,7 @@ void sub_51240(void)
}
DmaCopy16(3, gUnknown_03005C00, (void *)VRAM, 0x800);
- DmaCopy16(3, gUnknown_0852A048, (void *)(VRAM + 0x800), 0x800);
+ DmaCopy16(3, gOptionsBackground_Tilemap, (void *)(VRAM + 0x800), 0x800);
DmaCopy16(3, gGBAButtonIcons_Pals, (void *)(PLTT + 0x200), 0x60);
DmaCopy16(3, gOptionsSprites_Gfx, (void *)(VRAM + 0x10000), 0x2020);
sub_513B8();