From 54d5a7ad9781ffc890775ed510cebf0687102466 Mon Sep 17 00:00:00 2001 From: Slawter666 <38655737+Slawter666@users.noreply.github.com> Date: Fri, 7 Sep 2018 14:14:52 +0100 Subject: Format event object pic tables --- include/sprite.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'include/sprite.h') diff --git a/include/sprite.h b/include/sprite.h index f972d09cc..6270511c9 100644 --- a/include/sprite.h +++ b/include/sprite.h @@ -26,6 +26,8 @@ struct SpriteFrameImage #define obj_frame_tiles(ptr) {.data = (u8 *)ptr, .size = sizeof ptr} +#define overworld_frame(ptr, width, height, frame) {.data = (u8 *)ptr + (width * height * frame)/2, .size = (width * height)/2} + struct SpritePalette { const u16 *data; // Raw uncompressed palette data -- cgit v1.2.3 From e1834c9d7bc961f872169e056b788fec04f39867 Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Sat, 8 Sep 2018 03:07:44 -0500 Subject: Change overworld_frame macro to use tiles --- include/sprite.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/sprite.h') diff --git a/include/sprite.h b/include/sprite.h index 6270511c9..26263737b 100644 --- a/include/sprite.h +++ b/include/sprite.h @@ -26,7 +26,7 @@ struct SpriteFrameImage #define obj_frame_tiles(ptr) {.data = (u8 *)ptr, .size = sizeof ptr} -#define overworld_frame(ptr, width, height, frame) {.data = (u8 *)ptr + (width * height * frame)/2, .size = (width * height)/2} +#define overworld_frame(ptr, width, height, frame) {.data = (u8 *)ptr + (width * height * frame * 64)/2, .size = (width * height * 64)/2} struct SpritePalette { -- cgit v1.2.3 From 0547e260a4d1e89b6efac0c85c276316186d370c Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 15 Sep 2018 18:01:20 +0200 Subject: More of slot machine --- include/sprite.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'include/sprite.h') diff --git a/include/sprite.h b/include/sprite.h index 26263737b..8fc45d501 100644 --- a/include/sprite.h +++ b/include/sprite.h @@ -160,6 +160,8 @@ struct SubspriteTable struct Sprite; +typedef void (*SpriteCallback)(struct Sprite *); + struct SpriteTemplate { u16 tileTag; @@ -168,7 +170,7 @@ struct SpriteTemplate const union AnimCmd *const *anims; const struct SpriteFrameImage *images; const union AffineAnimCmd *const *affineAnims; - void (*callback)(struct Sprite *); + SpriteCallback callback; }; struct Sprite @@ -179,7 +181,7 @@ struct Sprite /*0x10*/ const union AffineAnimCmd *const *affineAnims; /*0x14*/ const struct SpriteTemplate *template; /*0x18*/ const struct SubspriteTable *subspriteTables; - /*0x1C*/ void (*callback)(struct Sprite *); + /*0x1C*/ SpriteCallback callback; /*0x20*/ struct Coords16 pos1; /*0x24*/ struct Coords16 pos2; -- cgit v1.2.3