summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2016-10-02 00:43:14 -0700
committerYamaArashi <shadow962@live.com>2016-10-02 00:43:14 -0700
commit179c2e5041b922fb5370e0188c90acf9f82bdf66 (patch)
tree1446578c29eb9262260af8c4b8143630dacab9f7 /include
parentee7db46023b1bde6a06f61242c7dd7c4770b6125 (diff)
initial decompilation of some field system code
Diffstat (limited to 'include')
-rw-r--r--include/fieldmap.h5
-rw-r--r--include/main.h2
2 files changed, 5 insertions, 2 deletions
diff --git a/include/fieldmap.h b/include/fieldmap.h
index 8154bd387..9a134e65c 100644
--- a/include/fieldmap.h
+++ b/include/fieldmap.h
@@ -94,7 +94,10 @@ struct MapHeader
u8 cave;
u8 weather;
u8 light;
- u8 filler_18[0x4];
+ u8 filler_18;
+ u8 escapeRope;
+ u8 flags;
+ u8 battleType;
};
struct MapObject
diff --git a/include/main.h b/include/main.h
index dda18889a..8ed9c7c7d 100644
--- a/include/main.h
+++ b/include/main.h
@@ -12,7 +12,7 @@ struct Main
MainCallback callback1;
MainCallback callback2;
- u32 field_8;
+ MainCallback field_8;
IntrCallback vblankCallback;
IntrCallback hblankCallback;