diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-11-21 01:15:34 -0500 |
|---|---|---|
| committer | huderlem <huderlem@gmail.com> | 2020-02-12 18:35:27 -0600 |
| commit | 98ca62cf91e7e0bd33f09edfc848a62061015aee (patch) | |
| tree | 6902d9b2183b6f0a379bf141ed3f88b1e2a36598 /src/secret_base.c | |
| parent | 6356dc03c1736df6ba25f2bc999e211d8e30a9f0 (diff) | |
Standardize Event Object to Object Event
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 0892016d9..795696a13 100644 --- a/src/secret_base.c +++ b/src/secret_base.c @@ -387,7 +387,7 @@ bool8 sub_80BBB24(void) void sub_80BBB50(u8 taskid) { - EventObjectTurn(&(gEventObjects[gPlayerAvatar.eventObjectId]), 2); + ObjectEventTurn(&(gObjectEvents[gPlayerAvatar.objectEventId]), 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->eventObjectCount; objid++) + for (objid = 0; objid < gMapHeader.events->objectEventCount; objid++) { - if (gMapHeader.events->eventObjects[objid].flagId == gSpecialVar_0x8004 + 0xAE) + if (gMapHeader.events->objectEvents[objid].flagId == gSpecialVar_0x8004 + 0xAE) break; } - if (objid != gMapHeader.events->eventObjectCount) + if (objid != gMapHeader.events->objectEventCount) { gSpecialVar_0x8006 = roomdecorpos[decidx] >> 4; gSpecialVar_0x8007 = roomdecorpos[decidx] & 0xF; metatile = MapGridGetMetatileBehaviorAt(gSpecialVar_0x8006 + 7, gSpecialVar_0x8007 + 7); if (MetatileBehavior_IsSecretBaseLargeMatEdge(metatile) == TRUE || MetatileBehavior_IsLargeMatCenter(metatile) == TRUE) { - gSpecialVar_Result = gMapHeader.events->eventObjects[objid].graphicsId + VAR_0x3F20; + gSpecialVar_Result = gMapHeader.events->objectEvents[objid].graphicsId + VAR_0x3F20; VarSet(gSpecialVar_Result, gDecorations[roomdecor[decidx]].tiles[0]); - gSpecialVar_Result = gMapHeader.events->eventObjects[objid].localId; + gSpecialVar_Result = gMapHeader.events->objectEvents[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); - TryOverrideTemplateCoordsForEventObject(gSpecialVar_Result, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup); + TryOverrideTemplateCoordsForObjectEvent(gSpecialVar_Result, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup); gSpecialVar_0x8004 ++; } } |