summaryrefslogtreecommitdiff
path: root/src/quest_log_objects.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/quest_log_objects.c')
-rw-r--r--src/quest_log_objects.c134
1 files changed, 67 insertions, 67 deletions
diff --git a/src/quest_log_objects.c b/src/quest_log_objects.c
index 7917d03e9..c021bbb61 100644
--- a/src/quest_log_objects.c
+++ b/src/quest_log_objects.c
@@ -14,37 +14,37 @@ void SetQuestLogObjectEventsData(struct QuestLog * questLog)
for (i = 0; i < OBJECT_EVENTS_COUNT; i++)
{
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_bit_3 = gObjectEvents[i].triggerGroundEffectsOnStop;
+ questLog->unk_008[i].mapobj_bit_4 = gObjectEvents[i].disableCoveringGroundEffects;
+ questLog->unk_008[i].mapobj_bit_5 = gObjectEvents[i].landingJump;
+ questLog->unk_008[i].mapobj_bit_8 = gObjectEvents[i].frozen;
+ questLog->unk_008[i].mapobj_bit_9 = gObjectEvents[i].facingDirectionLocked;
+ questLog->unk_008[i].mapobj_bit_10 = gObjectEvents[i].disableAnim;
+ questLog->unk_008[i].mapobj_bit_11 = gObjectEvents[i].enableAnim;
+ questLog->unk_008[i].mapobj_bit_12 = gObjectEvents[i].inanimate;
+ questLog->unk_008[i].mapobj_bit_13 = gObjectEvents[i].invisible;
+ questLog->unk_008[i].mapobj_bit_14 = gObjectEvents[i].offScreen;
+ questLog->unk_008[i].mapobj_bit_15 = gObjectEvents[i].trackedByCamera;
+ questLog->unk_008[i].mapobj_bit_16 = gObjectEvents[i].isPlayer;
+ questLog->unk_008[i].mapobj_bit_23 = gObjectEvents[i].spriteAnimPausedBackup;
+ questLog->unk_008[i].mapobj_bit_24 = gObjectEvents[i].spriteAffineAnimPausedBackup;
+ questLog->unk_008[i].mapobj_bit_25 = gObjectEvents[i].disableJumpLandingGroundEffect;
+ questLog->unk_008[i].mapobj_bit_26 = gObjectEvents[i].fixedPriority;
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].mapobj_unk_0B_0 = gObjectEvents[i].currentElevation;
+ questLog->unk_008[i].elevation = gObjectEvents[i].previousElevation;
questLog->unk_008[i].graphicsId = gObjectEvents[i].graphicsId;
- questLog->unk_008[i].animPattern = gObjectEvents[i].animPattern;
+ questLog->unk_008[i].animPattern = gObjectEvents[i].movementType;
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].x = gObjectEvents[i].currentCoords.x;
+ questLog->unk_008[i].y = gObjectEvents[i].currentCoords.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;
+ questLog->unk_008[i].mapobj_unk_1F = gObjectEvents[i].previousMetatileBehavior;
+ questLog->unk_008[i].mapobj_unk_21 = gObjectEvents[i].directionSequenceIndex;
+ questLog->unk_008[i].animId = gObjectEvents[i].playerCopyableMovement;
}
}
@@ -58,74 +58,74 @@ void sub_815A1F8(const struct QuestLog * questLog, const struct ObjectEventTempl
for (i = 0; i < OBJECT_EVENTS_COUNT; i++)
{
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].triggerGroundEffectsOnStop = questLogObjectEvents[i].mapobj_bit_3;
+ gObjectEvents[i].disableCoveringGroundEffects = questLogObjectEvents[i].mapobj_bit_4;
+ gObjectEvents[i].landingJump = questLogObjectEvents[i].mapobj_bit_5;
+ gObjectEvents[i].frozen = questLogObjectEvents[i].mapobj_bit_8;
+ gObjectEvents[i].facingDirectionLocked = questLogObjectEvents[i].mapobj_bit_9;
+ gObjectEvents[i].disableAnim = questLogObjectEvents[i].mapobj_bit_10;
+ gObjectEvents[i].enableAnim = questLogObjectEvents[i].mapobj_bit_11;
+ gObjectEvents[i].inanimate = questLogObjectEvents[i].mapobj_bit_12;
+ gObjectEvents[i].invisible = questLogObjectEvents[i].mapobj_bit_13;
+ gObjectEvents[i].offScreen = questLogObjectEvents[i].mapobj_bit_14;
+ gObjectEvents[i].trackedByCamera = questLogObjectEvents[i].mapobj_bit_15;
+ gObjectEvents[i].isPlayer = questLogObjectEvents[i].mapobj_bit_16;
+ gObjectEvents[i].spriteAnimPausedBackup = questLogObjectEvents[i].mapobj_bit_23;
+ gObjectEvents[i].spriteAffineAnimPausedBackup = questLogObjectEvents[i].mapobj_bit_24;
+ gObjectEvents[i].disableJumpLandingGroundEffect = questLogObjectEvents[i].mapobj_bit_25;
+ gObjectEvents[i].fixedPriority = 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].currentElevation = questLogObjectEvents[i].mapobj_unk_0B_0;
+ gObjectEvents[i].previousElevation = questLogObjectEvents[i].elevation;
gObjectEvents[i].graphicsId = questLogObjectEvents[i].graphicsId;
- gObjectEvents[i].animPattern = questLogObjectEvents[i].animPattern;
+ gObjectEvents[i].movementType = 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].currentCoords.x = questLogObjectEvents[i].x;
+ gObjectEvents[i].currentCoords.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;
+ gObjectEvents[i].previousMetatileBehavior = questLogObjectEvents[i].mapobj_unk_1F;
+ gObjectEvents[i].directionSequenceIndex = questLogObjectEvents[i].mapobj_unk_21;
+ gObjectEvents[i].playerCopyableMovement = questLogObjectEvents[i].animId;
for (j = 0; j < 0x40; j++)
{
if (gObjectEvents[i].localId == templates[j].localId)
{
- gObjectEvents[i].coords1.x = templates[j].x + 7;
- gObjectEvents[i].coords1.y = templates[j].y + 7;
+ gObjectEvents[i].initialCoords.x = templates[j].x + 7;
+ gObjectEvents[i].initialCoords.y = templates[j].y + 7;
gObjectEvents[i].range.as_nybbles.x = templates[j].movementRangeX;
gObjectEvents[i].range.as_nybbles.y = templates[j].movementRangeY;
}
}
- 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)))
+ gObjectEvents[i].currentMetatileBehavior = MapGridGetMetatileBehaviorAt(gObjectEvents[i].currentCoords.x, gObjectEvents[i].currentCoords.y);
+ if (gObjectEvents[i].previousMetatileBehavior == MapGridGetMetatileBehaviorAt((s16)(gObjectEvents[i].currentCoords.x), (s16)(gObjectEvents[i].currentCoords.y)))
{
- gObjectEvents[i].coords3.x = gObjectEvents[i].coords2.x;
- gObjectEvents[i].coords3.y = gObjectEvents[i].coords2.y;
+ gObjectEvents[i].previousCoords.x = gObjectEvents[i].currentCoords.x;
+ gObjectEvents[i].previousCoords.y = gObjectEvents[i].currentCoords.y;
}
- else if (gObjectEvents[i].mapobj_unk_1F == MapGridGetMetatileBehaviorAt((s16)(gObjectEvents[i].coords2.x - 1), (s16)(gObjectEvents[i].coords2.y)))
+ else if (gObjectEvents[i].previousMetatileBehavior == MapGridGetMetatileBehaviorAt((s16)(gObjectEvents[i].currentCoords.x - 1), (s16)(gObjectEvents[i].currentCoords.y)))
{
- gObjectEvents[i].coords3.x = gObjectEvents[i].coords2.x - 1;
- gObjectEvents[i].coords3.y = gObjectEvents[i].coords2.y;
+ gObjectEvents[i].previousCoords.x = gObjectEvents[i].currentCoords.x - 1;
+ gObjectEvents[i].previousCoords.y = gObjectEvents[i].currentCoords.y;
}
- else if (gObjectEvents[i].mapobj_unk_1F == MapGridGetMetatileBehaviorAt((s16)(gObjectEvents[i].coords2.x + 1), (s16)(gObjectEvents[i].coords2.y)))
+ else if (gObjectEvents[i].previousMetatileBehavior == MapGridGetMetatileBehaviorAt((s16)(gObjectEvents[i].currentCoords.x + 1), (s16)(gObjectEvents[i].currentCoords.y)))
{
- gObjectEvents[i].coords3.x = gObjectEvents[i].coords2.x + 1;
- gObjectEvents[i].coords3.y = gObjectEvents[i].coords2.y;
+ gObjectEvents[i].previousCoords.x = gObjectEvents[i].currentCoords.x + 1;
+ gObjectEvents[i].previousCoords.y = gObjectEvents[i].currentCoords.y;
}
- else if (gObjectEvents[i].mapobj_unk_1F == MapGridGetMetatileBehaviorAt((s16)(gObjectEvents[i].coords2.x), (s16)(gObjectEvents[i].coords2.y - 1)))
+ else if (gObjectEvents[i].previousMetatileBehavior == MapGridGetMetatileBehaviorAt((s16)(gObjectEvents[i].currentCoords.x), (s16)(gObjectEvents[i].currentCoords.y - 1)))
{
- gObjectEvents[i].coords3.x = gObjectEvents[i].coords2.x;
- gObjectEvents[i].coords3.y = gObjectEvents[i].coords2.y - 1;
+ gObjectEvents[i].previousCoords.x = gObjectEvents[i].currentCoords.x;
+ gObjectEvents[i].previousCoords.y = gObjectEvents[i].currentCoords.y - 1;
}
- else if (gObjectEvents[i].mapobj_unk_1F == MapGridGetMetatileBehaviorAt((s16)(gObjectEvents[i].coords2.x), (s16)(gObjectEvents[i].coords2.y + 1)))
+ else if (gObjectEvents[i].previousMetatileBehavior == MapGridGetMetatileBehaviorAt((s16)(gObjectEvents[i].currentCoords.x), (s16)(gObjectEvents[i].currentCoords.y + 1)))
{
- gObjectEvents[i].coords3.x = gObjectEvents[i].coords2.x;
- gObjectEvents[i].coords3.y = gObjectEvents[i].coords2.y + 1;
+ gObjectEvents[i].previousCoords.x = gObjectEvents[i].currentCoords.x;
+ gObjectEvents[i].previousCoords.y = gObjectEvents[i].currentCoords.y + 1;
}
}
@@ -143,7 +143,7 @@ void sub_815A540(void)
{
struct ObjectEvent * objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
SetPlayerAvatarTransitionFlags(0x01);
- DestroySprite(&gSprites[objectEvent->mapobj_unk_1A]);
+ DestroySprite(&gSprites[objectEvent->fieldEffectSpriteId]);
}
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-06 12:28:37 +0000