diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2019-05-11 21:22:09 -0400 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-05-11 21:22:09 -0400 |
commit | 539d47279625a3d7a274726a02468bb5c1c56514 (patch) | |
tree | 08f68b473f37d1a74396ef2e28e1a0cecc60a9f1 /src/smokescreen.c | |
parent | a58d9a16dd7e4f263ebccda50e70103e7490886b (diff) | |
parent | fc72b74e6ca6626dbaffa353eabf49429ff5e75f (diff) |
Merge branch 'master' into dodrio_berry_picking
Diffstat (limited to 'src/smokescreen.c')
-rw-r--r-- | src/smokescreen.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/smokescreen.c b/src/smokescreen.c index d9780bbb6..61e011451 100644 --- a/src/smokescreen.c +++ b/src/smokescreen.c @@ -1,11 +1,15 @@ #include "global.h" -#include "data2.h" +#include "data.h" #include "decompress.h" #include "sprite.h" #include "util.h" static void sub_8075370(struct Sprite *); +extern const struct CompressedSpriteSheet gUnknown_0831C620; +extern const struct CompressedSpritePalette gUnknown_0831C628; +extern const struct SpriteTemplate gUnknown_0831C688; + u8 sub_807521C(s16 x, s16 y, u8 a3) { u8 mainSpriteId; |