summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rw-r--r--data/data.s5
-rw-r--r--data/graphics/fonts/down_arrow.pngbin0 -> 162 bytes
-rw-r--r--data/graphics/fonts/down_arrow_2.pngbin0 -> 150 bytes
-rw-r--r--data/graphics/fonts/down_arrow_3.pngbin0 -> 189 bytes
-rw-r--r--data/graphics/fonts/down_arrow_RS.pngbin0 -> 163 bytes
-rw-r--r--data/graphics/fonts/down_arrow_RS_2.pngbin0 -> 150 bytes
-rw-r--r--data/graphics/fonts/font0_jap.pngbin0 -> 3073 bytes
-rw-r--r--data/graphics/fonts/font0_latin.pngbin0 -> 3285 bytes
-rw-r--r--data/graphics/fonts/font1_jap.pngbin0 -> 3135 bytes
-rw-r--r--data/graphics/fonts/font1_latin.pngbin0 -> 3470 bytes
-rw-r--r--data/graphics/fonts/font2_jap.pngbin0 -> 4532 bytes
-rw-r--r--data/graphics/fonts/font2_latin.pngbin0 -> 3470 bytes
-rw-r--r--data/graphics/fonts/font4_jap.pngbin0 -> 4480 bytes
-rw-r--r--data/graphics/fonts/font4_latin.pngbin0 -> 3470 bytes
-rw-r--r--data/graphics/fonts/font5_jap.pngbin0 -> 4507 bytes
-rw-r--r--data/graphics/fonts/font5_latin.pngbin0 -> 3470 bytes
-rw-r--r--data/graphics/fonts/font9_jap.pngbin0 -> 2281 bytes
-rw-r--r--data/graphics/fonts/keypad_icons.pngbin0 -> 297 bytes
-rw-r--r--data/text.s88
19 files changed, 4 insertions, 89 deletions
diff --git a/data/data.s b/data/data.s
index d1598bfbc..7f2b474aa 100644
--- a/data/data.s
+++ b/data/data.s
@@ -1554,7 +1554,10 @@ gUnknown_83AC970:: @ 83AC970
.incbin "baserom.gba", 0x3AC970, 0x20
sFanfares:: @ 83AC990
- .incbin "baserom.gba", 0x3AC990, 0x278
+ .incbin "baserom.gba", 0x3AC990, 0x40
+
+gUnknown_83AC9D0:: @ 83AC9D0
+ .incbin "baserom.gba", 0x3AC9D0, 0x238
gUnknown_83ACC08:: @ 83ACC08
.incbin "baserom.gba", 0x3ACC08, 0x440
diff --git a/data/graphics/fonts/down_arrow.png b/data/graphics/fonts/down_arrow.png
new file mode 100644
index 000000000..e74ed47ef
--- /dev/null
+++ b/data/graphics/fonts/down_arrow.png
Binary files differ
diff --git a/data/graphics/fonts/down_arrow_2.png b/data/graphics/fonts/down_arrow_2.png
new file mode 100644
index 000000000..aefcf4f08
--- /dev/null
+++ b/data/graphics/fonts/down_arrow_2.png
Binary files differ
diff --git a/data/graphics/fonts/down_arrow_3.png b/data/graphics/fonts/down_arrow_3.png
new file mode 100644
index 000000000..85a157564
--- /dev/null
+++ b/data/graphics/fonts/down_arrow_3.png
Binary files differ
diff --git a/data/graphics/fonts/down_arrow_RS.png b/data/graphics/fonts/down_arrow_RS.png
new file mode 100644
index 000000000..c0aae894f
--- /dev/null
+++ b/data/graphics/fonts/down_arrow_RS.png
Binary files differ
diff --git a/data/graphics/fonts/down_arrow_RS_2.png b/data/graphics/fonts/down_arrow_RS_2.png
new file mode 100644
index 000000000..de9d9cf47
--- /dev/null
+++ b/data/graphics/fonts/down_arrow_RS_2.png
Binary files differ
diff --git a/data/graphics/fonts/font0_jap.png b/data/graphics/fonts/font0_jap.png
new file mode 100644
index 000000000..23903f343
--- /dev/null
+++ b/data/graphics/fonts/font0_jap.png
Binary files differ
diff --git a/data/graphics/fonts/font0_latin.png b/data/graphics/fonts/font0_latin.png
new file mode 100644
index 000000000..7a79f2389
--- /dev/null
+++ b/data/graphics/fonts/font0_latin.png
Binary files differ
diff --git a/data/graphics/fonts/font1_jap.png b/data/graphics/fonts/font1_jap.png
new file mode 100644
index 000000000..0041b477a
--- /dev/null
+++ b/data/graphics/fonts/font1_jap.png
Binary files differ
diff --git a/data/graphics/fonts/font1_latin.png b/data/graphics/fonts/font1_latin.png
new file mode 100644
index 000000000..42e847faf
--- /dev/null
+++ b/data/graphics/fonts/font1_latin.png
Binary files differ
diff --git a/data/graphics/fonts/font2_jap.png b/data/graphics/fonts/font2_jap.png
new file mode 100644
index 000000000..efdb4b77e
--- /dev/null
+++ b/data/graphics/fonts/font2_jap.png
Binary files differ
diff --git a/data/graphics/fonts/font2_latin.png b/data/graphics/fonts/font2_latin.png
new file mode 100644
index 000000000..42e847faf
--- /dev/null
+++ b/data/graphics/fonts/font2_latin.png
Binary files differ
diff --git a/data/graphics/fonts/font4_jap.png b/data/graphics/fonts/font4_jap.png
new file mode 100644
index 000000000..da4f2beac
--- /dev/null
+++ b/data/graphics/fonts/font4_jap.png
Binary files differ
diff --git a/data/graphics/fonts/font4_latin.png b/data/graphics/fonts/font4_latin.png
new file mode 100644
index 000000000..42e847faf
--- /dev/null
+++ b/data/graphics/fonts/font4_latin.png
Binary files differ
diff --git a/data/graphics/fonts/font5_jap.png b/data/graphics/fonts/font5_jap.png
new file mode 100644
index 000000000..7da59c0eb
--- /dev/null
+++ b/data/graphics/fonts/font5_jap.png
Binary files differ
diff --git a/data/graphics/fonts/font5_latin.png b/data/graphics/fonts/font5_latin.png
new file mode 100644
index 000000000..42e847faf
--- /dev/null
+++ b/data/graphics/fonts/font5_latin.png
Binary files differ
diff --git a/data/graphics/fonts/font9_jap.png b/data/graphics/fonts/font9_jap.png
new file mode 100644
index 000000000..14cf6c042
--- /dev/null
+++ b/data/graphics/fonts/font9_jap.png
Binary files differ
diff --git a/data/graphics/fonts/keypad_icons.png b/data/graphics/fonts/keypad_icons.png
new file mode 100644
index 000000000..f8c162bb9
--- /dev/null
+++ b/data/graphics/fonts/keypad_icons.png
Binary files differ
diff --git a/data/text.s b/data/text.s
deleted file mode 100644
index b44badaa2..000000000
--- a/data/text.s
+++ /dev/null
@@ -1,88 +0,0 @@
- .section .rodata
-
-gDownArrowTiles:: @ 81EA14C
- .incbin "baserom.gba", 0x1EA14C, 0x100
-
-gDarkDownArrowTiles:: @ 81EA24C
- .incbin "baserom.gba", 0x1EA24C, 0x400
-
-gDownArrowYCoords:: @ 81EA64C
- .incbin "baserom.gba", 0x1EA64C, 0x4
-
-gUnknown_81EA650:: @ 81EA650
- .incbin "baserom.gba", 0x1EA650, 0x4
-
-gGlyphWidthFuncs:: @ 81EA654
- .incbin "baserom.gba", 0x1EA654, 0x38
-
-gUnknown_81EA68C:: @ 81EA68C
- .incbin "baserom.gba", 0x1EA68C, 0x18
-
-gUnknown_81EA6A4:: @ 81EA6A4
- .incbin "baserom.gba", 0x1EA6A4, 0x10
-
-gUnknown_81EA6B4:: @ 81EA6B4
- .incbin "baserom.gba", 0x1EA6B4, 0x18
-
-gKeypadIcons:: @ 81EA6CC
- .incbin "baserom.gba", 0x1EA6CC, 0x34
-
-gKeypadIconTiles:: @ 81EA700
- .incbin "baserom.gba", 0x1EA700, 0x800
-
-gFont0LatinGlyphs:: @ 81EAF00
- .incbin "baserom.gba", 0x1EAF00, 0x4000
-
-gFont0LatinGlyphWidths:: @ 81EEF00
- .incbin "baserom.gba", 0x1EEF00, 0x200
-
-gFont0JapaneseGlyphs:: @ 81EF100
- .incbin "baserom.gba", 0x1EF100, 0x4000
-
-gFont1LatinGlyphs:: @ 81F3100
- .incbin "baserom.gba", 0x1F3100, 0x8000
-
-gFont1LatinGlyphWidths:: @ 81FB100
- .incbin "baserom.gba", 0x1FB100, 0x200
-
-gFont1JapaneseGlyphs:: @ 81FB300
- .incbin "baserom.gba", 0x1FB300, 0x4000
-
-gFont2LatinGlyphs:: @ 81FF300
- .incbin "baserom.gba", 0x1FF300, 0x8000
-
-gFont2LatinGlyphWidths:: @ 8207300
- .incbin "baserom.gba", 0x207300, 0x200
-
-gFont2JapaneseGlyphs:: @ 8207500
- .incbin "baserom.gba", 0x207500, 0x8000
-
-gFont2JapaneseGlyphWidths:: @ 820F500
- .incbin "baserom.gba", 0x20F500, 0x118
-
-gFont4LatinGlyphs:: @ 820F618
- .incbin "baserom.gba", 0x20F618, 0x8000
-
-gFont4LatinGlyphWidths:: @ 8217618
- .incbin "baserom.gba", 0x217618, 0x200
-
-gFont4JapaneseGlyphs:: @ 8217818
- .incbin "baserom.gba", 0x217818, 0x8000
-
-gFont4JapaneseGlyphWidths:: @ 821F818
- .incbin "baserom.gba", 0x21F818, 0x118
-
-gFont5LatinGlyphs:: @ 821F930
- .incbin "baserom.gba", 0x21F930, 0x8000
-
-gFont5LatinGlyphWidths:: @ 8227930
- .incbin "baserom.gba", 0x227930, 0x200
-
-gFont5JapaneseGlyphs:: @ 8227B30
- .incbin "baserom.gba", 0x227B30, 0x8000
-
-gFont5JapaneseGlyphWidths:: @ 822FB30
- .incbin "baserom.gba", 0x22FB30, 0x118
-
-gFont9JapaneseGlyphs:: @ 822FC48
- .incbin "baserom.gba", 0x22FC48, 0x2000