diff options
Diffstat (limited to 'src/mirage_tower.c')
-rw-r--r-- | src/mirage_tower.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/mirage_tower.c b/src/mirage_tower.c index 0c2b8ce74..66a799005 100644 --- a/src/mirage_tower.c +++ b/src/mirage_tower.c @@ -346,16 +346,16 @@ void StartPlayerDescendMirageTower(void) static void PlayerDescendMirageTower(u8 taskId) { - u8 eventObjectId; - struct EventObject *fakePlayerEventObject; - struct EventObject *playerEventObject; - - TryGetEventObjectIdByLocalIdAndMap(45, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &eventObjectId); - fakePlayerEventObject = &gEventObjects[eventObjectId]; - gSprites[fakePlayerEventObject->spriteId].pos2.y += 4; - playerEventObject = &gEventObjects[gPlayerAvatar.eventObjectId]; - if ((gSprites[fakePlayerEventObject->spriteId].pos1.y + gSprites[fakePlayerEventObject->spriteId].pos2.y) >= - (gSprites[playerEventObject->spriteId].pos1.y + gSprites[playerEventObject->spriteId].pos2.y)) + u8 objectEventId; + struct ObjectEvent *fakePlayerObjectEvent; + struct ObjectEvent *playerObjectEvent; + + TryGetObjectEventIdByLocalIdAndMap(45, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &objectEventId); + fakePlayerObjectEvent = &gObjectEvents[objectEventId]; + gSprites[fakePlayerObjectEvent->spriteId].pos2.y += 4; + playerObjectEvent = &gObjectEvents[gPlayerAvatar.objectEventId]; + if ((gSprites[fakePlayerObjectEvent->spriteId].pos1.y + gSprites[fakePlayerObjectEvent->spriteId].pos2.y) >= + (gSprites[playerObjectEvent->spriteId].pos1.y + gSprites[playerObjectEvent->spriteId].pos2.y)) { DestroyTask(taskId); EnableBothScriptContexts(); |