From 4d2b22a899c11dfcacfec6889968ab01655a3fe3 Mon Sep 17 00:00:00 2001
From: Marijn van der Werf <marijn.vanderwerf@gmail.com>
Date: Fri, 26 May 2017 14:53:51 +0200
Subject: Add headers

---
 src/scrcmd.c | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

(limited to 'src/scrcmd.c')

diff --git a/src/scrcmd.c b/src/scrcmd.c
index 33867b58a..965a1aa88 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -1,6 +1,18 @@
+#include "decoration_inventory.h"
+#include "field_screen_effect.h"
+#include "field_map_obj.h"
+#include "script_movement.h"
+#include "field_fadetransition.h"
+#include "mystery_event_script.h"
+#include "contest_link_80C2020.h"
+#include "fieldmap.h"
+#include "field_specials.h"
+#include "shop.h"
+#include "party_menu.h"
+#include "field_tasks.h"
+#include "tv.h"
+#include "slot_machine.h"
 #include "global.h"
-#include "asm.h"
-#include "asm_fieldmap.h"
 #include "battle_setup.h"
 #include "berry.h"
 #include "clock.h"
@@ -35,9 +47,6 @@
 typedef u16 (*SpecialFunc)(void);
 typedef void (*NativeFunc)(void);
 
-extern struct Pokemon gPlayerParty[6]; // 0x3004360
-extern struct Pokemon gEnemyParty[6]; // 0x30045C0
-
 extern u32 gUnknown_0202E8AC;
 extern u32 gUnknown_0202E8B0;
 extern u16 gUnknown_0202E8B4;
@@ -60,7 +69,6 @@ extern SpecialFunc gSpecials[];
 extern u8 *gStdScripts[];
 extern u8 *gStdScripts_End[];
 
-extern u8 * const gUnknown_083CE048[];
 extern struct Decoration gDecorations[];
 
 // This is defined in here so the optimizer can't see its value when compiling
-- 
cgit v1.2.3


From f26daa3d6954d2db3a7c44b79d319a7a084462c2 Mon Sep 17 00:00:00 2001
From: Marijn van der Werf <marijn.vanderwerf@gmail.com>
Date: Fri, 26 May 2017 15:01:42 +0200
Subject: Sort includes

---
 src/scrcmd.c | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'src/scrcmd.c')

diff --git a/src/scrcmd.c b/src/scrcmd.c
index 965a1aa88..f309b4f93 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -1,48 +1,48 @@
-#include "decoration_inventory.h"
-#include "field_screen_effect.h"
-#include "field_map_obj.h"
-#include "script_movement.h"
-#include "field_fadetransition.h"
-#include "mystery_event_script.h"
-#include "contest_link_80C2020.h"
-#include "fieldmap.h"
-#include "field_specials.h"
-#include "shop.h"
-#include "party_menu.h"
-#include "field_tasks.h"
-#include "tv.h"
-#include "slot_machine.h"
 #include "global.h"
 #include "battle_setup.h"
 #include "berry.h"
 #include "clock.h"
 #include "coins.h"
+#include "contest_link_80C2020.h"
 #include "contest_painting.h"
 #include "data2.h"
 #include "decoration.h"
+#include "decoration_inventory.h"
 #include "event_data.h"
 #include "field_door.h"
 #include "field_effect.h"
+#include "field_fadetransition.h"
+#include "field_map_obj.h"
 #include "field_map_obj_helpers.h"
 #include "field_message_box.h"
 #include "field_player_avatar.h"
+#include "field_screen_effect.h"
+#include "field_specials.h"
+#include "field_tasks.h"
 #include "field_weather.h"
+#include "fieldmap.h"
 #include "item.h"
 #include "main.h"
 #include "map_obj_lock.h"
 #include "menu.h"
 #include "money.h"
+#include "mystery_event_script.h"
 #include "palette.h"
+#include "party_menu.h"
 #include "pokemon.h"
 #include "rng.h"
 #include "rom4.h"
 #include "rtc.h"
 #include "script.h"
 #include "script_menu.h"
+#include "script_movement.h"
 #include "script_pokemon_80C4.h"
 #include "script_pokemon_80F9.h"
+#include "shop.h"
+#include "slot_machine.h"
 #include "sound.h"
 #include "string_util.h"
+#include "tv.h"
 
 typedef u16 (*SpecialFunc)(void);
 typedef void (*NativeFunc)(void);
-- 
cgit v1.2.3


From 2aae7e99d52fc488e75309909d279b459f5e1d80 Mon Sep 17 00:00:00 2001
From: Marijn van der Werf <marijn.vanderwerf@gmail.com>
Date: Fri, 26 May 2017 15:35:40 +0200
Subject: Make rom build again

---
 src/scrcmd.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/scrcmd.c')

diff --git a/src/scrcmd.c b/src/scrcmd.c
index f309b4f93..d24417a74 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -1418,7 +1418,7 @@ bool8 ScrCmd_bufferstd(struct ScriptContext *ctx)
 {
     u8 stringVarIndex = ScriptReadByte(ctx);
     u16 index = VarGet(ScriptReadHalfword(ctx));
-    StringCopy(sScriptStringVars[stringVarIndex], gUnknown_083CE048[index]);
+    StringCopy(sScriptStringVars[stringVarIndex], gUnknown_083CE048[index].text);
     return FALSE;
 }
 
-- 
cgit v1.2.3