Merge pull request #123 from yenatch/fieldmap

Decompile src/fieldmap.c

2 files changed, 10 insertions, 8 deletions

diff --git a/include/gba/macro.h b/include/gba/macro.h
index 62d3e73fa..230fb4383 100644
--- a/include/gba/macro.h
+++ b/include/gba/macro.h
@@ -25,6 +25,8 @@
                CPU_FAST_SET_SRC_FIXED | ((size)/(32/8) & 0x1FFFFF)); \
 }
 
+#define CpuFastFill16(value, dest, size) CpuFastFill(((value) << 16) | (value), (dest), (size))
+
 #define CpuFastCopy(src, dest, size) CpuFastSet(src, dest, ((size)/(32/8) & 0x1FFFFF))
 
 #define DmaSet(dmaNum, src, dest, control)        \
diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h
index 68a4f9322..9bcd9c3e7 100644
--- a/include/global.fieldmap.h
+++ b/include/global.fieldmap.h
@@ -3,10 +3,10 @@
 
 enum
 {
-    CONNECTION_DOWN = 1,
-    CONNECTION_UP,
-    CONNECTION_LEFT,
-    CONNECTION_RIGHT,
+    CONNECTION_SOUTH = 1,
+    CONNECTION_NORTH,
+    CONNECTION_WEST,
+    CONNECTION_EAST,
     CONNECTION_DIVE,
     CONNECTION_EMERGE
 };
@@ -28,8 +28,8 @@ struct MapData
 {
     s32 width;
     s32 height;
-    void *border;
-    void *map;
+    u16 *border;
+    u16 *map;
     struct Tileset *primaryTileset;
     struct Tileset *secondaryTileset;
 };
@@ -91,8 +91,8 @@ struct MapConnection
 {
     u8 direction;
     u32 offset;
-    s8 mapGroup;
-    s8 mapNum;
+    u8 mapGroup;
+    u8 mapNum;
 };
 
 struct MapConnections