summaryrefslogtreecommitdiff
path: root/src/quest_log_815A008.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/quest_log_815A008.c')
-rw-r--r--src/quest_log_815A008.c186
1 files changed, 93 insertions, 93 deletions
diff --git a/src/quest_log_815A008.c b/src/quest_log_815A008.c
index fb49fc880..32d0becbf 100644
--- a/src/quest_log_815A008.c
+++ b/src/quest_log_815A008.c
@@ -11,125 +11,125 @@ void sub_815A008(struct QuestLog * questLog)
{
u32 i;
- for (i = 0; i < MAP_OBJECTS_COUNT; i++)
+ for (i = 0; i < OBJECT_EVENTS_COUNT; i++)
{
- questLog->unk_008[i].active = gMapObjects[i].active;
- questLog->unk_008[i].mapobj_bit_3 = gMapObjects[i].mapobj_bit_3;
- questLog->unk_008[i].mapobj_bit_4 = gMapObjects[i].mapobj_bit_4;
- questLog->unk_008[i].mapobj_bit_5 = gMapObjects[i].mapobj_bit_5;
- questLog->unk_008[i].mapobj_bit_8 = gMapObjects[i].mapobj_bit_8;
- questLog->unk_008[i].mapobj_bit_9 = gMapObjects[i].mapobj_bit_9;
- questLog->unk_008[i].mapobj_bit_10 = gMapObjects[i].mapobj_bit_10;
- questLog->unk_008[i].mapobj_bit_11 = gMapObjects[i].mapobj_bit_11;
- questLog->unk_008[i].mapobj_bit_12 = gMapObjects[i].mapobj_bit_12;
- questLog->unk_008[i].mapobj_bit_13 = gMapObjects[i].mapobj_bit_13;
- questLog->unk_008[i].mapobj_bit_14 = gMapObjects[i].mapobj_bit_14;
- questLog->unk_008[i].mapobj_bit_15 = gMapObjects[i].mapobj_bit_15;
- questLog->unk_008[i].mapobj_bit_16 = gMapObjects[i].mapobj_bit_16;
- questLog->unk_008[i].mapobj_bit_23 = gMapObjects[i].mapobj_bit_23;
- questLog->unk_008[i].mapobj_bit_24 = gMapObjects[i].mapobj_bit_24;
- questLog->unk_008[i].mapobj_bit_25 = gMapObjects[i].mapobj_bit_25;
- questLog->unk_008[i].mapobj_bit_26 = gMapObjects[i].mapobj_bit_26;
- questLog->unk_008[i].mapobj_unk_18 = gMapObjects[i].facingDirection;
- questLog->unk_008[i].mapobj_unk_0B_0 = gMapObjects[i].mapobj_unk_0B_0;
- questLog->unk_008[i].elevation = gMapObjects[i].elevation;
- questLog->unk_008[i].graphicsId = gMapObjects[i].graphicsId;
- questLog->unk_008[i].animPattern = gMapObjects[i].animPattern;
- questLog->unk_008[i].trainerType = gMapObjects[i].trainerType;
- questLog->unk_008[i].localId = gMapObjects[i].localId;
- questLog->unk_008[i].mapNum = gMapObjects[i].mapNum;
- questLog->unk_008[i].mapGroup = gMapObjects[i].mapGroup;
- questLog->unk_008[i].x = gMapObjects[i].coords2.x;
- questLog->unk_008[i].y = gMapObjects[i].coords2.y;
- questLog->unk_008[i].trainerRange_berryTreeId = gMapObjects[i].trainerRange_berryTreeId;
- questLog->unk_008[i].mapobj_unk_1F = gMapObjects[i].mapobj_unk_1F;
- questLog->unk_008[i].mapobj_unk_21 = gMapObjects[i].mapobj_unk_21;
- questLog->unk_008[i].animId = gMapObjects[i].animId;
+ questLog->unk_008[i].active = gObjectEvents[i].active;
+ questLog->unk_008[i].mapobj_bit_3 = gObjectEvents[i].mapobj_bit_3;
+ questLog->unk_008[i].mapobj_bit_4 = gObjectEvents[i].mapobj_bit_4;
+ questLog->unk_008[i].mapobj_bit_5 = gObjectEvents[i].mapobj_bit_5;
+ questLog->unk_008[i].mapobj_bit_8 = gObjectEvents[i].mapobj_bit_8;
+ questLog->unk_008[i].mapobj_bit_9 = gObjectEvents[i].mapobj_bit_9;
+ questLog->unk_008[i].mapobj_bit_10 = gObjectEvents[i].mapobj_bit_10;
+ questLog->unk_008[i].mapobj_bit_11 = gObjectEvents[i].mapobj_bit_11;
+ questLog->unk_008[i].mapobj_bit_12 = gObjectEvents[i].mapobj_bit_12;
+ questLog->unk_008[i].mapobj_bit_13 = gObjectEvents[i].mapobj_bit_13;
+ questLog->unk_008[i].mapobj_bit_14 = gObjectEvents[i].mapobj_bit_14;
+ questLog->unk_008[i].mapobj_bit_15 = gObjectEvents[i].mapobj_bit_15;
+ questLog->unk_008[i].mapobj_bit_16 = gObjectEvents[i].mapobj_bit_16;
+ questLog->unk_008[i].mapobj_bit_23 = gObjectEvents[i].mapobj_bit_23;
+ questLog->unk_008[i].mapobj_bit_24 = gObjectEvents[i].mapobj_bit_24;
+ questLog->unk_008[i].mapobj_bit_25 = gObjectEvents[i].mapobj_bit_25;
+ questLog->unk_008[i].mapobj_bit_26 = gObjectEvents[i].mapobj_bit_26;
+ questLog->unk_008[i].mapobj_unk_18 = gObjectEvents[i].facingDirection;
+ questLog->unk_008[i].mapobj_unk_0B_0 = gObjectEvents[i].mapobj_unk_0B_0;
+ questLog->unk_008[i].elevation = gObjectEvents[i].elevation;
+ questLog->unk_008[i].graphicsId = gObjectEvents[i].graphicsId;
+ questLog->unk_008[i].animPattern = gObjectEvents[i].animPattern;
+ questLog->unk_008[i].trainerType = gObjectEvents[i].trainerType;
+ questLog->unk_008[i].localId = gObjectEvents[i].localId;
+ questLog->unk_008[i].mapNum = gObjectEvents[i].mapNum;
+ questLog->unk_008[i].mapGroup = gObjectEvents[i].mapGroup;
+ questLog->unk_008[i].x = gObjectEvents[i].coords2.x;
+ questLog->unk_008[i].y = gObjectEvents[i].coords2.y;
+ questLog->unk_008[i].trainerRange_berryTreeId = gObjectEvents[i].trainerRange_berryTreeId;
+ questLog->unk_008[i].mapobj_unk_1F = gObjectEvents[i].mapobj_unk_1F;
+ questLog->unk_008[i].mapobj_unk_21 = gObjectEvents[i].mapobj_unk_21;
+ questLog->unk_008[i].animId = gObjectEvents[i].animId;
}
}
-void sub_815A1F8(const struct QuestLog * questLog, const struct MapObjectTemplate * templates)
+void sub_815A1F8(const struct QuestLog * questLog, const struct ObjectEventTemplate * templates)
{
u32 i, j;
- const struct QuestLogMapObject * questLogMapObjects = questLog->unk_008;
+ const struct QuestLogObjectEvent * questLogObjectEvents = questLog->unk_008;
- CpuFill16(0, gMapObjects, sizeof(gMapObjects));
+ CpuFill16(0, gObjectEvents, sizeof(gObjectEvents));
- for (i = 0; i < MAP_OBJECTS_COUNT; i++)
+ for (i = 0; i < OBJECT_EVENTS_COUNT; i++)
{
- gMapObjects[i].active = questLogMapObjects[i].active;
- gMapObjects[i].mapobj_bit_3 = questLogMapObjects[i].mapobj_bit_3;
- gMapObjects[i].mapobj_bit_4 = questLogMapObjects[i].mapobj_bit_4;
- gMapObjects[i].mapobj_bit_5 = questLogMapObjects[i].mapobj_bit_5;
- gMapObjects[i].mapobj_bit_8 = questLogMapObjects[i].mapobj_bit_8;
- gMapObjects[i].mapobj_bit_9 = questLogMapObjects[i].mapobj_bit_9;
- gMapObjects[i].mapobj_bit_10 = questLogMapObjects[i].mapobj_bit_10;
- gMapObjects[i].mapobj_bit_11 = questLogMapObjects[i].mapobj_bit_11;
- gMapObjects[i].mapobj_bit_12 = questLogMapObjects[i].mapobj_bit_12;
- gMapObjects[i].mapobj_bit_13 = questLogMapObjects[i].mapobj_bit_13;
- gMapObjects[i].mapobj_bit_14 = questLogMapObjects[i].mapobj_bit_14;
- gMapObjects[i].mapobj_bit_15 = questLogMapObjects[i].mapobj_bit_15;
- gMapObjects[i].mapobj_bit_16 = questLogMapObjects[i].mapobj_bit_16;
- gMapObjects[i].mapobj_bit_23 = questLogMapObjects[i].mapobj_bit_23;
- gMapObjects[i].mapobj_bit_24 = questLogMapObjects[i].mapobj_bit_24;
- gMapObjects[i].mapobj_bit_25 = questLogMapObjects[i].mapobj_bit_25;
- gMapObjects[i].mapobj_bit_26 = questLogMapObjects[i].mapobj_bit_26;
- gMapObjects[i].facingDirection = questLogMapObjects[i].mapobj_unk_18;
- gMapObjects[i].mapobj_unk_0B_0 = questLogMapObjects[i].mapobj_unk_0B_0;
- gMapObjects[i].elevation = questLogMapObjects[i].elevation;
- gMapObjects[i].graphicsId = questLogMapObjects[i].graphicsId;
- gMapObjects[i].animPattern = questLogMapObjects[i].animPattern;
- gMapObjects[i].trainerType = questLogMapObjects[i].trainerType;
- gMapObjects[i].localId = questLogMapObjects[i].localId;
- gMapObjects[i].mapNum = questLogMapObjects[i].mapNum;
- gMapObjects[i].mapGroup = questLogMapObjects[i].mapGroup;
- gMapObjects[i].coords2.x = questLogMapObjects[i].x;
- gMapObjects[i].coords2.y = questLogMapObjects[i].y;
- gMapObjects[i].trainerRange_berryTreeId = questLogMapObjects[i].trainerRange_berryTreeId;
- gMapObjects[i].mapobj_unk_1F = questLogMapObjects[i].mapobj_unk_1F;
- gMapObjects[i].mapobj_unk_21 = questLogMapObjects[i].mapobj_unk_21;
- gMapObjects[i].animId = questLogMapObjects[i].animId;
+ gObjectEvents[i].active = questLogObjectEvents[i].active;
+ gObjectEvents[i].mapobj_bit_3 = questLogObjectEvents[i].mapobj_bit_3;
+ gObjectEvents[i].mapobj_bit_4 = questLogObjectEvents[i].mapobj_bit_4;
+ gObjectEvents[i].mapobj_bit_5 = questLogObjectEvents[i].mapobj_bit_5;
+ gObjectEvents[i].mapobj_bit_8 = questLogObjectEvents[i].mapobj_bit_8;
+ gObjectEvents[i].mapobj_bit_9 = questLogObjectEvents[i].mapobj_bit_9;
+ gObjectEvents[i].mapobj_bit_10 = questLogObjectEvents[i].mapobj_bit_10;
+ gObjectEvents[i].mapobj_bit_11 = questLogObjectEvents[i].mapobj_bit_11;
+ gObjectEvents[i].mapobj_bit_12 = questLogObjectEvents[i].mapobj_bit_12;
+ gObjectEvents[i].mapobj_bit_13 = questLogObjectEvents[i].mapobj_bit_13;
+ gObjectEvents[i].mapobj_bit_14 = questLogObjectEvents[i].mapobj_bit_14;
+ gObjectEvents[i].mapobj_bit_15 = questLogObjectEvents[i].mapobj_bit_15;
+ gObjectEvents[i].mapobj_bit_16 = questLogObjectEvents[i].mapobj_bit_16;
+ gObjectEvents[i].mapobj_bit_23 = questLogObjectEvents[i].mapobj_bit_23;
+ gObjectEvents[i].mapobj_bit_24 = questLogObjectEvents[i].mapobj_bit_24;
+ gObjectEvents[i].mapobj_bit_25 = questLogObjectEvents[i].mapobj_bit_25;
+ gObjectEvents[i].mapobj_bit_26 = questLogObjectEvents[i].mapobj_bit_26;
+ gObjectEvents[i].facingDirection = questLogObjectEvents[i].mapobj_unk_18;
+ gObjectEvents[i].mapobj_unk_0B_0 = questLogObjectEvents[i].mapobj_unk_0B_0;
+ gObjectEvents[i].elevation = questLogObjectEvents[i].elevation;
+ gObjectEvents[i].graphicsId = questLogObjectEvents[i].graphicsId;
+ gObjectEvents[i].animPattern = questLogObjectEvents[i].animPattern;
+ gObjectEvents[i].trainerType = questLogObjectEvents[i].trainerType;
+ gObjectEvents[i].localId = questLogObjectEvents[i].localId;
+ gObjectEvents[i].mapNum = questLogObjectEvents[i].mapNum;
+ gObjectEvents[i].mapGroup = questLogObjectEvents[i].mapGroup;
+ gObjectEvents[i].coords2.x = questLogObjectEvents[i].x;
+ gObjectEvents[i].coords2.y = questLogObjectEvents[i].y;
+ gObjectEvents[i].trainerRange_berryTreeId = questLogObjectEvents[i].trainerRange_berryTreeId;
+ gObjectEvents[i].mapobj_unk_1F = questLogObjectEvents[i].mapobj_unk_1F;
+ gObjectEvents[i].mapobj_unk_21 = questLogObjectEvents[i].mapobj_unk_21;
+ gObjectEvents[i].animId = questLogObjectEvents[i].animId;
for (j = 0; j < 0x40; j++)
{
- if (gMapObjects[i].localId == templates[j].localId)
+ if (gObjectEvents[i].localId == templates[j].localId)
{
- gMapObjects[i].coords1.x = templates[j].x + 7;
- gMapObjects[i].coords1.y = templates[j].y + 7;
- gMapObjects[i].range.as_nybbles.x = templates[j].movementRangeX;
- gMapObjects[i].range.as_nybbles.y = templates[j].movementRangeY;
+ gObjectEvents[i].coords1.x = templates[j].x + 7;
+ gObjectEvents[i].coords1.y = templates[j].y + 7;
+ gObjectEvents[i].range.as_nybbles.x = templates[j].movementRangeX;
+ gObjectEvents[i].range.as_nybbles.y = templates[j].movementRangeY;
}
}
- gMapObjects[i].mapobj_unk_1E = MapGridGetMetatileBehaviorAt(gMapObjects[i].coords2.x, gMapObjects[i].coords2.y);
- if (gMapObjects[i].mapobj_unk_1F == MapGridGetMetatileBehaviorAt((s16)(gMapObjects[i].coords2.x), (s16)(gMapObjects[i].coords2.y)))
+ gObjectEvents[i].mapobj_unk_1E = MapGridGetMetatileBehaviorAt(gObjectEvents[i].coords2.x, gObjectEvents[i].coords2.y);
+ if (gObjectEvents[i].mapobj_unk_1F == MapGridGetMetatileBehaviorAt((s16)(gObjectEvents[i].coords2.x), (s16)(gObjectEvents[i].coords2.y)))
{
- gMapObjects[i].coords3.x = gMapObjects[i].coords2.x;
- gMapObjects[i].coords3.y = gMapObjects[i].coords2.y;
+ gObjectEvents[i].coords3.x = gObjectEvents[i].coords2.x;
+ gObjectEvents[i].coords3.y = gObjectEvents[i].coords2.y;
}
- else if (gMapObjects[i].mapobj_unk_1F == MapGridGetMetatileBehaviorAt((s16)(gMapObjects[i].coords2.x - 1), (s16)(gMapObjects[i].coords2.y)))
+ else if (gObjectEvents[i].mapobj_unk_1F == MapGridGetMetatileBehaviorAt((s16)(gObjectEvents[i].coords2.x - 1), (s16)(gObjectEvents[i].coords2.y)))
{
- gMapObjects[i].coords3.x = gMapObjects[i].coords2.x - 1;
- gMapObjects[i].coords3.y = gMapObjects[i].coords2.y;
+ gObjectEvents[i].coords3.x = gObjectEvents[i].coords2.x - 1;
+ gObjectEvents[i].coords3.y = gObjectEvents[i].coords2.y;
}
- else if (gMapObjects[i].mapobj_unk_1F == MapGridGetMetatileBehaviorAt((s16)(gMapObjects[i].coords2.x + 1), (s16)(gMapObjects[i].coords2.y)))
+ else if (gObjectEvents[i].mapobj_unk_1F == MapGridGetMetatileBehaviorAt((s16)(gObjectEvents[i].coords2.x + 1), (s16)(gObjectEvents[i].coords2.y)))
{
- gMapObjects[i].coords3.x = gMapObjects[i].coords2.x + 1;
- gMapObjects[i].coords3.y = gMapObjects[i].coords2.y;
+ gObjectEvents[i].coords3.x = gObjectEvents[i].coords2.x + 1;
+ gObjectEvents[i].coords3.y = gObjectEvents[i].coords2.y;
}
- else if (gMapObjects[i].mapobj_unk_1F == MapGridGetMetatileBehaviorAt((s16)(gMapObjects[i].coords2.x), (s16)(gMapObjects[i].coords2.y - 1)))
+ else if (gObjectEvents[i].mapobj_unk_1F == MapGridGetMetatileBehaviorAt((s16)(gObjectEvents[i].coords2.x), (s16)(gObjectEvents[i].coords2.y - 1)))
{
- gMapObjects[i].coords3.x = gMapObjects[i].coords2.x;
- gMapObjects[i].coords3.y = gMapObjects[i].coords2.y - 1;
+ gObjectEvents[i].coords3.x = gObjectEvents[i].coords2.x;
+ gObjectEvents[i].coords3.y = gObjectEvents[i].coords2.y - 1;
}
- else if (gMapObjects[i].mapobj_unk_1F == MapGridGetMetatileBehaviorAt((s16)(gMapObjects[i].coords2.x), (s16)(gMapObjects[i].coords2.y + 1)))
+ else if (gObjectEvents[i].mapobj_unk_1F == MapGridGetMetatileBehaviorAt((s16)(gObjectEvents[i].coords2.x), (s16)(gObjectEvents[i].coords2.y + 1)))
{
- gMapObjects[i].coords3.x = gMapObjects[i].coords2.x;
- gMapObjects[i].coords3.y = gMapObjects[i].coords2.y + 1;
+ gObjectEvents[i].coords3.x = gObjectEvents[i].coords2.x;
+ gObjectEvents[i].coords3.y = gObjectEvents[i].coords2.y + 1;
}
}
- CpuCopy16(gMapObjects, gSaveBlock1Ptr->mapObjects, sizeof(gMapObjects));
+ CpuCopy16(gObjectEvents, gSaveBlock1Ptr->objectEvents, sizeof(gObjectEvents));
}
void sub_815A540(void)
@@ -141,9 +141,9 @@ void sub_815A540(void)
PlayerGetDestCoords(&x, &y);
if (!MetatileBehavior_IsSurfable(MapGridGetMetatileBehaviorAt(x, y)) && TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING))
{
- struct MapObject * mapObject = &gMapObjects[gPlayerAvatar.mapObjectId];
+ struct ObjectEvent * objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
SetPlayerAvatarTransitionFlags(0x01);
- DestroySprite(&gSprites[mapObject->mapobj_unk_1A]);
+ DestroySprite(&gSprites[objectEvent->mapobj_unk_1A]);
}
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-07 10:29:03 +0000