summaryrefslogtreecommitdiff
path: root/src/field_map_obj.c
diff options
context:
space:
mode:
authorcamthesaxman <cameronghall@cox.net>2018-02-05 17:38:23 -0600
committercamthesaxman <cameronghall@cox.net>2018-02-05 17:38:23 -0600
commit607cba8c2e5253874f378cd6280fd066b0c9fa3d (patch)
tree8894b0b686adc29286d078500932306fabbc2973 /src/field_map_obj.c
parent663ecd00145da49fda7d2509d629d737ea633cd8 (diff)
parenteb6aed50e56f36ce416f7ecc8edfacea1da61bf1 (diff)
Merge branch 'master' into battle_refactor
Diffstat (limited to 'src/field_map_obj.c')
-rw-r--r--src/field_map_obj.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/field_map_obj.c b/src/field_map_obj.c
index df80494b3..906eff4b7 100644
--- a/src/field_map_obj.c
+++ b/src/field_map_obj.c
@@ -14,7 +14,7 @@
#include "rom_818CFC8.h"
#include "rom_81BE66C.h"
#include "field_ground_effect.h"
-#include "map_obj_8097404.h"
+#include "field_map_obj_helpers.h"
#include "mauville_old_man.h"
#include "metatile_behavior.h"
#include "field_effect.h"