summaryrefslogtreecommitdiff
path: root/src/fldeff_groundshake.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/fldeff_groundshake.c')
-rw-r--r--src/fldeff_groundshake.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/fldeff_groundshake.c b/src/fldeff_groundshake.c
index 6da529d00..60b078982 100644
--- a/src/fldeff_groundshake.c
+++ b/src/fldeff_groundshake.c
@@ -179,17 +179,17 @@ void sub_81BE7F4(void)
static void sub_81BE808(u8 taskId)
{
- u8 mapObjectIdBuffer;
- struct MapObject *fieldMapObject;
- struct MapObject *playerAvatarMapObject;
+ u8 eventObjectIdBuffer;
+ struct EventObject *fieldEventObject;
+ struct EventObject *playerAvatarEventObject;
- TryGetFieldObjectIdByLocalIdAndMap(0x2D, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &mapObjectIdBuffer);
- fieldMapObject = &(gMapObjects[mapObjectIdBuffer]);
- gSprites[fieldMapObject->spriteId].pos2.y += 4;
- playerAvatarMapObject = &(gMapObjects[gPlayerAvatar.mapObjectId]);
+ TryGetEventObjectIdByLocalIdAndMap(0x2D, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &eventObjectIdBuffer);
+ fieldEventObject = &(gEventObjects[eventObjectIdBuffer]);
+ gSprites[fieldEventObject->spriteId].pos2.y += 4;
+ playerAvatarEventObject = &(gEventObjects[gPlayerAvatar.eventObjectId]);
- if((gSprites[fieldMapObject->spriteId].pos1.y + gSprites[fieldMapObject->spriteId].pos2.y) >=
- (gSprites[playerAvatarMapObject->spriteId].pos1.y + gSprites[playerAvatarMapObject->spriteId].pos2.y))
+ if((gSprites[fieldEventObject->spriteId].pos1.y + gSprites[fieldEventObject->spriteId].pos2.y) >=
+ (gSprites[playerAvatarEventObject->spriteId].pos1.y + gSprites[playerAvatarEventObject->spriteId].pos2.y))
{
DestroyTask(taskId);
EnableBothScriptContexts();