Merge branch 'master' into weather

2018-12-09 11:56:50 +01:00
parent 606fb71392 0b91d2948a
commit 4683cdc30c
125 changed files with 29614 additions and 25811 deletions
--- 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,