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

final pass at unifying on object event

Browse Source
This commit is contained in:
garak
2019-12-17 20:16:40 -05:00
parent ddaa88390e
commit fabe354c01
11 changed files with 94 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/event_object_lock.c
+5 -5
View File
@@ -87,19 +87,19 @@ void LockSelectedObjectEvent(void)
void sub_80696C0(void)
{
u8 fieldObjectId = GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0);
ObjectEventClearHeldMovementIfFinished(&gObjectEvents[fieldObjectId]);
u8 objectEventId = GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0);
ObjectEventClearHeldMovementIfFinished(&gObjectEvents[objectEventId]);
sub_80974D8();
UnfreezeObjectEvents();
}
void sub_80696F0(void)
{
u8 fieldObjectId;
u8 objectEventId;
if (gObjectEvents[gSelectedObjectEvent].active)
ObjectEventClearHeldMovementIfFinished(&gObjectEvents[gSelectedObjectEvent]);
fieldObjectId = GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0);
ObjectEventClearHeldMovementIfFinished(&gObjectEvents[fieldObjectId]);
objectEventId = GetObjectEventIdByLocalIdAndMap(0xFF, 0, 0);
ObjectEventClearHeldMovementIfFinished(&gObjectEvents[objectEventId]);
sub_80974D8();
UnfreezeObjectEvents();
}