diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-07-22 13:14:58 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-07-22 13:14:58 +0200 |
| commit | 1e9143e0b22bc72cb77866e10817bc509064842a (patch) | |
| tree | 87b77fdd2c19d34cb7ac10870fdc4c30188e2d70 /src/field_tasks.c | |
| parent | c9d486a5d3ea6bf7d256c2d7ca7f10339e498427 (diff) | |
| parent | 06b3ce408f774c7192202308e783cc22bb8e7643 (diff) | |
merge union room with master
Diffstat (limited to 'src/field_tasks.c')
| -rw-r--r-- | src/field_tasks.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/field_tasks.c b/src/field_tasks.c index d9c3078da..fc57585e5 100644 --- a/src/field_tasks.c +++ b/src/field_tasks.c @@ -525,8 +525,8 @@ static bool32 sub_809E184(s16 x, s16 y) void SetSootopolisGymCrackedIceMetatiles(void) { s32 x, y; - s32 width = gMapHeader.mapData->width; - s32 height = gMapHeader.mapData->height; + s32 width = gMapHeader.mapLayout->width; + s32 height = gMapHeader.mapLayout->height; for (x = 0; x < width; x++) { for (y = 0; y < height; y++) @@ -623,7 +623,7 @@ static void PerStepCallback_8069F64(u8 taskId) { data[1] = x; data[2] = y; - if (MetatileBehavior_IsAsh(MapGridGetMetatileBehaviorAt(x, y))) + if (MetatileBehavior_IsAshGrass(MapGridGetMetatileBehaviorAt(x, y))) { if (MapGridGetMetatileIdAt(x, y) == 0x20a) { |