summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rw-r--r--data/graphics.s14
-rw-r--r--data/palette.s18
-rw-r--r--data/start_menu.s2
-rw-r--r--data/tileset.s3
4 files changed, 17 insertions, 20 deletions
diff --git a/data/graphics.s b/data/graphics.s
index 0fa256449..a64dc1332 100644
--- a/data/graphics.s
+++ b/data/graphics.s
@@ -354,7 +354,19 @@ gUnknown_08D85600:: @ 8D85600
.incbin "baserom.gba", 0xd85600, 0x20
gUnknown_08D85620:: @ 8D85620
- .incbin "baserom.gba", 0xd85620, 0xa8
+ .incbin "baserom.gba", 0xd85620, 0x20
+
+gUnknown_08D85640:: @ 8D85640
+ .incbin "baserom.gba", 0xd85640, 0x20
+
+gUnknown_08D85660:: @ 8D85660
+ .incbin "baserom.gba", 0xd85660, 0x20
+
+gUnknown_08D85680:: @ 8D85680
+ .incbin "baserom.gba", 0xd85680, 0x20
+
+gUnknown_08D856A0:: @ 8D856A0
+ .incbin "baserom.gba", 0xd856a0, 0x28
gUnknown_08D856C8:: @ 8D856C8
.incbin "baserom.gba", 0xd856c8, 0xe0
diff --git a/data/palette.s b/data/palette.s
deleted file mode 100644
index 2dbfed8d2..000000000
--- a/data/palette.s
+++ /dev/null
@@ -1,18 +0,0 @@
- .include "asm/macros.inc"
- .include "constants/constants.inc"
-
- .section .rodata
- .align 2, 0
-
-gUnknown_0852487C:: @ 852487C
- .incbin "baserom.gba", 0x52487c, 0x10
-
-gDummyPaletteStructTemplate:: @ 852488C
- .2byte 0xFFFF
- .space 9
- .byte 0x20
- .space 4
-
- .align 2
-gUnknown_0852489C:: @ 852489C
- .incbin "baserom.gba", 0x52489c, 0x20
diff --git a/data/start_menu.s b/data/start_menu.s
index eaba0b8e1..07e428d0d 100644
--- a/data/start_menu.s
+++ b/data/start_menu.s
@@ -26,4 +26,4 @@ gUnknown_085105AC:: @ 85105AC
.incbin "baserom.gba", 0x5105ac, 0x10
gUnknown_085105BC:: @ 85105BC
- .incbin "baserom.gba", 0x5105bc, 0x1a8
+ .incbin "baserom.gba", 0x5105bc, 0x8
diff --git a/data/tileset.s b/data/tileset.s
index 1221d8967..a69e53acf 100644
--- a/data/tileset.s
+++ b/data/tileset.s
@@ -4,6 +4,9 @@
.section .rodata
.align 2, 0
+Unknown_085105C4::
+ .incbin "baserom.gba", 0x5105C4, 0x1A0
+
gUnknown_08510764:: @ 8510764
.incbin "baserom.gba", 0x510764, 0xb60