diff options
| author | camthesaxman <cameronghall@cox.net> | 2017-11-26 17:06:07 -0600 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2017-11-26 17:06:07 -0600 |
| commit | 6f0feb7ca09511df0a1d13c99a1ec5c9a46ed06b (patch) | |
| tree | f2d0d052e517765fa3002da50d187b1fd48278c1 /src/field/field_map_obj.c | |
| parent | 611984671904aa19cf678c59ff2a8682cba09224 (diff) | |
don't require MAP_ prefix on MAP_GROUP and MAP_NUM macros
Diffstat (limited to 'src/field/field_map_obj.c')
| -rw-r--r-- | src/field/field_map_obj.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/field/field_map_obj.c b/src/field/field_map_obj.c index 0768092b1..0e6794ed7 100644 --- a/src/field/field_map_obj.c +++ b/src/field/field_map_obj.c @@ -7054,7 +7054,7 @@ bool8 sub_8062088(struct MapObject *mapObject, struct Sprite *sprite) bool8 sub_80620B0(struct MapObject *mapObject, struct Sprite *sprite) { u8 objectId; - if (!TryGetFieldObjectIdByLocalIdAndMap(0xFF, MAP_GROUP(MAP_PETALBURG_CITY), MAP_NUM(MAP_PETALBURG_CITY), &objectId)) + if (!TryGetFieldObjectIdByLocalIdAndMap(0xFF, MAP_GROUP(PETALBURG_CITY), MAP_NUM(PETALBURG_CITY), &objectId)) { an_look_any(mapObject, sprite, sub_805FE90(mapObject->coords2.x, mapObject->coords2.y, gMapObjects[objectId].coords2.x, gMapObjects[objectId].coords2.y)); } @@ -7065,7 +7065,7 @@ bool8 sub_80620B0(struct MapObject *mapObject, struct Sprite *sprite) bool8 sub_806210C(struct MapObject *mapObject, struct Sprite *sprite) { u8 objectId; - if (!TryGetFieldObjectIdByLocalIdAndMap(0xFF, MAP_GROUP(MAP_PETALBURG_CITY), MAP_NUM(MAP_PETALBURG_CITY), &objectId)) + if (!TryGetFieldObjectIdByLocalIdAndMap(0xFF, MAP_GROUP(PETALBURG_CITY), MAP_NUM(PETALBURG_CITY), &objectId)) { an_look_any(mapObject, sprite, GetOppositeDirection(sub_805FE90(mapObject->coords2.x, mapObject->coords2.y, gMapObjects[objectId].coords2.x, gMapObjects[objectId].coords2.y))); } |