summaryrefslogtreecommitdiff
path: root/src/quest_log_objects.c
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@gmail.com>2020-02-02 11:23:04 -0500
committerPikalaxALT <PikalaxALT@gmail.com>2020-02-02 11:23:04 -0500
commitceeed6247dbeca94fdb073441b98a885da44ffe1 (patch)
tree93e2c1f0b966e704922a14ca7df62f955a0f2c96 /src/quest_log_objects.c
parentba7403c74e214fe798095e99949461aaadd274c7 (diff)
Port object event flags from emerald
Diffstat (limited to 'src/quest_log_objects.c')
-rw-r--r--src/quest_log_objects.c64
1 files changed, 32 insertions, 32 deletions
diff --git a/src/quest_log_objects.c b/src/quest_log_objects.c
index 7917d03e9..aecc5fd68 100644
--- a/src/quest_log_objects.c
+++ b/src/quest_log_objects.c
@@ -14,22 +14,22 @@ 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].triggerGroundEffectsOnStop = gObjectEvents[i].triggerGroundEffectsOnStop;
+ questLog->unk_008[i].disableCoveringGroundEffects = gObjectEvents[i].disableCoveringGroundEffects;
+ questLog->unk_008[i].landingJump = gObjectEvents[i].landingJump;
+ questLog->unk_008[i].frozen = gObjectEvents[i].frozen;
+ questLog->unk_008[i].facingDirectionLocked = gObjectEvents[i].facingDirectionLocked;
+ questLog->unk_008[i].disableAnim = gObjectEvents[i].disableAnim;
+ questLog->unk_008[i].enableAnim = gObjectEvents[i].enableAnim;
+ questLog->unk_008[i].inanimate = gObjectEvents[i].inanimate;
+ questLog->unk_008[i].invisible = gObjectEvents[i].invisible;
+ questLog->unk_008[i].offScreen = gObjectEvents[i].offScreen;
+ questLog->unk_008[i].trackedByCamera = gObjectEvents[i].trackedByCamera;
+ questLog->unk_008[i].isPlayer = gObjectEvents[i].isPlayer;
+ questLog->unk_008[i].spriteAnimPausedBackup = gObjectEvents[i].spriteAnimPausedBackup;
+ questLog->unk_008[i].spriteAffineAnimPausedBackup = gObjectEvents[i].spriteAffineAnimPausedBackup;
+ questLog->unk_008[i].disableJumpLandingGroundEffect = gObjectEvents[i].disableJumpLandingGroundEffect;
+ questLog->unk_008[i].fixedPriority = 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;
@@ -58,22 +58,22 @@ 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].triggerGroundEffectsOnStop;
+ gObjectEvents[i].disableCoveringGroundEffects = questLogObjectEvents[i].disableCoveringGroundEffects;
+ gObjectEvents[i].landingJump = questLogObjectEvents[i].landingJump;
+ gObjectEvents[i].frozen = questLogObjectEvents[i].frozen;
+ gObjectEvents[i].facingDirectionLocked = questLogObjectEvents[i].facingDirectionLocked;
+ gObjectEvents[i].disableAnim = questLogObjectEvents[i].disableAnim;
+ gObjectEvents[i].enableAnim = questLogObjectEvents[i].enableAnim;
+ gObjectEvents[i].inanimate = questLogObjectEvents[i].inanimate;
+ gObjectEvents[i].invisible = questLogObjectEvents[i].invisible;
+ gObjectEvents[i].offScreen = questLogObjectEvents[i].offScreen;
+ gObjectEvents[i].trackedByCamera = questLogObjectEvents[i].trackedByCamera;
+ gObjectEvents[i].isPlayer = questLogObjectEvents[i].isPlayer;
+ gObjectEvents[i].spriteAnimPausedBackup = questLogObjectEvents[i].spriteAnimPausedBackup;
+ gObjectEvents[i].spriteAffineAnimPausedBackup = questLogObjectEvents[i].spriteAffineAnimPausedBackup;
+ gObjectEvents[i].disableJumpLandingGroundEffect = questLogObjectEvents[i].disableJumpLandingGroundEffect;
+ gObjectEvents[i].fixedPriority = questLogObjectEvents[i].fixedPriority;
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;