diff options
Diffstat (limited to 'src/event_object_movement.c')
| -rw-r--r-- | src/event_object_movement.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/event_object_movement.c b/src/event_object_movement.c index 5361d05dc..72ce58bb5 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -1,5 +1,5 @@ #include "global.h" -#include "malloc.h" +#include "gflib.h" #include "event_data.h" #include "event_object_movement.h" #include "field_camera.h" @@ -10,7 +10,6 @@ #include "fieldmap.h" #include "metatile_behavior.h" #include "overworld.h" -#include "palette.h" #include "quest_log.h" #include "random.h" #include "script.h" @@ -2805,7 +2804,7 @@ u8 sub_805FC9C(u8 localId, u8 mapNum, u8 mapGroup) return gObjectEvents[objectEventId].trainerType; } -u16 sub_805FCD8(u8 localId, u8 mapNum, u8 mapGroup) +u16 GetObjectEventFlagByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup) { return GetObjectEventTemplateByLocalIdAndMap(localId, mapNum, mapGroup)->trainerType; } @@ -5530,7 +5529,7 @@ static void sub_8064544(struct ObjectEvent *objectEvent, struct Sprite *sprite) { objectEvent->heldMovementFinished = TRUE; if (objectEvent->graphicsId == 0x61) - sub_806DE28(objectEvent); + HandleBoulderFallThroughHole(objectEvent); } } @@ -5550,7 +5549,7 @@ static void ObjectEventSetSingleMovement(struct ObjectEvent *objectEvent, struct objectEvent->movementActionId = animId; sprite->data[2] = 0; - if (gUnknown_3005E88 == 2) + if (gQuestLogPlaybackState == 2) { sub_81124EC(objectEvent->localId, objectEvent->mapNum, objectEvent->mapGroup, animId); } |