diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/field_map_obj.h | 6 | ||||
| -rw-r--r-- | include/rom_8077ABC.h | 2 | ||||
| -rw-r--r-- | include/sprite.h | 9 |
3 files changed, 5 insertions, 12 deletions
diff --git a/include/field_map_obj.h b/include/field_map_obj.h index 8e1fdc8bd..22674406d 100644 --- a/include/field_map_obj.h +++ b/include/field_map_obj.h @@ -9,18 +9,18 @@ extern const u8 gUnknown_0830FD14[]; static u8 callback(struct MapObject *, struct Sprite *);\ void setup(struct Sprite *sprite)\ {\ - meta_step(&gMapObjects[sprite->data0], sprite, callback);\ + meta_step(&gMapObjects[sprite->data[0]], sprite, callback);\ }\ static u8 callback(struct MapObject *mapObject, struct Sprite *sprite)\ {\ - return table[sprite->data1](mapObject, sprite);\ + return table[sprite->data[1]](mapObject, sprite);\ } #define fieldmap_object_null_cb(setup, callback) \ static u8 callback(struct MapObject *, struct Sprite *);\ void setup(struct Sprite *sprite)\ {\ - meta_step(&gMapObjects[sprite->data0], sprite, callback);\ + meta_step(&gMapObjects[sprite->data[0]], sprite, callback);\ }\ static u8 callback(struct MapObject *mapObject, struct Sprite *sprite)\ {\ diff --git a/include/rom_8077ABC.h b/include/rom_8077ABC.h index 03882056d..cd89c92a2 100644 --- a/include/rom_8077ABC.h +++ b/include/rom_8077ABC.h @@ -15,7 +15,7 @@ enum u8 sub_8077ABC(u8, u8); u8 sub_8077E44(u8 slot, u16 species, u8 a3); u8 GetAnimBankSpriteId(u8 side); -void StoreSpriteCallbackInData6(struct Sprite *sprite, void(*callback)(struct Sprite *)); +void StoreSpriteCallbackInData(struct Sprite *sprite, void(*callback)(struct Sprite *)); void sub_8078314(struct Sprite *sprite); void sub_8078364(struct Sprite *sprite); void sub_8078458(struct Sprite *sprite); diff --git a/include/sprite.h b/include/sprite.h index 38687ebd8..a87260ec0 100644 --- a/include/sprite.h +++ b/include/sprite.h @@ -195,14 +195,7 @@ struct Sprite /*0x2D*/ u8 animLoopCounter; // general purpose data fields - /*0x2E*/ s16 data0; - /*0x30*/ s16 data1; - /*0x32*/ s16 data2; - /*0x34*/ s16 data3; - /*0x36*/ s16 data4; - /*0x38*/ s16 data5; - /*0x3A*/ s16 data6; - /*0x3C*/ s16 data7; + /*0x2E*/ s16 data[8]; /*0x3E*/ u16 inUse:1; //1 u16 coordOffsetEnabled:1; //2 |