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

field effect 0x43

Browse Source
This commit is contained in:
PikalaxALT
2020-03-02 09:18:32 -05:00
parent fb064f17ba
commit a506860558
3 changed files with 65 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/field_effect.s
-199
View File
@@ -5,205 +5,6 @@
.text
thumb_func_start sub_8087924
sub_8087924: @ 8087924
push {r4-r7,lr}
sub sp, 0x4
ldr r7, _080879C4 @ =gFieldEffectArguments
ldrb r0, [r7]
ldrb r1, [r7, 0x4]
ldrb r2, [r7, 0x8]
mov r3, sp
bl TryGetObjectEventIdByLocalIdAndMap
lsls r0, 24
cmp r0, 0
bne _080879BA
mov r0, sp
ldrb r0, [r0]
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
ldr r0, _080879C8 @ =gObjectEvents
adds r4, r0
movs r0, 0x10
ldrsh r5, [r4, r0]
subs r5, 0x7
movs r0, 0x12
ldrsh r6, [r4, r0]
subs r6, 0x7
ldr r1, [r7, 0xC]
subs r5, r1, r5
lsls r5, 4
ldr r2, [r7, 0x10]
subs r6, r2, r6
lsls r6, 4
adds r1, 0x7
lsls r1, 16
asrs r1, 16
adds r2, 0x7
lsls r2, 16
asrs r2, 16
adds r0, r4, 0
bl npc_coords_shift
ldr r0, _080879CC @ =sub_80879D8
movs r1, 0x50
bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r1, _080879D0 @ =gTasks
lsls r2, r0, 2
adds r2, r0
lsls r2, 3
adds r2, r1
ldrb r0, [r4, 0x4]
strh r0, [r2, 0xA]
ldr r3, _080879D4 @ =gSprites
ldrb r1, [r4, 0x4]
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
adds r0, r3
ldrh r0, [r0, 0x20]
adds r0, r5
strh r0, [r2, 0xC]
ldrb r1, [r4, 0x4]
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
adds r0, r3
ldrh r0, [r0, 0x22]
adds r0, r6
strh r0, [r2, 0xE]
ldr r0, [r7, 0x14]
strh r0, [r2, 0x18]
mov r0, sp
ldrb r0, [r0]
strh r0, [r2, 0x1A]
_080879BA:
movs r0, 0
add sp, 0x4
pop {r4-r7}
pop {r1}
bx r1
.align 2, 0
_080879C4: .4byte gFieldEffectArguments
_080879C8: .4byte gObjectEvents
_080879CC: .4byte sub_80879D8
_080879D0: .4byte gTasks
_080879D4: .4byte gSprites
thumb_func_end sub_8087924
thumb_func_start sub_80879D8
sub_80879D8: @ 80879D8
push {r4-r7,lr}
lsls r0, 24
lsrs r7, r0, 24
lsls r0, r7, 2
adds r0, r7
lsls r0, 3
ldr r1, _08087A04 @ =gTasks+0x8
adds r5, r0, r1
movs r0, 0x2
ldrsh r1, [r5, r0]
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, _08087A08 @ =gSprites
adds r6, r0, r1
movs r1, 0
ldrsh r0, [r5, r1]
cmp r0, 0
beq _08087A0C
cmp r0, 0x1
beq _08087A4A
b _08087AA8
.align 2, 0
_08087A04: .4byte gTasks+0x8
_08087A08: .4byte gSprites
_08087A0C:
ldrh r0, [r6, 0x20]
lsls r0, 4
strh r0, [r5, 0x8]
ldrh r0, [r6, 0x22]
lsls r0, 4
strh r0, [r5, 0xA]
movs r2, 0x4
ldrsh r0, [r5, r2]
lsls r0, 4
movs r2, 0x8
ldrsh r1, [r5, r2]
subs r0, r1
movs r2, 0x10
ldrsh r1, [r5, r2]
bl __divsi3
strh r0, [r5, 0xC]
movs r1, 0x6
ldrsh r0, [r5, r1]
lsls r0, 4
movs r2, 0xA
ldrsh r1, [r5, r2]
subs r0, r1
movs r2, 0x10
ldrsh r1, [r5, r2]
bl __divsi3
strh r0, [r5, 0xE]
ldrh r0, [r5]
adds r0, 0x1
strh r0, [r5]
_08087A4A:
ldrh r1, [r5, 0x10]
movs r2, 0x10
ldrsh r0, [r5, r2]
cmp r0, 0
beq _08087A78
subs r0, r1, 0x1
strh r0, [r5, 0x10]
ldrh r1, [r5, 0xC]
ldrh r0, [r5, 0x8]
adds r1, r0
strh r1, [r5, 0x8]
ldrh r0, [r5, 0xE]
ldrh r2, [r5, 0xA]
adds r0, r2
strh r0, [r5, 0xA]
lsls r1, 16
asrs r1, 20
strh r1, [r6, 0x20]
ldrh r0, [r5, 0xA]
lsls r0, 16
asrs r0, 20
strh r0, [r6, 0x22]
b _08087AA8
_08087A78:
movs r1, 0x12
ldrsh r0, [r5, r1]
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
ldr r0, _08087AB0 @ =gObjectEvents
adds r4, r0
ldrh r0, [r5, 0x4]
strh r0, [r6, 0x20]
ldrh r0, [r5, 0x6]
strh r0, [r6, 0x22]
adds r0, r4, 0
bl npc_coords_shift_still
ldrb r0, [r4]
movs r1, 0x8
orrs r0, r1
strb r0, [r4]
movs r0, 0x43
bl FieldEffectActiveListRemove
adds r0, r7, 0
bl DestroyTask
_08087AA8:
pop {r4-r7}
pop {r0}
bx r0
.align 2, 0
_08087AB0: .4byte gObjectEvents
thumb_func_end sub_80879D8
thumb_func_start sub_8087AB4
sub_8087AB4: @ 8087AB4
push {r4,lr}
data/field_effect_scripts.s
+1 -1
View File
@@ -334,7 +334,7 @@ gFldEffScript_DoubleExclMarkIcon:: @ 81D9998
end
gFldEffScript_Unk43:: @ 81D999E
callnative sub_8087924
callnative FldEff_Unk43
end
gFldEffScript_Unk44:: @ 81D99A4
src/field_effect.c
+64
View File
@@ -3624,3 +3624,67 @@ void sub_80878C0(struct Sprite * sprite)
}
}
}
void Task_FldEffUnk43(u8 taskId);
bool8 FldEff_Unk43(void)
{
u8 taskId;
u8 objectEventIdBuffer;
s32 x;
s32 y;
struct ObjectEvent * objectEvent;
if (!TryGetObjectEventIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2], &objectEventIdBuffer))
{
objectEvent = &gObjectEvents[objectEventIdBuffer];
x = objectEvent->currentCoords.x - 7;
y = objectEvent->currentCoords.y - 7;
x = (gFieldEffectArguments[3] - x) * 16;
y = (gFieldEffectArguments[4] - y) * 16;
npc_coords_shift(objectEvent, gFieldEffectArguments[3] + 7, gFieldEffectArguments[4] + 7);
taskId = CreateTask(Task_FldEffUnk43, 0x50);
gTasks[taskId].data[1] = objectEvent->spriteId;
gTasks[taskId].data[2] = gSprites[objectEvent->spriteId].pos1.x + x;
gTasks[taskId].data[3] = gSprites[objectEvent->spriteId].pos1.y + y;
gTasks[taskId].data[8] = gFieldEffectArguments[5];
gTasks[taskId].data[9] = objectEventIdBuffer;
}
return FALSE;
}
void Task_FldEffUnk43(u8 taskId)
{
s16 *data = gTasks[taskId].data;
struct Sprite * sprite = &gSprites[data[1]];
struct ObjectEvent * objectEvent;
switch (data[0])
{
case 0:
data[4] = sprite->pos1.x << 4;
data[5] = sprite->pos1.y << 4;
data[6] = ((data[2] << 4) - data[4]) / data[8];
data[7] = ((data[3] << 4) - data[5]) / data[8];
data[0]++;
// fallthrough
case 1:
if (data[8] != 0)
{
data[8]--;
data[4] += data[6];
data[5] += data[7];
sprite->pos1.x = data[4] >> 4;
sprite->pos1.y = data[5] >> 4;
}
else
{
objectEvent = &gObjectEvents[data[9]];
sprite->pos1.x = data[2];
sprite->pos1.y = data[3];
npc_coords_shift_still(objectEvent);
objectEvent->triggerGroundEffectsOnStop = TRUE;
FieldEffectActiveListRemove(FLDEFF_UNK_43);
DestroyTask(taskId);
}
break;
}
}