diff options
author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2018-01-04 22:21:39 -0500 |
---|---|---|
committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2018-01-04 22:21:39 -0500 |
commit | 5b5fedfc78a9f2751d001a92c65be86e3ffefcc1 (patch) | |
tree | e1357a59a3d98cf1e976f948f98d799f87a00bf3 /src/field/mauville_man.c | |
parent | ab06b56532026db85a9cba1c21c8b2235fcdf222 (diff) | |
parent | f0e98a9204bf19981c0c9652bc9ed82ae95438e4 (diff) |
Merge branch 'master' of https://github.com/pret/pokeruby into assert
Diffstat (limited to 'src/field/mauville_man.c')
-rw-r--r-- | src/field/mauville_man.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/field/mauville_man.c b/src/field/mauville_man.c index 30f6f5233..4db513f65 100644 --- a/src/field/mauville_man.c +++ b/src/field/mauville_man.c @@ -10,6 +10,7 @@ #include "overworld.h" #include "random.h" #include "script.h" +#include "constants/map_objects.h" #include "constants/songs.h" #include "sound.h" #include "string_util.h" @@ -974,7 +975,7 @@ static void Task_BardSong(u8 taskId) void sub_80F83D0(void) { - VarSet(0x4010, 0x45 + GetCurrentMauvilleOldMan()); + VarSet(VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_BARD + GetCurrentMauvilleOldMan()); } struct Story |