summaryrefslogtreecommitdiff
path: root/src/decoration.c
diff options
context:
space:
mode:
authorgolem galvanize <golemgalvanize@github.com>2018-12-13 00:31:06 -0500
committergolem galvanize <golemgalvanize@github.com>2018-12-13 00:31:06 -0500
commit6748ef72fb31e1b0af250472a34e50cb3966c5f8 (patch)
treef6dafca53a0e45e5a2a6cdb262a2766f2bde8753 /src/decoration.c
parent2265d49ac2e8868e0b3362f8e7a4d22355eed202 (diff)
parent170b6ef44992f4b7decb31451a3756b6bd4e2d46 (diff)
Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_party_menu
Diffstat (limited to 'src/decoration.c')
-rw-r--r--src/decoration.c6
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,