From aa9a45c16fbaee2fffc94e4741e0a1f203b244bc Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Mon, 11 Jun 2018 19:11:48 -0500 Subject: Rebrand 'map object' and 'field object' to 'event object' --- src/mauville_old_man.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/mauville_old_man.c') diff --git a/src/mauville_old_man.c b/src/mauville_old_man.c index 2ce8a271d..591e3ad9a 100644 --- a/src/mauville_old_man.c +++ b/src/mauville_old_man.c @@ -2,7 +2,7 @@ #include "main.h" #include "constants/songs.h" #include "constants/easy_chat.h" -#include "constants/map_objects.h" +#include "constants/event_objects.h" #include "constants/vars.h" #include "mauville_old_man.h" #include "event_data.h" @@ -136,7 +136,7 @@ void SetMauvilleOldMan(void) SetupGiddy(); break; } - ScrSpecial_SetMauvilleOldManMapObjGfx(); + ScrSpecial_SetMauvilleOldManEventObjGfx(); } u8 GetCurrentMauvilleOldMan(void) @@ -406,7 +406,7 @@ void ResetMauvilleOldManFlag(void) case MAUVILLE_MAN_GIDDY: break; } - ScrSpecial_SetMauvilleOldManMapObjGfx(); + ScrSpecial_SetMauvilleOldManEventObjGfx(); } @@ -671,9 +671,9 @@ static void Task_BardSong(u8 taskId) sub_8197224(); } -void ScrSpecial_SetMauvilleOldManMapObjGfx(void) +void ScrSpecial_SetMauvilleOldManEventObjGfx(void) { - VarSet(VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_BARD); + VarSet(VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_BARD); } // Language fixers? -- cgit v1.2.3