mirror of
https://github.com/Ninjdai1/pokeemerald.git
synced 2025-02-04 10:20:01 +01:00
Merge branch 'master' into fix-eventobj
This commit is contained in:
GriffinR
GitHub
commit
8da7a94423
@ -59,8 +59,8 @@ struct ObjectEventTemplate
|
||||
/*0x06*/ s16 y;
|
||||
/*0x08*/ u8 elevation;
|
||||
/*0x09*/ u8 movementType;
|
||||
/*0x0A*/ u8 movementRangeX:4;
|
||||
u8 movementRangeY:4;
|
||||
/*0x0A*/ u16 movementRangeX:4;
|
||||
u16 movementRangeY:4;
|
||||
/*0x0C*/ u16 trainerType;
|
||||
/*0x0E*/ u16 trainerRange_berryTreeId;
|
||||
/*0x10*/ const u8 *script;
|
||||
|
||||
@ -1199,8 +1199,6 @@ static u8 GetObjectEventIdByLocalId(u8 localId)
|
||||
return OBJECT_EVENTS_COUNT;
|
||||
}
|
||||
|
||||
// This function has the same nonmatching quirk as in Ruby/Sapphire.
|
||||
#ifdef NONMATCHING
|
||||
static u8 InitObjectEventStateFromTemplate(struct ObjectEventTemplate *template, u8 mapNum, u8 mapGroup)
|
||||
{
|
||||
struct ObjectEvent *objectEvent;
|
||||
@ -1208,11 +1206,8 @@ static u8 InitObjectEventStateFromTemplate(struct ObjectEventTemplate *template,
|
||||
s16 x;
|
||||
s16 y;
|
||||
|
||||
// mapNum and mapGroup are in the wrong registers (r7/r6 instead of r6/r7)
|
||||
if (GetAvailableObjectEventId(template->localId, mapNum, mapGroup, &objectEventId))
|
||||
{
|
||||
return OBJECT_EVENTS_COUNT;
|
||||
}
|
||||
objectEvent = &gObjectEvents[objectEventId];
|
||||
ClearObjectEvent(objectEvent);
|
||||
x = template->x + 7;
|
||||
@ -1223,6 +1218,7 @@ static u8 InitObjectEventStateFromTemplate(struct ObjectEventTemplate *template,
|
||||
objectEvent->movementType = template->movementType;
|
||||
objectEvent->localId = template->localId;
|
||||
objectEvent->mapNum = mapNum;
|
||||
objectEvent++; objectEvent--;
|
||||
objectEvent->mapGroup = mapGroup;
|
||||
objectEvent->initialCoords.x = x;
|
||||
objectEvent->initialCoords.y = y;
|
||||
@ -1232,7 +1228,6 @@ static u8 InitObjectEventStateFromTemplate(struct ObjectEventTemplate *template,
|
||||
objectEvent->previousCoords.y = y;
|
||||
objectEvent->currentElevation = template->elevation;
|
||||
objectEvent->previousElevation = template->elevation;
|
||||
// For some reason, 0x0F is placed in r9, to be used later
|
||||
objectEvent->range.as_nybbles.x = template->movementRangeX;
|
||||
objectEvent->range.as_nybbles.y = template->movementRangeY;
|
||||
objectEvent->trainerType = template->trainerType;
|
||||
@ -1240,177 +1235,22 @@ static u8 InitObjectEventStateFromTemplate(struct ObjectEventTemplate *template,
|
||||
objectEvent->previousMovementDirection = gInitialMovementTypeFacingDirections[template->movementType];
|
||||
SetObjectEventDirection(objectEvent, objectEvent->previousMovementDirection);
|
||||
SetObjectEventDynamicGraphicsId(objectEvent);
|
||||
|
||||
#ifndef NONMATCHING
|
||||
asm("":::"r5", "r6");
|
||||
#endif
|
||||
if (gRangedMovementTypes[objectEvent->movementType])
|
||||
{
|
||||
if ((objectEvent->range.as_nybbles.x) == 0)
|
||||
if (objectEvent->range.as_nybbles.x == 0)
|
||||
{
|
||||
// r9 is invoked here
|
||||
objectEvent->range.as_nybbles.x++;
|
||||
}
|
||||
if ((objectEvent->range.as_nybbles.y) == 0)
|
||||
if (objectEvent->range.as_nybbles.y == 0)
|
||||
{
|
||||
objectEvent->range.as_nybbles.y++;
|
||||
}
|
||||
}
|
||||
return objectEventId;
|
||||
}
|
||||
#else
|
||||
static NAKED u8 InitObjectEventStateFromTemplate(struct ObjectEventTemplate *template, u8 mapId, u8 mapGroupId)
|
||||
{
|
||||
asm_unified("\tpush {r4-r7,lr}\n"
|
||||
"\tmov r7, r9\n"
|
||||
"\tmov r6, r8\n"
|
||||
"\tpush {r6,r7}\n"
|
||||
"\tsub sp, 0x4\n"
|
||||
"\tadds r5, r0, 0\n"
|
||||
"\tlsls r1, 24\n"
|
||||
"\tlsrs r6, r1, 24\n"
|
||||
"\tlsls r2, 24\n"
|
||||
"\tlsrs r7, r2, 24\n"
|
||||
"\tldrb r0, [r5]\n"
|
||||
"\tadds r1, r6, 0\n"
|
||||
"\tadds r2, r7, 0\n"
|
||||
"\tmov r3, sp\n"
|
||||
"\tbl GetAvailableObjectEventId\n"
|
||||
"\tlsls r0, 24\n"
|
||||
"\tcmp r0, 0\n"
|
||||
"\tbeq _0808D66E\n"
|
||||
"\tmovs r0, 0x10\n"
|
||||
"\tb _0808D762\n"
|
||||
"_0808D66E:\n"
|
||||
"\tmov r0, sp\n"
|
||||
"\tldrb r1, [r0]\n"
|
||||
"\tlsls r0, r1, 3\n"
|
||||
"\tadds r0, r1\n"
|
||||
"\tlsls r0, 2\n"
|
||||
"\tldr r1, =gObjectEvents\n"
|
||||
"\tadds r4, r0, r1\n"
|
||||
"\tadds r0, r4, 0\n"
|
||||
"\tbl ClearObjectEvent\n"
|
||||
"\tldrh r3, [r5, 0x4]\n"
|
||||
"\tadds r3, 0x7\n"
|
||||
"\tlsls r3, 16\n"
|
||||
"\tlsrs r3, 16\n"
|
||||
"\tldrh r2, [r5, 0x6]\n"
|
||||
"\tadds r2, 0x7\n"
|
||||
"\tlsls r2, 16\n"
|
||||
"\tlsrs r2, 16\n"
|
||||
"\tldrb r0, [r4]\n"
|
||||
"\tmovs r1, 0x1\n"
|
||||
"\torrs r0, r1\n"
|
||||
"\tmovs r1, 0x4\n"
|
||||
"\torrs r0, r1\n"
|
||||
"\tstrb r0, [r4]\n"
|
||||
"\tldrb r0, [r5, 0x1]\n"
|
||||
"\tstrb r0, [r4, 0x5]\n"
|
||||
"\tldrb r0, [r5, 0x9]\n"
|
||||
"\tstrb r0, [r4, 0x6]\n"
|
||||
"\tldrb r0, [r5]\n"
|
||||
"\tstrb r0, [r4, 0x8]\n"
|
||||
"\tstrb r6, [r4, 0x9]\n"
|
||||
"\tstrb r7, [r4, 0xA]\n"
|
||||
"\tstrh r3, [r4, 0xC]\n"
|
||||
"\tstrh r2, [r4, 0xE]\n"
|
||||
"\tstrh r3, [r4, 0x10]\n"
|
||||
"\tstrh r2, [r4, 0x12]\n"
|
||||
"\tstrh r3, [r4, 0x14]\n"
|
||||
"\tstrh r2, [r4, 0x16]\n"
|
||||
"\tldrb r0, [r5, 0x8]\n"
|
||||
"\tmovs r7, 0xF\n"
|
||||
"\tadds r1, r7, 0\n"
|
||||
"\tands r1, r0\n"
|
||||
"\tldrb r2, [r4, 0xB]\n"
|
||||
"\tmovs r0, 0x10\n"
|
||||
"\tnegs r0, r0\n"
|
||||
"\tmov r8, r0\n"
|
||||
"\tands r0, r2\n"
|
||||
"\torrs r0, r1\n"
|
||||
"\tstrb r0, [r4, 0xB]\n"
|
||||
"\tldrb r1, [r5, 0x8]\n"
|
||||
"\tlsls r1, 4\n"
|
||||
"\tands r0, r7\n"
|
||||
"\torrs r0, r1\n"
|
||||
"\tstrb r0, [r4, 0xB]\n"
|
||||
"\tldrb r1, [r5, 0xA]\n"
|
||||
"\tlsls r1, 28\n"
|
||||
"\tmovs r0, 0xF\n"
|
||||
"\tmov r9, r0\n"
|
||||
"\tlsrs r1, 28\n"
|
||||
"\tldrb r2, [r4, 0x19]\n"
|
||||
"\tmov r0, r8\n"
|
||||
"\tands r0, r2\n"
|
||||
"\torrs r0, r1\n"
|
||||
"\tstrb r0, [r4, 0x19]\n"
|
||||
"\tldrb r1, [r5, 0xA]\n"
|
||||
"\tlsrs r1, 4\n"
|
||||
"\tlsls r1, 4\n"
|
||||
"\tands r0, r7\n"
|
||||
"\torrs r0, r1\n"
|
||||
"\tstrb r0, [r4, 0x19]\n"
|
||||
"\tldrh r0, [r5, 0xC]\n"
|
||||
"\tstrb r0, [r4, 0x7]\n"
|
||||
"\tldrh r0, [r5, 0xE]\n"
|
||||
"\tstrb r0, [r4, 0x1D]\n"
|
||||
"\tldr r1, =gInitialMovementTypeFacingDirections\n"
|
||||
"\tldrb r0, [r5, 0x9]\n"
|
||||
"\tadds r0, r1\n"
|
||||
"\tldrb r1, [r0]\n"
|
||||
"\tadds r0, r4, 0\n"
|
||||
"\tadds r0, 0x20\n"
|
||||
"\tstrb r1, [r0]\n"
|
||||
"\tldrb r1, [r0]\n"
|
||||
"\tadds r0, r4, 0\n"
|
||||
"\tbl SetObjectEventDirection\n"
|
||||
"\tadds r0, r4, 0\n"
|
||||
"\tbl SetObjectEventDynamicGraphicsId\n"
|
||||
"\tldr r1, =gRangedMovementTypes\n"
|
||||
"\tldrb r0, [r4, 0x6]\n"
|
||||
"\tadds r0, r1\n"
|
||||
"\tldrb r0, [r0]\n"
|
||||
"\tcmp r0, 0\n"
|
||||
"\tbeq _0808D75E\n"
|
||||
"\tldrb r2, [r4, 0x19]\n"
|
||||
"\tadds r0, r7, 0\n"
|
||||
"\tands r0, r2\n"
|
||||
"\tcmp r0, 0\n"
|
||||
"\tbne _0808D746\n"
|
||||
"\tlsls r0, r2, 28\n"
|
||||
"\tlsrs r0, 28\n"
|
||||
"\tadds r0, 0x1\n"
|
||||
"\tmov r1, r9\n"
|
||||
"\tands r0, r1\n"
|
||||
"\tmov r1, r8\n"
|
||||
"\tands r1, r2\n"
|
||||
"\torrs r1, r0\n"
|
||||
"\tstrb r1, [r4, 0x19]\n"
|
||||
"_0808D746:\n"
|
||||
"\tldrb r2, [r4, 0x19]\n"
|
||||
"\tmovs r0, 0xF0\n"
|
||||
"\tands r0, r2\n"
|
||||
"\tcmp r0, 0\n"
|
||||
"\tbne _0808D75E\n"
|
||||
"\tlsrs r1, r2, 4\n"
|
||||
"\tadds r1, 0x1\n"
|
||||
"\tlsls r1, 4\n"
|
||||
"\tadds r0, r7, 0\n"
|
||||
"\tands r0, r2\n"
|
||||
"\torrs r0, r1\n"
|
||||
"\tstrb r0, [r4, 0x19]\n"
|
||||
"_0808D75E:\n"
|
||||
"\tmov r0, sp\n"
|
||||
"\tldrb r0, [r0]\n"
|
||||
"_0808D762:\n"
|
||||
"\tadd sp, 0x4\n"
|
||||
"\tpop {r3,r4}\n"
|
||||
"\tmov r8, r3\n"
|
||||
"\tmov r9, r4\n"
|
||||
"\tpop {r4-r7}\n"
|
||||
"\tpop {r1}\n"
|
||||
"\tbx r1\n"
|
||||
".pool");
|
||||
}
|
||||
#endif
|
||||
|
||||
u8 Unref_TryInitLocalObjectEvent(u8 localId)
|
||||
{
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user