dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Quest log doc cleanup

Browse Source
This commit is contained in:
GriffinR
2023-08-18 12:15:02 -04:00
parent 10c1e1298f
commit 09ee60049c
21 changed files with 410 additions and 428 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/event_object_movement.c
+5 -5
View File
@@ -1677,8 +1677,8 @@ void CopyObjectGraphicsInfoToSpriteTemplate(u16 graphicsId, void (*callback)(str
do
{
if (ScriptContext_IsEnabled() != TRUE && sub_8112CAC() == 1)
spriteTemplate->callback = sub_811246C;
if (ScriptContext_IsEnabled() != TRUE && QL_GetPlaybackState() == QL_PLAYBACK_STATE_RUNNING)
spriteTemplate->callback = QL_UpdateObject;
else
spriteTemplate->callback = callback;
} while (0);
@@ -5046,7 +5046,7 @@ bool8 ObjectEventIsHeldMovementActive(struct ObjectEvent *objectEvent)
bool8 ObjectEventSetHeldMovement(struct ObjectEvent *objectEvent, u8 movementActionId)
{
if(sub_8112CAC() == TRUE)
if (QL_GetPlaybackState() == QL_PLAYBACK_STATE_RUNNING)
ObjectEventClearHeldMovementIfActive(objectEvent);
else if (ObjectEventIsMovementOverridden(objectEvent))
return TRUE;
@@ -5122,7 +5122,7 @@ void UpdateObjectEventCurrentMovement(struct ObjectEvent *objectEvent, struct Sp
ObjectEventUpdateSubpriority(objectEvent, sprite);
}
void UpdateQuestLogObjectEventCurrentMovement(struct ObjectEvent *objectEvent, struct Sprite *sprite)
void QL_UpdateObjectEventCurrentMovement(struct ObjectEvent *objectEvent, struct Sprite *sprite)
{
DoGroundEffects_OnSpawn(objectEvent, sprite);
TryEnableObjectEventAnim(objectEvent, sprite);
@@ -5267,7 +5267,7 @@ static void ObjectEventSetSingleMovement(struct ObjectEvent *objectEvent, struct
objectEvent->movementActionId = movementActionId;
sprite->data[2] = 0;
if (gQuestLogPlaybackState == QL_PLAYBACK_STATE_2)
if (gQuestLogPlaybackState == QL_PLAYBACK_STATE_RECORDING)
QuestLogRecordNPCStep(objectEvent->localId, objectEvent->mapNum, objectEvent->mapGroup, movementActionId);
}