From 4fe02ea081863fcdc6022ca8e608875265645326 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Tue, 23 May 2017 20:38:42 -0400
Subject: Fix building

---
 .gitignore                  |  4 ++--
 .idea/codeStyleSettings.xml | 35 -----------------------------------
 include/field_map_obj.h     |  4 ++--
 3 files changed, 4 insertions(+), 39 deletions(-)
 delete mode 100755 .idea/codeStyleSettings.xml

diff --git a/.gitignore b/.gitignore
index 5b70a4586..f5c95dbc1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,5 +35,5 @@ types_*.taghl
 *.dump
 *.sa*
 Thumbs.db
-build/*
-.idea/codeStyleSettings.xml
+build/
+.idea/
diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
deleted file mode 100755
index dee6609ca..000000000
--- a/.idea/codeStyleSettings.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectCodeStyleSettingsManager">
-    <option name="PER_PROJECT_SETTINGS">
-      <value>
-        <Objective-C-extensions>
-          <file>
-            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" />
-            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Macro" />
-            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Typedef" />
-            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Enum" />
-            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Constant" />
-            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Global" />
-            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Struct" />
-            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="FunctionPredecl" />
-            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Function" />
-          </file>
-          <class>
-            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Property" />
-            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Synthesize" />
-            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InitMethod" />
-            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="StaticMethod" />
-            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InstanceMethod" />
-            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="DeallocMethod" />
-          </class>
-          <extensions>
-            <pair source="c" header="h" />
-            <pair source="cpp" header="h" />
-          </extensions>
-        </Objective-C-extensions>
-      </value>
-    </option>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/include/field_map_obj.h b/include/field_map_obj.h
index 8b8ef78ea..2bd875f17 100755
--- a/include/field_map_obj.h
+++ b/include/field_map_obj.h
@@ -86,7 +86,7 @@ extern const struct Coords16 gDirectionToVector[];
 extern u8 (**const gUnknown_08375778[])(struct MapObject *, struct Sprite *);
 
 extern struct CameraSomething gUnknown_03004880;
-extern s16 gUnknown_03004898;
-extern s16 gUnknown_0300489C;
+extern u16 gUnknown_03004898;
+extern u16 gUnknown_0300489C;
 
 #endif // GUARD_FIELD_MAP_OBJ_H
-- 
cgit v1.2.3