diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2017-11-09 19:43:30 -0600 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2017-11-09 20:30:56 -0600 |
| commit | 09e431077af3c6fe672ad8a775b58d955596b81d (patch) | |
| tree | 88d2eceb1071df85b4f73b1742885127755579c6 /src/field_map_obj.c | |
| parent | 2d3044aaa645bbad85e8e60dfe23f7f0224383ca (diff) | |
| parent | af197ccd3bd62fab813154dc4311e65f9992a676 (diff) | |
Merge remote-tracking branch 'pret/master' into dump_maps
Diffstat (limited to 'src/field_map_obj.c')
| -rwxr-xr-x | src/field_map_obj.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/field_map_obj.c b/src/field_map_obj.c index e822fc1ca..9932563f2 100755 --- a/src/field_map_obj.c +++ b/src/field_map_obj.c @@ -21,6 +21,7 @@ #include "field_effect_helpers.h" #include "field_camera.h" #include "trainer_see.h" +#include "decoration.h" #include "field_map_obj.h" #define NUM_FIELD_MAP_OBJECT_TEMPLATES 0x51 @@ -1755,18 +1756,18 @@ void sub_808F254(u8 localId, u8 mapNum, u8 mapGroup) } } -void sub_808F28C(u8 localId, u8 mapNum, u8 mapGroup, u8 action) +void sub_808F28C(u8 localId, u8 mapNum, u8 mapGroup, u8 decorCat) { u8 mapObjectId; if (!TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId)) { - switch (action) + switch (decorCat) { - case 6: + case DECORCAT_DOLL: sub_808F228(&gMapObjects[mapObjectId], gUnknown_082766A2); break; - case 7: + case DECORCAT_CUSHION: sub_808F228(&gMapObjects[mapObjectId], gUnknown_082766A6); break; } |