Use Surf field effect

This commit is contained in:
PikalaxALT
2020-02-28 15:29:16 -05:00
parent 0c492c087e
commit 80e5031619
7 changed files with 107 additions and 302 deletions
-292
View File
@@ -5,298 +5,6 @@
.text
thumb_func_start FldEff_UseSurf
FldEff_UseSurf: @ 8086944
push {r4,lr}
ldr r0, _08086980 @ =Task_FldEffUseSurf
movs r1, 0xFF
bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _08086984 @ =gTasks
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
adds r1, r2
ldr r0, _08086988 @ =gFieldEffectArguments
ldr r0, [r0]
strh r0, [r1, 0x26]
bl sav1_reset_battle_music_maybe
ldr r4, _0808698C @ =0x00000131 @MUS_NAMINORI
adds r0, r4, 0
bl sub_8056124
cmp r0, 0
beq _08086978
adds r0, r4, 0
bl Overworld_ChangeMusicTo
_08086978:
movs r0, 0
pop {r4}
pop {r1}
bx r1
.align 2, 0
_08086980: .4byte Task_FldEffUseSurf
_08086984: .4byte gTasks
_08086988: .4byte gFieldEffectArguments
_0808698C: .4byte 0x00000131 @MUS_NAMINORI
thumb_func_end FldEff_UseSurf
thumb_func_start Task_FldEffUseSurf
Task_FldEffUseSurf: @ 8086990
push {lr}
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
ldr r3, _080869B8 @ =sUseSurfEffectFuncs
ldr r2, _080869BC @ =gTasks
lsls r0, r1, 2
adds r0, r1
lsls r0, 3
adds r0, r2
movs r2, 0x8
ldrsh r1, [r0, r2]
lsls r1, 2
adds r1, r3
ldr r1, [r1]
bl _call_via_r1
pop {r0}
bx r0
.align 2, 0
_080869B8: .4byte sUseSurfEffectFuncs
_080869BC: .4byte gTasks
thumb_func_end Task_FldEffUseSurf
thumb_func_start UseSurfEffect_1
UseSurfEffect_1: @ 80869C0
push {r4-r6,lr}
mov r6, r8
push {r6}
adds r4, r0, 0
bl ScriptContext2_Enable
bl FreezeObjectEvents
ldr r5, _08086A18 @ =gPlayerAvatar
movs r0, 0x1
strb r0, [r5, 0x6]
movs r0, 0x8
bl SetPlayerAvatarStateMask
adds r6, r4, 0
adds r6, 0xA
movs r0, 0xC
adds r0, r4
mov r8, r0
adds r0, r6, 0
mov r1, r8
bl PlayerGetDestCoords
ldr r2, _08086A1C @ =gObjectEvents
ldrb r1, [r5, 0x5]
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
adds r0, r2
ldrb r0, [r0, 0x18]
lsrs r0, 4
adds r1, r6, 0
mov r2, r8
bl MoveCoords
ldrh r0, [r4, 0x8]
adds r0, 0x1
strh r0, [r4, 0x8]
pop {r3}
mov r8, r3
pop {r4-r6}
pop {r0}
bx r0
.align 2, 0
_08086A18: .4byte gPlayerAvatar
_08086A1C: .4byte gObjectEvents
thumb_func_end UseSurfEffect_1
thumb_func_start UseSurfEffect_2
UseSurfEffect_2: @ 8086A20
push {r4,r5,lr}
adds r5, r0, 0
ldr r0, _08086A64 @ =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _08086A68 @ =gObjectEvents
adds r4, r0, r1
adds r0, r4, 0
bl ObjectEventIsMovementOverridden
lsls r0, 24
cmp r0, 0
beq _08086A4A
adds r0, r4, 0
bl ObjectEventClearHeldMovementIfFinished
lsls r0, 24
cmp r0, 0
beq _08086A5C
_08086A4A:
bl sub_805CB70
adds r0, r4, 0
movs r1, 0x45
bl ObjectEventSetHeldMovement
ldrh r0, [r5, 0x8]
adds r0, 0x1
strh r0, [r5, 0x8]
_08086A5C:
pop {r4,r5}
pop {r0}
bx r0
.align 2, 0
_08086A64: .4byte gPlayerAvatar
_08086A68: .4byte gObjectEvents
thumb_func_end UseSurfEffect_2
thumb_func_start UseSurfEffect_3
UseSurfEffect_3: @ 8086A6C
push {r4,lr}
adds r4, r0, 0
ldr r0, _08086AA8 @ =gPlayerAvatar
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _08086AAC @ =gObjectEvents
adds r0, r1
bl ObjectEventCheckHeldMovementStatus
lsls r0, 24
cmp r0, 0
beq _08086AA2
ldr r2, _08086AB0 @ =gFieldEffectArguments
movs r1, 0x26
ldrsh r0, [r4, r1]
movs r1, 0x80
lsls r1, 24
orrs r0, r1
str r0, [r2]
movs r0, 0x3B
bl FieldEffectStart
ldrh r0, [r4, 0x8]
adds r0, 0x1
strh r0, [r4, 0x8]
_08086AA2:
pop {r4}
pop {r0}
bx r0
.align 2, 0
_08086AA8: .4byte gPlayerAvatar
_08086AAC: .4byte gObjectEvents
_08086AB0: .4byte gFieldEffectArguments
thumb_func_end UseSurfEffect_3
thumb_func_start UseSurfEffect_4
UseSurfEffect_4: @ 8086AB4
push {r4-r6,lr}
adds r6, r0, 0
movs r0, 0x6
bl FieldEffectActiveListContains
lsls r0, 24
cmp r0, 0
bne _08086B1E
ldr r5, _08086B24 @ =gPlayerAvatar
ldrb r0, [r5, 0x5]
lsls r4, r0, 3
adds r4, r0
lsls r4, 2
ldr r0, _08086B28 @ =gObjectEvents
adds r4, r0
movs r0, 0x2
bl GetPlayerAvatarGraphicsIdByStateId
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl ObjectEventSetGraphicsId
adds r0, r4, 0
bl ObjectEventClearHeldMovementIfFinished
ldrb r0, [r4, 0x18]
lsrs r0, 4
bl sub_80641C0
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl ObjectEventSetHeldMovement
ldr r1, _08086B2C @ =gFieldEffectArguments
movs r2, 0xA
ldrsh r0, [r6, r2]
str r0, [r1]
movs r2, 0xC
ldrsh r0, [r6, r2]
str r0, [r1, 0x4]
ldrb r0, [r5, 0x5]
str r0, [r1, 0x8]
movs r0, 0x8
bl FieldEffectStart
strb r0, [r4, 0x1A]
ldrh r0, [r6, 0x8]
adds r0, 0x1
strh r0, [r6, 0x8]
_08086B1E:
pop {r4-r6}
pop {r0}
bx r0
.align 2, 0
_08086B24: .4byte gPlayerAvatar
_08086B28: .4byte gObjectEvents
_08086B2C: .4byte gFieldEffectArguments
thumb_func_end UseSurfEffect_4
thumb_func_start UseSurfEffect_5
UseSurfEffect_5: @ 8086B30
push {r4,r5,lr}
ldr r5, _08086B9C @ =gPlayerAvatar
ldrb r1, [r5, 0x5]
lsls r0, r1, 3
adds r0, r1
lsls r0, 2
ldr r1, _08086BA0 @ =gObjectEvents
adds r4, r0, r1
adds r0, r4, 0
bl ObjectEventClearHeldMovementIfFinished
lsls r0, 24
cmp r0, 0
beq _08086B96
movs r0, 0
strb r0, [r5, 0x6]
ldrb r1, [r5]
movs r0, 0xDF
ands r0, r1
strb r0, [r5]
ldrb r0, [r4, 0x18]
lsrs r0, 4
bl GetFaceDirectionMovementAction
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl ObjectEventSetHeldMovement
ldrb r0, [r4, 0x1A]
movs r1, 0x1
bl sub_80DC44C
bl UnfreezeObjectEvents
bl ScriptContext2_Disable
movs r0, 0x9
bl FieldEffectActiveListRemove
ldr r0, _08086BA4 @ =Task_FldEffUseSurf
bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
bl DestroyTask
movs r0, 0x16
bl HelpSystem_SetSomeVariable2
_08086B96:
pop {r4,r5}
pop {r0}
bx r0
.align 2, 0
_08086B9C: .4byte gPlayerAvatar
_08086BA0: .4byte gObjectEvents
_08086BA4: .4byte Task_FldEffUseSurf
thumb_func_end UseSurfEffect_5
thumb_func_start FldEff_Unk41
FldEff_Unk41: @ 8086BA8
push {lr}