diff options
| author | garak <garakmon@gmail.com> | 2018-12-16 20:05:31 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-16 20:05:31 -0500 |
| commit | e292d0ca8375a8c54907d6bcf404e2e084344156 (patch) | |
| tree | b9c59449d47bf73d98d3e38fa26804a163d871ab /src/decoration.c | |
| parent | 10237e8d13b35474ea999b4e9139f9a48a80c53d (diff) | |
| parent | d1e6e705ccf05f93933ae4494b1d388550d81d26 (diff) | |
Merge branch 'master' into fldeff
Diffstat (limited to 'src/decoration.c')
| -rw-r--r-- | src/decoration.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/decoration.c b/src/decoration.c index eb85b4f5c..dd691721a 100644 --- a/src/decoration.c +++ b/src/decoration.c @@ -1,7 +1,7 @@ #include "global.h" #include "constants/decorations.h" #include "decompress.h" -#include "malloc.h" +#include "alloc.h" #include "text.h" #include "string_util.h" #include "international_string_util.h" @@ -16,7 +16,7 @@ #include "field_weather.h" #include "field_player_avatar.h" #include "field_camera.h" -#include "field_screen.h" +#include "field_screen_effect.h" #include "event_object_movement.h" #include "list_menu.h" #include "menu_helpers.h" @@ -312,7 +312,7 @@ const struct SpriteFrameImage sDecorSelectorSpriteFrameImages = { }; const struct SpriteTemplate sDecorSelectorSpriteTemplate = { - 0xffff, + 0xFFFF, OVERWORLD_PLACE_DECOR_SELECTOR_PAL_TAG, &sDecorSelectorOam, sDecorSelectorAnims, |