diff options
| author | KDSKardabox <bollygame94@gmail.com> | 2018-12-09 13:44:41 +0530 |
|---|---|---|
| committer | KDSKardabox <bollygame94@gmail.com> | 2018-12-09 13:44:41 +0530 |
| commit | 8712757d2454a8ee15680a658ea7df8621954bef (patch) | |
| tree | 5f0ebfdccc0e22c0e52f8d223ec4889c7597569f /src/decoration.c | |
| parent | f8838491f6c46df771c5414f8b6da781294300b7 (diff) | |
| parent | 0b91d2948a431a5d44166544897a550061c01a31 (diff) | |
Merge remote-tracking branch 'upstream/master'
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 eb85b4f5c..b45dec334 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" @@ -312,7 +312,7 @@ const struct SpriteFrameImage sDecorSelectorSpriteFrameImages = { }; const struct SpriteTemplate sDecorSelectorSpriteTemplate = { - 0xffff, + 0xFFFF, OVERWORLD_PLACE_DECOR_SELECTOR_PAL_TAG, &sDecorSelectorOam, sDecorSelectorAnims, |