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/quest_log.c
+8 -8
View File
@@ -1532,12 +1532,12 @@ void sub_8112450(void)
void sub_811246C(struct Sprite *sprite)
{
struct ObjectEvent *mapObject = &gObjectEvents[sprite->data[0]];
if (mapObject->localId == 0xFF)
struct ObjectEvent *objectEvent = &gObjectEvents[sprite->data[0]];
if (objectEvent->localId == 0xFF)
{
if (gUnknown_203AF9A[0][0] != 0xFF)
{
ObjectEventSetHeldMovement(mapObject, gUnknown_203AF9A[0][0]);
ObjectEventSetHeldMovement(objectEvent, gUnknown_203AF9A[0][0]);
gUnknown_203AF9A[0][0] = 0xFF;
}
if (gUnknown_203AF9A[0][1] != 0xFF)
@@ -1545,16 +1545,16 @@ void sub_811246C(struct Sprite *sprite)
sub_8150454();
gUnknown_203AF9A[0][1] = 0xFF;
}
sub_8063E28(mapObject, sprite);
sub_8063E28(objectEvent, sprite);
}
else
{
if (gUnknown_203AF9A[mapObject->localId][0] != 0xFF)
if (gUnknown_203AF9A[objectEvent->localId][0] != 0xFF)
{
ObjectEventSetHeldMovement(mapObject, gUnknown_203AF9A[mapObject->localId][0]);
gUnknown_203AF9A[mapObject->localId][0] = 0xFF;
ObjectEventSetHeldMovement(objectEvent, gUnknown_203AF9A[objectEvent->localId][0]);
gUnknown_203AF9A[objectEvent->localId][0] = 0xFF;
}
sub_8063E28(mapObject, sprite);
sub_8063E28(objectEvent, sprite);
}
}