From 9848f84b9ec2d5950cb5dc4600b7651486ff986a Mon Sep 17 00:00:00 2001
From: Phlosioneer <mattmdrr2@gmail.com>
Date: Mon, 11 Mar 2019 03:12:15 -0400
Subject: Use constants for Oam .shape and .size fields

Also some general formatting fixes for constants.
---
 src/pokeblock_feed.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/pokeblock_feed.c')

diff --git a/src/pokeblock_feed.c b/src/pokeblock_feed.c
index da803f454..59ba1b4dc 100644
--- a/src/pokeblock_feed.c
+++ b/src/pokeblock_feed.c
@@ -463,10 +463,10 @@ static const struct OamData sThrownPokeblockOamData =
     .objMode = 0,
     .mosaic = 0,
     .bpp = 0,
-    .shape = 0,
+    .shape = SPRITE_SHAPE(8x8),
     .x = 0,
     .matrixNum = 0,
-    .size = 0,
+    .size = SPRITE_SIZE(8x8),
     .tileNum = 0,
     .priority = 1,
     .paletteNum = 0,
-- 
cgit v1.2.3


From b0223f691fcc83c18b6ba8df5140d907939b04cf Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Thu, 4 Apr 2019 23:53:06 +0200
Subject: Clean up data headers

---
 src/pokeblock_feed.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'src/pokeblock_feed.c')

diff --git a/src/pokeblock_feed.c b/src/pokeblock_feed.c
index 59ba1b4dc..972ca4285 100644
--- a/src/pokeblock_feed.c
+++ b/src/pokeblock_feed.c
@@ -1,13 +1,14 @@
 #include "global.h"
-#include "battle.h" // to get rid of once gMonSpritesGfxPtr is put elsewhere
+#include "alloc.h"
+#include "battle.h"
 #include "bg.h"
-#include "data2.h"
+#include "data.h"
 #include "decompress.h"
 #include "event_data.h"
 #include "gpu_regs.h"
 #include "graphics.h"
+#include "item_menu.h"
 #include "main.h"
-#include "alloc.h"
 #include "menu.h"
 #include "menu_helpers.h"
 #include "m4a.h"
@@ -49,10 +50,8 @@ struct PokeblockFeedStruct
     u8 unused;
 };
 
-extern u16 gSpecialVar_ItemId;
 extern struct MusicPlayerInfo gMPlayInfo_BGM;
 
-extern const struct CompressedSpriteSheet gMonFrontPicTable[];
 extern const u16 gUnknown_0860F074[];
 
 // this file's functions
-- 
cgit v1.2.3