summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPikalaxALT <pikalax1@gmail.com>2017-09-22 21:18:53 -0400
committerPikalaxALT <pikalax1@gmail.com>2017-09-22 21:18:53 -0400
commit561d60342f7ec39f03671ce37ab4f0ab8d0244c6 (patch)
tree62ef226a44649af7229358266a33ecc255cbb339
parent293a506474115d2090620253cd8e5d9ebc840823 (diff)
Decompile data
-rw-r--r--data/unk_text_util_2.s11
-rw-r--r--ld_script.txt2
-rw-r--r--src/unk_text_util_2.c4
3 files changed, 3 insertions, 14 deletions
diff --git a/data/unk_text_util_2.s b/data/unk_text_util_2.s
deleted file mode 100644
index 69f227ea2..000000000
--- a/data/unk_text_util_2.s
+++ /dev/null
@@ -1,11 +0,0 @@
- .include "asm/macros.inc"
- .include "constants/constants.inc"
-
- .section .rodata
-
-gUnknown_08616124:: @ 8616124
- .incbin "baserom.gba", 0x616124, 0x4
-
- .align 2
-gFont6BrailleGlyphs:: @ 8616128
- .incbin "data/graphics/fonts/font6.fwjpnfont"
diff --git a/ld_script.txt b/ld_script.txt
index 136c198dc..1ad681e36 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -389,7 +389,7 @@ SECTIONS {
data/item_icon.o(.rodata);
data/party_menu.o(.rodata);
data/battle_tent.o(.rodata);
- data/unk_text_util_2.o(.rodata);
+ src/unk_text_util_2.o(.rodata);
data/unk_81BAD84.o(.rodata);
data/battle_controller_player_partner.o(.rodata);
data/fossil_special_fldeff_groundshake.o(.rodata);
diff --git a/src/unk_text_util_2.c b/src/unk_text_util_2.c
index d9bd9d98d..d88af611f 100644
--- a/src/unk_text_util_2.c
+++ b/src/unk_text_util_2.c
@@ -4,8 +4,8 @@
#include "text.h"
#include "sound.h"
-extern const u8 gUnknown_08616124[];
-extern const u16 gFont6BrailleGlyphs[];
+static const u8 gUnknown_08616124[] = {1, 2, 4};
+static const u16 gFont6BrailleGlyphs[] = INCBIN_U16("data/graphics/fonts/font6.fwjpnfont");
static void DecompressGlyphFont6(u16);