diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2018-09-15 20:42:58 -0500 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2018-09-15 20:42:58 -0500 |
| commit | 3303c416d45c8ed95912f44923a09cf68909abdc (patch) | |
| tree | 495efa6a6396cb5c96ea9877acf2817042fe50bd /include | |
| parent | 3028fdc353447be5b36a5bee526ffe3ee696a62a (diff) | |
| parent | 4d2637883a55d916badb0b7b6107da5b9145b529 (diff) | |
Merge remote-tracking branch 'Egg/slotmachine'
Diffstat (limited to 'include')
| -rw-r--r-- | include/field_effect.h | 2 | ||||
| -rw-r--r-- | include/sprite.h | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/include/field_effect.h b/include/field_effect.h index cdabd5c99..e05ded621 100644 --- a/include/field_effect.h +++ b/include/field_effect.h @@ -236,4 +236,6 @@ void sub_80B9CDC(s16*, u8); void sub_80B7CAC(struct Sprite*); void sub_80B7A58(struct Sprite*); +void MultiplyPaletteRGBComponents(u16 i, u8 r, u8 g, u8 b); + #endif //GUARD_FIELD_EFFECTS_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; |