summaryrefslogtreecommitdiff
path: root/include/field_region_map.h
diff options
context:
space:
mode:
authorcamthesaxman <cameronghall@cox.net>2017-07-07 16:54:14 -0500
committercamthesaxman <cameronghall@cox.net>2017-07-07 16:54:14 -0500
commitf719abf104e304ed2f886a413d1132a75e3379b1 (patch)
tree352be6d36f1db3f697394bc193adb7fa8142be71 /include/field_region_map.h
parent2d604191592fbac2618d4a626f61ff1423cac828 (diff)
parentbd4a6520eaaaac186b6b26557305be8939a7ea2a (diff)
fix merge conflicts
Diffstat (limited to 'include/field_region_map.h')
-rw-r--r--include/field_region_map.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/field_region_map.h b/include/field_region_map.h
index 93b8c6d68..a7e81b418 100644
--- a/include/field_region_map.h
+++ b/include/field_region_map.h
@@ -1,6 +1,7 @@
#ifndef GUARD_FIELD_REGION_MAP_H
#define GUARD_FIELD_REGION_MAP_H
+void FieldInitRegionMap(void(void));
void CB2_FieldInitRegionMap(void);
void VBlankCB_FieldRegionMap(void);
void CB2_FieldRegionMap(void);