diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2020-02-13 15:13:30 -0500 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-02-13 15:13:30 -0500 |
commit | 3b2eaeedbc4c658389c7fceb93e6bbd07e8a6283 (patch) | |
tree | e9a403e858cf8d93cfee9eb80b5d8c79cc4e4159 /src/mauville_man.c | |
parent | cafbffd5b82836d779ec446e2362a9885fd18c4a (diff) | |
parent | b4f4d2c0f03462dcdf3492aad27890294600eb2e (diff) |
Merge branch 'master' into modern_gcc
Diffstat (limited to 'src/mauville_man.c')
-rw-r--r-- | src/mauville_man.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mauville_man.c b/src/mauville_man.c index 7eab67823..64c41f3bf 100644 --- a/src/mauville_man.c +++ b/src/mauville_man.c @@ -806,7 +806,7 @@ static void Task_BardSong(u8 taskId) void sub_80F83D0(void) { - VarSet(VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_BARD + GetCurrentMauvilleOldMan()); + VarSet(VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_BARD + GetCurrentMauvilleOldMan()); } struct Story |