diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-05-30 07:48:45 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-30 07:48:45 -0500 |
| commit | d1965e3c751b77243c11d62eadc994422dc682ae (patch) | |
| tree | 61ee8faf9f1fc7569efa086f2108b7f886e49127 /src/secret_base.c | |
| parent | b8f90052a58d1781ef40e2a4b7decf4ca4ed62b8 (diff) | |
| parent | 9680b95bdde1226e12485a84e47c6a7c32932048 (diff) | |
Merge pull request #618 from huderlem/objMovement
Document event object movement
Diffstat (limited to 'src/secret_base.c')
| -rw-r--r-- | src/secret_base.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/secret_base.c b/src/secret_base.c index cf66db03b..deee1ade0 100644 --- a/src/secret_base.c +++ b/src/secret_base.c @@ -387,7 +387,7 @@ bool8 sub_80BBB24(void) void sub_80BBB50(u8 taskid) { - FieldObjectTurn(&(gMapObjects[gPlayerAvatar.mapObjectId]), 2); + EventObjectTurn(&(gEventObjects[gPlayerAvatar.eventObjectId]), 2); if (IsWeatherNotFadingIn() == 1) { EnableBothScriptContexts(); @@ -500,25 +500,25 @@ void sub_80BBDD0(void) permission = gDecorations[roomdecor[decidx]].permission; if (permission == DECORPERM_SOLID_MAT) { - for (objid = 0; objid < gMapHeader.events->mapObjectCount; objid++) + for (objid = 0; objid < gMapHeader.events->eventObjectCount; objid++) { - if (gMapHeader.events->mapObjects[objid].flagId == gSpecialVar_0x8004 + 0xAE) + if (gMapHeader.events->eventObjects[objid].flagId == gSpecialVar_0x8004 + 0xAE) break; } - if (objid != gMapHeader.events->mapObjectCount) + if (objid != gMapHeader.events->eventObjectCount) { gSpecialVar_0x8006 = roomdecorpos[decidx] >> 4; gSpecialVar_0x8007 = roomdecorpos[decidx] & 0xF; metatile = MapGridGetMetatileBehaviorAt(gSpecialVar_0x8006 + 7, gSpecialVar_0x8007 + 7); if (sub_80572D8(metatile) == TRUE || sub_80572EC(metatile) == TRUE) { - gSpecialVar_Result = gMapHeader.events->mapObjects[objid].graphicsId + VAR_0x3F20; + gSpecialVar_Result = gMapHeader.events->eventObjects[objid].graphicsId + VAR_0x3F20; VarSet(gSpecialVar_Result, gDecorations[roomdecor[decidx]].tiles[0]); - gSpecialVar_Result = gMapHeader.events->mapObjects[objid].localId; + gSpecialVar_Result = gMapHeader.events->eventObjects[objid].localId; FlagClear(gSpecialVar_0x8004 + 0xAE); show_sprite(gSpecialVar_Result, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup); sub_805C0F8(gSpecialVar_Result, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup, gSpecialVar_0x8006, gSpecialVar_0x8007); - sub_805C78C(gSpecialVar_Result, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup); + TryOverrideTemplateCoordsForEventObject(gSpecialVar_Result, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup); gSpecialVar_0x8004 ++; } } |