Leahnaya/pokeruby
1
0
Fork 0
mirror of https://github.com/pret/pokeruby.git synced 2026-10-01 22:38:48 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #853 from AreaZeroArven/do-some-work

Browse Source 
event_object_movement: un-assembler InitObjectEventStateFromTemplate
This commit is contained in:
Revo
2023-01-07 13:04:07 -05:00
committed by GitHub
parent df0a97c212 1ef5efc481
commit 0f86137485
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/event_object_movement.c
View File

@@ -1169,7 +1169,6 @@ static u8 InitObjectEventStateFromTemplate(struct ObjectEventTemplate *template,
objectEvent->movementType = template->movementType;
objectEvent->localId = template->localId;
objectEvent->mapNum = mapNum;
asm("":::"r6");
objectEvent->mapGroup = mapGroup;
objectEvent->initialCoords.x = initialX;
objectEvent->initialCoords.y = initialY;
@@ -1182,10 +1181,10 @@ static u8 InitObjectEventStateFromTemplate(struct ObjectEventTemplate *template,
objectEvent->range.as_nybbles.x = template->movementRangeX;
objectEvent->range.as_nybbles.y = template->movementRangeY;
objectEvent->trainerType = template->trainerType;
objectEvent->mapNum = mapNum; // Redundant, but required to match
objectEvent->trainerRange_berryTreeId = template->trainerRange_berryTreeId;
objectEvent->previousMovementDirection = gInitialMovementTypeFacingDirections[template->movementType];
SetObjectEventDirection(objectEvent, objectEvent->previousMovementDirection);
asm("":::"r5","r6");
SetObjectEventDynamicGraphicsId(objectEvent);
if (gRangedMovementTypes[objectEvent->movementType])
@@ -1224,7 +1223,7 @@ u8 TryInitLocalObjectEvent(u8 localId)
static bool8 GetAvailableObjectEventId(u16 localId, u8 mapNum, u8 mapGroup, u8 *objectEventId)
{
u8 i = 0;
u8 i;
for (i = 0; i < OBJECT_EVENTS_COUNT; i++)
{