From 3c16d8c59876b2d5d84a3c9d82a7fc5718a32edb Mon Sep 17 00:00:00 2001
From: Slawter666 <38655737+Slawter666@users.noreply.github.com>
Date: Tue, 11 Sep 2018 02:17:21 +0100
Subject: [PATCH] Move braille_puzzles data to C

---
 data/braille_puzzles.s | 16 ------------
 ld_script.txt          |  2 +-
 src/braille_puzzles.c  | 55 ++++++++++++++++++++++++++++++++++--------
 3 files changed, 46 insertions(+), 27 deletions(-)
 delete mode 100644 data/braille_puzzles.s

diff --git a/data/braille_puzzles.s b/data/braille_puzzles.s
deleted file mode 100644
index 55dcb3a26..000000000
--- a/data/braille_puzzles.s
+++ /dev/null
@@ -1,16 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-
-    .align 2
-gUnknown_085EFE74:: @ 85EFE74
-    .byte 0x04, 0x15, 0x05, 0x15, 0x06, 0x15, 0x07, 0x15
-    .byte 0x08, 0x15, 0x09, 0x15, 0x0a, 0x15, 0x0b, 0x15
-    .byte 0x0c, 0x15, 0x0c, 0x16, 0x0c, 0x17, 0x0d, 0x17
-    .byte 0x0d, 0x18, 0x0d, 0x19, 0x0d, 0x1a, 0x0d, 0x1b
-    .byte 0x0c, 0x1b, 0x0c, 0x1c, 0x04, 0x1d, 0x05, 0x1d
-    .byte 0x06, 0x1d, 0x07, 0x1d, 0x08, 0x1d, 0x09, 0x1d
-    .byte 0x0a, 0x1d, 0x0b, 0x1d, 0x0c, 0x1d, 0x04, 0x1c
-    .byte 0x04, 0x1b, 0x03, 0x1b, 0x03, 0x1a, 0x03, 0x19
-    .byte 0x03, 0x18, 0x03, 0x17, 0x04, 0x17, 0x04, 0x16
diff --git a/ld_script.txt b/ld_script.txt
index 678939e64..95d546276 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -512,7 +512,7 @@ SECTIONS {
         src/berry_tag_screen.o(.rodata);
         src/mystery_event_menu.o(.rodata);
         src/save_failed_screen.o(.rodata);
-        data/braille_puzzles.o(.rodata);
+        src/braille_puzzles.o(.rodata);
         src/pokeblock_feed.o(.rodata);
         src/clear_save_data_screen.o(.rodata);
         src/intro_credits_graphics.o(.rodata);
diff --git a/src/braille_puzzles.c b/src/braille_puzzles.c
index b7ed1f713..4765141de 100644
--- a/src/braille_puzzles.c
+++ b/src/braille_puzzles.c
@@ -1,19 +1,16 @@
 #include "global.h"
 #include "event_data.h"
-#include "constants/songs.h"
-#include "sound.h"
-#include "script.h"
-#include "constants/species.h"
-#include "task.h"
+#include "field_camera.h"
 #include "field_effect.h"
+#include "script.h"
+#include "sound.h"
+#include "task.h"
 #include "constants/flags.h"
 #include "constants/maps.h"
+#include "constants/songs.h"
+#include "constants/species.h"
 
 extern void MapGridSetMetatileIdAt(s32 x, s32 y, u16 metatileId); // fieldmap
-extern void DrawWholeMapView(); // field_camera
-extern void SetCameraPanningCallback(void ( *callback)()); // field_camera
-extern void InstallCameraPanAheadCallback(void);
-extern void SetCameraPanning(s16 x, s16 y);
 extern u8 GetCursorSelectionMonId(void);
 extern u8 oei_task_add(void);
 
@@ -26,7 +23,45 @@ enum
 
 EWRAM_DATA static u8 sBraillePuzzleCallbackFlag = 0;
 
-extern const u8 gUnknown_085EFE74[][2];
+static const u8 gUnknown_085EFE74[][2] =
+{
+    {0x04, 0x15},
+    {0x05, 0x15},
+    {0x06, 0x15},
+    {0x07, 0x15},
+    {0x08, 0x15},
+    {0x09, 0x15},
+    {0x0a, 0x15},
+    {0x0b, 0x15},
+    {0x0c, 0x15},
+    {0x0c, 0x16},
+    {0x0c, 0x17},
+    {0x0d, 0x17},
+    {0x0d, 0x18},
+    {0x0d, 0x19},
+    {0x0d, 0x1a},
+    {0x0d, 0x1b},
+    {0x0c, 0x1b},
+    {0x0c, 0x1c},
+    {0x04, 0x1d},
+    {0x05, 0x1d},
+    {0x06, 0x1d},
+    {0x07, 0x1d},
+    {0x08, 0x1d},
+    {0x09, 0x1d},
+    {0x0a, 0x1d},
+    {0x0b, 0x1d},
+    {0x0c, 0x1d},
+    {0x04, 0x1c},
+    {0x04, 0x1b},
+    {0x03, 0x1b},
+    {0x03, 0x1a},
+    {0x03, 0x19},
+    {0x03, 0x18},
+    {0x03, 0x17},
+    {0x04, 0x17},
+    {0x04, 0x16},
+};
 
 void SealedChamberShakingEffect(u8);
 void sub_8179860(void);