summaryrefslogtreecommitdiff
path: root/include/field_map_obj.h
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2017-11-18 22:15:38 -0800
committerGitHub <noreply@github.com>2017-11-18 22:15:38 -0800
commit4a365e9230962daf875a0444d51d76639c07c827 (patch)
treebe7332caa25d9711fd12921e347332993e5b0ff1 /include/field_map_obj.h
parent8edb453c9de6459f4da78522b248a2e507ba1f08 (diff)
parent79650185e2af1748a9728f6e9209d64f93cdb050 (diff)
Merge pull request #462 from ProjectRevoTPP/sprite_struct
change Sprite struct to use a data array instead of manual declares.
Diffstat (limited to 'include/field_map_obj.h')
-rw-r--r--include/field_map_obj.h6
1 files changed, 3 insertions, 3 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)\
{\