diff options
author | Cameron Hall <camthesaxman@users.noreply.github.com> | 2017-09-13 11:01:47 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-09-13 11:01:47 -0500 |
commit | c1c2015f7046676b043641c0d1f9d9e29bc73647 (patch) | |
tree | cbea3afbcdad3d6bcc178ae4abffa9bbe88549f7 /src/decoration.c | |
parent | 37cf3484223366ee381f15d9a2cfeaf3612fd228 (diff) | |
parent | 9e9c40214f7672662820636167d2cc1469ca2ba1 (diff) |
Merge pull request #430 from camthesaxman/scrcmd_renaming
(don't merge yet) rename script commands
Diffstat (limited to 'src/decoration.c')
-rw-r--r-- | src/decoration.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/decoration.c b/src/decoration.c index da33b3ab7..1d48692c1 100644 --- a/src/decoration.c +++ b/src/decoration.c @@ -1,7 +1,7 @@ #include "global.h" #include "main.h" #include "map_object_constants.h" -#include "rom4.h" +#include "overworld.h" #include "sound.h" #include "songs.h" #include "string_util.h" @@ -2322,7 +2322,7 @@ void sub_80FF474(void) { if (FlagGet(i + 0xae) == 1) { - FlagReset(i + 0xae); + FlagClear(i + 0xae); for (j=0; j<gMapHeader.events->mapObjectCount; j++) { if (gMapHeader.events->mapObjects[j].flagId == i + 0xae) |