From 5df6fa5c08a19fb89308f6131dceef721cc5a3d0 Mon Sep 17 00:00:00 2001
From: Marcus Huderle <huderlem@gmail.com>
Date: Tue, 29 May 2018 17:53:42 -0500
Subject: Unify 'map object' and 'field object' terms into 'event object'

---
 src/mauville_man.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/mauville_man.c')

diff --git a/src/mauville_man.c b/src/mauville_man.c
index ac9a02ce9..b3e13ef64 100644
--- a/src/mauville_man.c
+++ b/src/mauville_man.c
@@ -10,7 +10,7 @@
 #include "overworld.h"
 #include "random.h"
 #include "script.h"
-#include "constants/map_objects.h"
+#include "constants/event_objects.h"
 #include "constants/songs.h"
 #include "sound.h"
 #include "string_util.h"
@@ -806,7 +806,7 @@ static void Task_BardSong(u8 taskId)
 
 void sub_80F83D0(void)
 {
-    VarSet(VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_BARD + GetCurrentMauvilleOldMan());
+    VarSet(VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_BARD + GetCurrentMauvilleOldMan());
 }
 
 struct Story
-- 
cgit v1.2.3