summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--asm/field_effect_helpers.s6
-rw-r--r--asm/field_tasks.s697
-rw-r--r--asm/overworld.s6
-rw-r--r--data/field_tasks.s22
-rw-r--r--data/maps/FourIsland_IcefallCave_1F/scripts.inc2
-rw-r--r--data/specials.inc2
-rw-r--r--include/bike.h1
-rw-r--r--include/field_effect_helpers.h1
-rw-r--r--include/overworld.h2
-rw-r--r--ld_script.txt4
-rw-r--r--src/field_tasks.c293
11 files changed, 307 insertions, 729 deletions
diff --git a/asm/field_effect_helpers.s b/asm/field_effect_helpers.s
index 3f2cf04d1..2797accf4 100644
--- a/asm/field_effect_helpers.s
+++ b/asm/field_effect_helpers.s
@@ -2691,8 +2691,8 @@ _080DC234: .4byte gFieldEffectObjectTemplatePointers
_080DC238: .4byte gSprites
thumb_func_end FldEff_Unknown22
- thumb_func_start ash
-ash: @ 80DC23C
+ thumb_func_start StartAshFieldEffect
+StartAshFieldEffect: @ 80DC23C
push {r4,lr}
lsls r2, 16
lsrs r2, 16
@@ -2718,7 +2718,7 @@ ash: @ 80DC23C
bx r0
.align 2, 0
_080DC26C: .4byte gFieldEffectArguments
- thumb_func_end ash
+ thumb_func_end StartAshFieldEffect
thumb_func_start oei_ash
oei_ash: @ 80DC270
diff --git a/asm/field_tasks.s b/asm/field_tasks.s
deleted file mode 100644
index b4106c021..000000000
--- a/asm/field_tasks.s
+++ /dev/null
@@ -1,697 +0,0 @@
- .include "asm/macros.inc"
- .include "constants/constants.inc"
-
- .syntax unified
-
- .text
-
- thumb_func_start task_per_step_callback_manager
-task_per_step_callback_manager: @ 806E810
- push {lr}
- lsls r0, 24
- lsrs r0, 24
- ldr r2, _0806E834 @ =gTasks
- lsls r1, r0, 2
- adds r1, r0
- lsls r1, 3
- adds r1, r2
- movs r2, 0x8
- ldrsh r1, [r1, r2]
- ldr r2, _0806E838 @ =gUnknown_83A7310
- lsls r1, 2
- adds r1, r2
- ldr r1, [r1]
- bl _call_via_r1
- pop {r0}
- bx r0
- .align 2, 0
-_0806E834: .4byte gTasks
-_0806E838: .4byte gUnknown_83A7310
- thumb_func_end task_per_step_callback_manager
-
- thumb_func_start sub_806E83C
-sub_806E83C: @ 806E83C
- push {r4,lr}
- lsls r0, 24
- lsrs r0, 24
- lsls r1, r0, 2
- adds r1, r0
- lsls r1, 3
- ldr r0, _0806E874 @ =gTasks+0x8
- adds r4, r1, r0
- bl ScriptContext2_IsEnabled
- lsls r0, 24
- cmp r0, 0
- bne _0806E86C
- ldr r0, _0806E878 @ =gUnknown_203ADFA
- ldrb r0, [r0]
- subs r0, 0x2
- lsls r0, 24
- lsrs r0, 24
- cmp r0, 0x1
- bls _0806E86C
- adds r0, r4, 0x2
- adds r1, r4, 0x4
- bl sub_8056078
-_0806E86C:
- pop {r4}
- pop {r0}
- bx r0
- .align 2, 0
-_0806E874: .4byte gTasks+0x8
-_0806E878: .4byte gUnknown_203ADFA
- thumb_func_end sub_806E83C
-
- thumb_func_start sub_806E87C
-sub_806E87C: @ 806E87C
- push {r4,r5,lr}
- ldr r5, _0806E8C4 @ =task_per_step_callback_manager
- adds r0, r5, 0
- bl FuncIsActiveTask
- lsls r0, 24
- lsrs r4, r0, 24
- cmp r4, 0
- bne _0806E8A6
- adds r0, r5, 0
- movs r1, 0x50
- bl CreateTask
- lsls r0, 24
- lsrs r0, 24
- ldr r2, _0806E8C8 @ =gTasks
- lsls r1, r0, 2
- adds r1, r0
- lsls r1, 3
- adds r1, r2
- strh r4, [r1, 0x8]
-_0806E8A6:
- ldr r4, _0806E8CC @ =sub_806E83C
- adds r0, r4, 0
- bl FuncIsActiveTask
- lsls r0, 24
- cmp r0, 0
- bne _0806E8BC
- adds r0, r4, 0
- movs r1, 0x50
- bl CreateTask
-_0806E8BC:
- pop {r4,r5}
- pop {r0}
- bx r0
- .align 2, 0
-_0806E8C4: .4byte task_per_step_callback_manager
-_0806E8C8: .4byte gTasks
-_0806E8CC: .4byte sub_806E83C
- thumb_func_end sub_806E87C
-
- thumb_func_start ActivatePerStepCallback
-ActivatePerStepCallback: @ 806E8D0
- push {r4,lr}
- lsls r0, 24
- lsrs r4, r0, 24
- ldr r0, _0806E908 @ =task_per_step_callback_manager
- bl FindTaskIdByFunc
- lsls r0, 24
- lsrs r1, r0, 24
- cmp r1, 0xFF
- beq _0806E912
- lsls r0, r1, 2
- adds r0, r1
- lsls r0, 3
- ldr r1, _0806E90C @ =gTasks+0x8
- adds r1, r0, r1
- movs r2, 0
- adds r0, r1, 0
- adds r0, 0x1E
-_0806E8F4:
- strh r2, [r0]
- subs r0, 0x2
- cmp r0, r1
- bge _0806E8F4
- cmp r4, 0x7
- bls _0806E910
- movs r0, 0
- strh r0, [r1]
- b _0806E912
- .align 2, 0
-_0806E908: .4byte task_per_step_callback_manager
-_0806E90C: .4byte gTasks+0x8
-_0806E910:
- strh r4, [r1]
-_0806E912:
- pop {r4}
- pop {r0}
- bx r0
- thumb_func_end ActivatePerStepCallback
-
- thumb_func_start wild_encounter_reset_coro_args
-wild_encounter_reset_coro_args: @ 806E918
- push {lr}
- ldr r0, _0806E948 @ =task_per_step_callback_manager
- bl FindTaskIdByFunc
- lsls r0, 24
- lsrs r1, r0, 24
- ldr r0, _0806E94C @ =sub_806E83C
- bl FindTaskIdByFunc
- lsls r0, 24
- lsrs r1, r0, 24
- cmp r1, 0xFF
- beq _0806E942
- lsls r0, r1, 2
- adds r0, r1
- lsls r0, 3
- ldr r1, _0806E950 @ =gTasks+0x8
- adds r0, r1
- movs r1, 0
- strh r1, [r0, 0x2]
- strh r1, [r0, 0x4]
-_0806E942:
- pop {r0}
- bx r0
- .align 2, 0
-_0806E948: .4byte task_per_step_callback_manager
-_0806E94C: .4byte sub_806E83C
-_0806E950: .4byte gTasks+0x8
- thumb_func_end wild_encounter_reset_coro_args
-
- thumb_func_start nullsub_40
-nullsub_40: @ 806E954
- bx lr
- thumb_func_end nullsub_40
-
- thumb_func_start sub_806E958
-sub_806E958: @ 806E958
- push {r4,r5,lr}
- movs r3, 0
- ldr r4, _0806E988 @ =gUnknown_83A7330
- lsls r0, 16
- asrs r5, r0, 16
- lsls r1, 16
- asrs r1, 16
-_0806E966:
- lsls r2, r3, 1
- adds r0, r2, r4
- ldrb r0, [r0]
- adds r0, 0x7
- cmp r0, r5
- bne _0806E98C
- adds r0, r4, 0x1
- adds r0, r2, r0
- ldrb r0, [r0]
- adds r0, 0x7
- cmp r0, r1
- bne _0806E98C
- adds r0, r3, 0x1
- bl FlagSet
- b _0806E996
- .align 2, 0
-_0806E988: .4byte gUnknown_83A7330
-_0806E98C:
- adds r0, r3, 0x1
- lsls r0, 24
- lsrs r3, r0, 24
- cmp r3, 0x8
- bls _0806E966
-_0806E996:
- pop {r4,r5}
- pop {r0}
- bx r0
- thumb_func_end sub_806E958
-
- thumb_func_start sub_806E99C
-sub_806E99C: @ 806E99C
- push {r4-r7,lr}
- movs r4, 0
- ldr r6, _0806E9D8 @ =gUnknown_83A7330
- adds r7, r6, 0x1
-_0806E9A4:
- adds r5, r4, 0x1
- adds r0, r5, 0
- bl FlagGet
- lsls r0, 24
- lsrs r0, 24
- cmp r0, 0x1
- bne _0806E9C8
- lsls r1, r4, 1
- adds r0, r1, r6
- ldrb r0, [r0]
- adds r0, 0x7
- adds r1, r7
- ldrb r1, [r1]
- adds r1, 0x7
- ldr r2, _0806E9DC @ =0x0000035a
- bl MapGridSetMetatileIdAt
-_0806E9C8:
- lsls r0, r5, 24
- lsrs r4, r0, 24
- cmp r4, 0x8
- bls _0806E9A4
- pop {r4-r7}
- pop {r0}
- bx r0
- .align 2, 0
-_0806E9D8: .4byte gUnknown_83A7330
-_0806E9DC: .4byte 0x0000035a
- thumb_func_end sub_806E99C
-
- thumb_func_start sub_806E9E0
-sub_806E9E0: @ 806E9E0
- push {r4-r6,lr}
- sub sp, 0x4
- lsls r0, 24
- lsrs r0, 24
- lsls r1, r0, 2
- adds r1, r0
- lsls r1, 3
- ldr r0, _0806EA04 @ =gTasks+0x8
- adds r5, r1, r0
- movs r1, 0x2
- ldrsh r0, [r5, r1]
- cmp r0, 0x1
- beq _0806EA2A
- cmp r0, 0x1
- bgt _0806EA08
- cmp r0, 0
- beq _0806EA12
- b _0806EB42
- .align 2, 0
-_0806EA04: .4byte gTasks+0x8
-_0806EA08:
- cmp r0, 0x2
- beq _0806EAB0
- cmp r0, 0x3
- beq _0806EAF4
- b _0806EB42
-_0806EA12:
- mov r4, sp
- adds r4, 0x2
- mov r0, sp
- adds r1, r4, 0
- bl PlayerGetDestCoords
- mov r0, sp
- ldrh r0, [r0]
- strh r0, [r5, 0x4]
- ldrh r0, [r4]
- strh r0, [r5, 0x6]
- b _0806EB3E
-_0806EA2A:
- mov r4, sp
- adds r4, 0x2
- mov r0, sp
- adds r1, r4, 0
- bl PlayerGetDestCoords
- mov r0, sp
- ldrh r2, [r0]
- movs r3, 0
- ldrsh r1, [r0, r3]
- movs r3, 0x4
- ldrsh r0, [r5, r3]
- cmp r1, r0
- bne _0806EA52
- movs r0, 0
- ldrsh r1, [r4, r0]
- movs r3, 0x6
- ldrsh r0, [r5, r3]
- cmp r1, r0
- beq _0806EB42
-_0806EA52:
- strh r2, [r5, 0x4]
- ldrh r0, [r4]
- strh r0, [r5, 0x6]
- mov r0, sp
- movs r1, 0
- ldrsh r0, [r0, r1]
- movs r2, 0
- ldrsh r1, [r4, r2]
- bl MapGridGetMetatileBehaviorAt
- lsls r0, 24
- lsrs r6, r0, 24
- adds r0, r6, 0
- bl MetatileBehavior_IsThinIce
- lsls r0, 24
- lsrs r0, 24
- cmp r0, 0x1
- bne _0806EA8E
- mov r0, sp
- movs r3, 0
- ldrsh r0, [r0, r3]
- movs r2, 0
- ldrsh r1, [r4, r2]
- bl sub_806E958
- movs r0, 0x4
- strh r0, [r5, 0xC]
- movs r0, 0x2
- b _0806EAA2
-_0806EA8E:
- adds r0, r6, 0
- bl MetatileBehavior_IsCrackedIce
- lsls r0, 24
- lsrs r0, 24
- cmp r0, 0x1
- bne _0806EB42
- movs r0, 0x4
- strh r0, [r5, 0xC]
- movs r0, 0x3
-_0806EAA2:
- strh r0, [r5, 0x2]
- mov r0, sp
- ldrh r0, [r0]
- strh r0, [r5, 0x8]
- ldrh r0, [r4]
- strh r0, [r5, 0xA]
- b _0806EB42
-_0806EAB0:
- ldrh r1, [r5, 0xC]
- movs r3, 0xC
- ldrsh r0, [r5, r3]
- cmp r0, 0
- bne _0806EAFE
- mov r1, sp
- ldrh r0, [r5, 0x8]
- strh r0, [r1]
- mov r4, sp
- adds r4, 0x2
- ldrh r0, [r5, 0xA]
- strh r0, [r4]
- movs r0, 0x24
- bl PlaySE
- mov r0, sp
- movs r1, 0
- ldrsh r0, [r0, r1]
- movs r2, 0
- ldrsh r1, [r4, r2]
- ldr r2, _0806EAF0 @ =0x0000035a
- bl MapGridSetMetatileIdAt
- mov r0, sp
- movs r3, 0
- ldrsh r0, [r0, r3]
- movs r2, 0
- ldrsh r1, [r4, r2]
- bl CurrentMapDrawMetatileAt
- b _0806EB3E
- .align 2, 0
-_0806EAF0: .4byte 0x0000035a
-_0806EAF4:
- ldrh r1, [r5, 0xC]
- movs r3, 0xC
- ldrsh r0, [r5, r3]
- cmp r0, 0
- beq _0806EB04
-_0806EAFE:
- subs r0, r1, 0x1
- strh r0, [r5, 0xC]
- b _0806EB42
-_0806EB04:
- mov r1, sp
- ldrh r0, [r5, 0x8]
- strh r0, [r1]
- mov r4, sp
- adds r4, 0x2
- ldrh r0, [r5, 0xA]
- strh r0, [r4]
- movs r0, 0x23
- bl PlaySE
- mov r0, sp
- movs r1, 0
- ldrsh r0, [r0, r1]
- movs r2, 0
- ldrsh r1, [r4, r2]
- ldr r2, _0806EB4C @ =0x0000035b
- bl MapGridSetMetatileIdAt
- mov r0, sp
- movs r3, 0
- ldrsh r0, [r0, r3]
- movs r2, 0
- ldrsh r1, [r4, r2]
- bl CurrentMapDrawMetatileAt
- ldr r0, _0806EB50 @ =0x00004001
- movs r1, 0x1
- bl VarSet
-_0806EB3E:
- movs r0, 0x1
- strh r0, [r5, 0x2]
-_0806EB42:
- add sp, 0x4
- pop {r4-r6}
- pop {r0}
- bx r0
- .align 2, 0
-_0806EB4C: .4byte 0x0000035b
-_0806EB50: .4byte 0x00004001
- thumb_func_end sub_806E9E0
-
- thumb_func_start sub_806EB54
-sub_806EB54: @ 806EB54
- push {r4,r5,lr}
- sub sp, 0x4
- lsls r0, 24
- lsrs r0, 24
- lsls r1, r0, 2
- adds r1, r0
- lsls r1, 3
- ldr r0, _0806EBD8 @ =gTasks+0x8
- adds r5, r1, r0
- mov r4, sp
- adds r4, 0x2
- mov r0, sp
- adds r1, r4, 0
- bl PlayerGetDestCoords
- mov r0, sp
- ldrh r2, [r0]
- movs r3, 0
- ldrsh r1, [r0, r3]
- movs r3, 0x2
- ldrsh r0, [r5, r3]
- cmp r1, r0
- bne _0806EB8E
- movs r0, 0
- ldrsh r1, [r4, r0]
- movs r3, 0x4
- ldrsh r0, [r5, r3]
- cmp r1, r0
- beq _0806EBF6
-_0806EB8E:
- strh r2, [r5, 0x2]
- ldrh r0, [r4]
- strh r0, [r5, 0x4]
- mov r0, sp
- movs r1, 0
- ldrsh r0, [r0, r1]
- movs r2, 0
- ldrsh r1, [r4, r2]
- bl MapGridGetMetatileBehaviorAt
- lsls r0, 24
- lsrs r0, 24
- bl MetatileBehavior_ReturnFalse_4
- lsls r0, 24
- cmp r0, 0
- beq _0806EBF6
- mov r0, sp
- movs r3, 0
- ldrsh r0, [r0, r3]
- movs r2, 0
- ldrsh r1, [r4, r2]
- bl MapGridGetMetatileIdAt
- ldr r1, _0806EBDC @ =0x0000020a
- cmp r0, r1
- bne _0806EBE4
- mov r0, sp
- movs r3, 0
- ldrsh r0, [r0, r3]
- movs r2, 0
- ldrsh r1, [r4, r2]
- ldr r2, _0806EBE0 @ =0x00000212
- movs r3, 0x4
- bl ash
- b _0806EBF6
- .align 2, 0
-_0806EBD8: .4byte gTasks+0x8
-_0806EBDC: .4byte 0x0000020a
-_0806EBE0: .4byte 0x00000212
-_0806EBE4:
- mov r0, sp
- movs r3, 0
- ldrsh r0, [r0, r3]
- movs r2, 0
- ldrsh r1, [r4, r2]
- ldr r2, _0806EC00 @ =0x00000206
- movs r3, 0x4
- bl ash
-_0806EBF6:
- add sp, 0x4
- pop {r4,r5}
- pop {r0}
- bx r0
- .align 2, 0
-_0806EC00: .4byte 0x00000206
- thumb_func_end sub_806EB54
-
- thumb_func_start sub_806EC04
-sub_806EC04: @ 806EC04
- push {r4,r5,lr}
- lsls r0, 16
- asrs r5, r0, 16
- lsls r1, 16
- asrs r4, r1, 16
- adds r0, r5, 0
- adds r1, r4, 0
- bl MapGridGetMetatileIdAt
- ldr r1, _0806EC38 @ =0x0000022f
- ldr r2, _0806EC3C @ =0x00000237
- cmp r0, r1
- bne _0806EC20
- subs r2, 0x31
-_0806EC20:
- adds r0, r5, 0
- adds r1, r4, 0
- bl MapGridSetMetatileIdAt
- adds r0, r5, 0
- adds r1, r4, 0
- bl CurrentMapDrawMetatileAt
- pop {r4,r5}
- pop {r0}
- bx r0
- .align 2, 0
-_0806EC38: .4byte 0x0000022f
-_0806EC3C: .4byte 0x00000237
- thumb_func_end sub_806EC04
-
- thumb_func_start sub_806EC40
-sub_806EC40: @ 806EC40
- push {r4-r7,lr}
- sub sp, 0x4
- lsls r0, 24
- lsrs r0, 24
- lsls r1, r0, 2
- adds r1, r0
- lsls r1, 3
- ldr r0, _0806ED10 @ =gTasks+0x8
- adds r5, r1, r0
- mov r4, sp
- adds r4, 0x2
- mov r0, sp
- adds r1, r4, 0
- bl PlayerGetDestCoords
- mov r0, sp
- movs r1, 0
- ldrsh r0, [r0, r1]
- movs r2, 0
- ldrsh r1, [r4, r2]
- bl MapGridGetMetatileBehaviorAt
- lsls r0, 16
- lsrs r7, r0, 16
- ldrh r1, [r5, 0x8]
- movs r3, 0x8
- ldrsh r0, [r5, r3]
- adds r6, r4, 0
- cmp r0, 0
- beq _0806EC92
- subs r0, r1, 0x1
- strh r0, [r5, 0x8]
- lsls r0, 16
- cmp r0, 0
- bne _0806EC92
- movs r1, 0xA
- ldrsh r0, [r5, r1]
- movs r2, 0xC
- ldrsh r1, [r5, r2]
- bl sub_806EC04
-_0806EC92:
- ldrh r1, [r5, 0xE]
- movs r3, 0xE
- ldrsh r0, [r5, r3]
- cmp r0, 0
- beq _0806ECB2
- subs r0, r1, 0x1
- strh r0, [r5, 0xE]
- lsls r0, 16
- cmp r0, 0
- bne _0806ECB2
- movs r1, 0x10
- ldrsh r0, [r5, r1]
- movs r2, 0x12
- ldrsh r1, [r5, r2]
- bl sub_806EC04
-_0806ECB2:
- mov r0, sp
- ldrh r2, [r0]
- movs r3, 0
- ldrsh r1, [r0, r3]
- movs r3, 0x4
- ldrsh r0, [r5, r3]
- cmp r1, r0
- bne _0806ECCE
- movs r0, 0
- ldrsh r1, [r6, r0]
- movs r3, 0x6
- ldrsh r0, [r5, r3]
- cmp r1, r0
- beq _0806ED2E
-_0806ECCE:
- strh r2, [r5, 0x4]
- adds r4, r6, 0
- ldrh r0, [r4]
- strh r0, [r5, 0x6]
- lsls r0, r7, 24
- lsrs r0, 24
- bl MetatileBehavior_ReturnFalse_13
- lsls r0, 24
- cmp r0, 0
- beq _0806ED2E
- bl GetPlayerSpeed
- lsls r0, 16
- asrs r0, 16
- cmp r0, 0x4
- beq _0806ECF8
- ldr r0, _0806ED14 @ =0x00004030
- movs r1, 0
- bl VarSet
-_0806ECF8:
- movs r1, 0x8
- ldrsh r0, [r5, r1]
- cmp r0, 0
- bne _0806ED18
- movs r0, 0x3
- strh r0, [r5, 0x8]
- mov r0, sp
- ldrh r0, [r0]
- strh r0, [r5, 0xA]
- ldrh r0, [r4]
- strh r0, [r5, 0xC]
- b _0806ED2E
- .align 2, 0
-_0806ED10: .4byte gTasks+0x8
-_0806ED14: .4byte 0x00004030
-_0806ED18:
- movs r2, 0xE
- ldrsh r0, [r5, r2]
- cmp r0, 0
- bne _0806ED2E
- movs r0, 0x3
- strh r0, [r5, 0xE]
- mov r0, sp
- ldrh r0, [r0]
- strh r0, [r5, 0x10]
- ldrh r0, [r6]
- strh r0, [r5, 0x12]
-_0806ED2E:
- add sp, 0x4
- pop {r4-r7}
- pop {r0}
- bx r0
- thumb_func_end sub_806EC40
-
- thumb_func_start sub_806ED38
-sub_806ED38: @ 806ED38
- push {lr}
- ldr r0, _0806ED4C @ =0x00000829
- bl FlagSet
- ldr r0, _0806ED50 @ =0x00000828
- bl FlagSet
- pop {r0}
- bx r0
- .align 2, 0
-_0806ED4C: .4byte 0x00000829
-_0806ED50: .4byte 0x00000828
- thumb_func_end sub_806ED38
-
- .align 2, 0 @ Don't pad with nop.
diff --git a/asm/overworld.s b/asm/overworld.s
index 47c5d26af..3fab3a71d 100644
--- a/asm/overworld.s
+++ b/asm/overworld.s
@@ -1737,7 +1737,7 @@ _080558D4:
bl RoamerMove
bl sub_8110920
bl DoCurrentWeather
- bl wild_encounter_reset_coro_args
+ bl ResetFieldTasksArgs
bl mapheader_run_script_with_tag_x5
bl sub_80561B4
ldr r1, _0805591C @ =gMapHeader
@@ -4648,7 +4648,7 @@ _08057056:
bl sub_807B1B8
cmp r4, 0
bne _0805706A
- bl sub_806E87C
+ bl SetUpFieldTasks
_0805706A:
bl mapheader_run_script_with_tag_x5
pop {r4}
@@ -5402,7 +5402,7 @@ _0805769C:
bl FieldEffectActiveListClear
bl sub_8079C08
bl sub_807B1B8
- bl sub_806E87C
+ bl SetUpFieldTasks
bl mapheader_run_script_with_tag_x5
b _0805772A
_080576C2:
diff --git a/data/field_tasks.s b/data/field_tasks.s
deleted file mode 100644
index 2ff9ad215..000000000
--- a/data/field_tasks.s
+++ /dev/null
@@ -1,22 +0,0 @@
- .section .rodata
- .align 2
-gUnknown_83A7310:: @ 83A7310
- .4byte nullsub_40
- .4byte sub_806EB54
- .4byte nullsub_40
- .4byte nullsub_40
- .4byte sub_806E9E0
- .4byte nullsub_40
- .4byte nullsub_40
- .4byte sub_806EC40
-
-gUnknown_83A7330:: @ 83A7330
- .byte 0x08, 0x03
- .byte 0x0a, 0x05
- .byte 0x0f, 0x05
- .byte 0x08, 0x09
- .byte 0x09, 0x09
- .byte 0x10, 0x09
- .byte 0x08, 0x0a
- .byte 0x09, 0x0a
- .byte 0x08, 0x0e
diff --git a/data/maps/FourIsland_IcefallCave_1F/scripts.inc b/data/maps/FourIsland_IcefallCave_1F/scripts.inc
index 451541b8c..1c3d8da1f 100644
--- a/data/maps/FourIsland_IcefallCave_1F/scripts.inc
+++ b/data/maps/FourIsland_IcefallCave_1F/scripts.inc
@@ -9,7 +9,7 @@ FourIsland_IcefallCave_1F_MapScript1_163D54:: @ 8163D54
end
FourIsland_IcefallCave_1F_MapScript2_163D57:: @ 8163D57
- special sub_806E99C
+ special Special_SetIcefallCaveCrackedIceMetatiles
end
FourIsland_IcefallCave_1F_MapScript3_163D5B:: @ 8163D5B
diff --git a/data/specials.inc b/data/specials.inc
index 74ba0c849..f7ca055ef 100644
--- a/data/specials.inc
+++ b/data/specials.inc
@@ -317,7 +317,7 @@ gSpecials:: @ 815FD60
def_special Special_DrawElevatorCurrentFloorWindow
def_special nullsub_75
def_special Special_CheckPartyPokerus
- def_special sub_806E99C
+ def_special Special_SetIcefallCaveCrackedIceMetatiles
def_special Special_ShakeScreen
def_special Special_StartGroudonKyogreBattle
def_special Special_StartLegendaryBattle
diff --git a/include/bike.h b/include/bike.h
index 68cc5f5c9..30049ee8c 100644
--- a/include/bike.h
+++ b/include/bike.h
@@ -4,5 +4,6 @@
void sub_80BD620(u32 unkC, u32 unk10);
bool8 sub_80BD540(void);
void StartTransitionToFlipBikeState(u8 flags);
+s16 GetPlayerSpeed(void);
#endif //GUARD_BIKE_H
diff --git a/include/field_effect_helpers.h b/include/field_effect_helpers.h
index f2a4f83a7..e1a56a26c 100644
--- a/include/field_effect_helpers.h
+++ b/include/field_effect_helpers.h
@@ -15,5 +15,6 @@
u8 sub_8154228(void);
bool8 sub_8155DA0(struct ObjectEvent *);
void sub_80DC44C(u8, u8);
+void StartAshFieldEffect(s16, s16, u16, s16);
#endif //GUARD_FIELD_EFFECT_HELPERS_H
diff --git a/include/overworld.h b/include/overworld.h
index 845550a17..97cf245e5 100644
--- a/include/overworld.h
+++ b/include/overworld.h
@@ -148,4 +148,6 @@ void sub_8055778(int);
void sub_8055738(u8 loc);
+void sub_8056078(void *, void *);
+
#endif //GUARD_OVERWORLD_H
diff --git a/ld_script.txt b/ld_script.txt
index f3e5177a8..6ba2ccd27 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -106,7 +106,7 @@ SECTIONS {
asm/field_control_avatar.o(.text);
src/event_data.o(.text);
src/coord_event_weather.o(.text);
- asm/field_tasks.o(.text);
+ src/field_tasks.o(.text);
src/start_menu.o(.text);
src/tileset_anims.o(.text);
src/palette.o(.text);
@@ -421,7 +421,7 @@ SECTIONS {
data/event_object_80688E4.o(.rodata);
src/scrcmd.o(.rodata);
src/coord_event_weather.o(.rodata);
- data/field_tasks.o(.rodata);
+ src/field_tasks.o(.rodata);
src/start_menu.o(.rodata);
src/tileset_anims.o(.rodata);
src/palette.o(.rodata);
diff --git a/src/field_tasks.c b/src/field_tasks.c
new file mode 100644
index 000000000..7ca6d0e7b
--- /dev/null
+++ b/src/field_tasks.c
@@ -0,0 +1,293 @@
+#include "global.h"
+#include "bike.h"
+#include "event_data.h"
+#include "field_camera.h"
+#include "field_effect_helpers.h"
+#include "field_player_avatar.h"
+#include "fieldmap.h"
+#include "metatile_behavior.h"
+#include "overworld.h"
+#include "quest_log.h"
+#include "script.h"
+#include "sound.h"
+#include "task.h"
+#include "constants/flags.h"
+#include "constants/songs.h"
+#include "constants/vars.h"
+
+static void DummyPerStepCallback(u8 taskId);
+static void AshGrassPerStepCallback(u8 taskId);
+static void IcefallCaveIcePerStepCallback(u8 taskId);
+static void CrackedFloorPerStepCallback(u8 taskId);
+
+static const TaskFunc sPerStepCallbacks[] =
+{
+ DummyPerStepCallback,
+ AshGrassPerStepCallback,
+ DummyPerStepCallback,
+ DummyPerStepCallback,
+ IcefallCaveIcePerStepCallback,
+ DummyPerStepCallback,
+ DummyPerStepCallback,
+ CrackedFloorPerStepCallback
+};
+
+static const u8 sIcefallCaveIceTileCoords[][2] =
+{
+ { 0x08, 0x03 },
+ { 0x0a, 0x05 },
+ { 0x0f, 0x05 },
+ { 0x08, 0x09 },
+ { 0x09, 0x09 },
+ { 0x10, 0x09 },
+ { 0x08, 0x0a },
+ { 0x09, 0x0a },
+ { 0x08, 0x0e }
+};
+
+static void Task_RunPerStepCallback(u8 taskId)
+{
+ int idx = gTasks[taskId].data[0];
+ sPerStepCallbacks[idx](taskId);
+}
+
+static void Task_RunTimeBasedEvents(u8 taskId)
+{
+ s16 *data = gTasks[taskId].data;
+
+ if (!ScriptContext2_IsEnabled())
+ {
+ if (gUnknown_203ADFA != 2 && gUnknown_203ADFA != 3)
+ {
+ sub_8056078(&data[1], &data[2]);
+ }
+ }
+}
+
+void SetUpFieldTasks(void)
+{
+ if (!FuncIsActiveTask(Task_RunPerStepCallback))
+ {
+ u8 taskId = CreateTask(Task_RunPerStepCallback, 0x50);
+ gTasks[taskId].data[0] = 0;
+ }
+
+ if (!FuncIsActiveTask(Task_RunTimeBasedEvents))
+ CreateTask(Task_RunTimeBasedEvents, 0x50);
+}
+
+void ActivatePerStepCallback(u8 callbackId)
+{
+ u8 taskId = FindTaskIdByFunc(Task_RunPerStepCallback);
+ if (taskId != 0xff)
+ {
+ s32 i;
+ s16 *data = gTasks[taskId].data;
+
+ for (i = 0; i < 16; i++)
+ data[i] = 0;
+
+ if (callbackId >= NELEMS(sPerStepCallbacks))
+ {
+ data[0] = 0;
+ }
+ else
+ {
+ data[0] = callbackId;
+ }
+ }
+}
+
+void ResetFieldTasksArgs(void)
+{
+ u8 taskId;
+ s16 *data;
+
+ taskId = FindTaskIdByFunc(Task_RunPerStepCallback);
+ if (taskId != 0xff)
+ {
+ data = gTasks[taskId].data;
+ }
+ taskId = FindTaskIdByFunc(Task_RunTimeBasedEvents);
+ if (taskId != 0xff)
+ {
+ data = gTasks[taskId].data;
+ data[1] = 0;
+ data[2] = 0;
+ }
+}
+
+static void DummyPerStepCallback(u8 taskId)
+{
+}
+
+static void MarkIcefallCaveCoordVisited(s16 x, s16 y)
+{
+ u8 i = 0;
+ for (; i < NELEMS(sIcefallCaveIceTileCoords); ++i)
+ {
+ if (sIcefallCaveIceTileCoords[i][0] + 7 == x && sIcefallCaveIceTileCoords[i][1] + 7 == y)
+ {
+ FlagSet(i + 1);
+ break;
+ }
+ }
+}
+
+void Special_SetIcefallCaveCrackedIceMetatiles(void)
+{
+ u8 i = 0;
+ for (; i < NELEMS(sIcefallCaveIceTileCoords); ++i)
+ {
+ if (FlagGet(i + 1) == TRUE)
+ {
+ int x = sIcefallCaveIceTileCoords[i][0] + 7;
+ int y = sIcefallCaveIceTileCoords[i][1] + 7;
+ MapGridSetMetatileIdAt(x, y, 0x35a);
+ }
+ }
+}
+
+static void IcefallCaveIcePerStepCallback(u8 taskId)
+{
+ s16 x, y;
+ u8 tileBehavior;
+ u16 *iceStepCount;
+ s16 *data = gTasks[taskId].data;
+ switch (data[1])
+ {
+ case 0:
+ PlayerGetDestCoords(&x, &y);
+ data[2] = x;
+ data[3] = y;
+ data[1] = 1;
+ break;
+ case 1:
+ PlayerGetDestCoords(&x, &y);
+ if (x != data[2] || y != data[3])
+ {
+ data[2] = x;
+ data[3] = y;
+ tileBehavior = MapGridGetMetatileBehaviorAt(x, y);
+ if (MetatileBehavior_IsThinIce(tileBehavior) == TRUE)
+ {
+ MarkIcefallCaveCoordVisited(x, y);
+ data[6] = 4;
+ data[1] = 2;
+ data[4] = x;
+ data[5] = y;
+ }
+ else if (MetatileBehavior_IsCrackedIce(tileBehavior) == TRUE)
+ {
+ data[6] = 4;
+ data[1] = 3;
+ data[4] = x;
+ data[5] = y;
+ }
+ }
+ break;
+ case 2:
+ if (data[6] != 0)
+ {
+ data[6]--;
+ }
+ else
+ {
+ x = data[4];
+ y = data[5];
+ PlaySE(SE_RU_BARI);
+ MapGridSetMetatileIdAt(x, y, 0x35a);
+ CurrentMapDrawMetatileAt(x, y);
+ data[1] = 1;
+ }
+ break;
+ case 3:
+ if (data[6] != 0)
+ {
+ data[6]--;
+ }
+ else
+ {
+ x = data[4];
+ y = data[5];
+ PlaySE(SE_RU_GASYAN);
+ MapGridSetMetatileIdAt(x, y, 0x35b);
+ CurrentMapDrawMetatileAt(x, y);
+ VarSet(VAR_0x4001, 1);
+ data[1] = 1;
+ }
+ break;
+ }
+}
+
+// This is leftover from pokeruby and effectively a no-op.
+static void AshGrassPerStepCallback(u8 taskId)
+{
+ s16 x, y;
+ u16 *ashGatherCount;
+ s16 *data = gTasks[taskId].data;
+ PlayerGetDestCoords(&x, &y);
+ if (x != data[1] || y != data[2])
+ {
+ data[1] = x;
+ data[2] = y;
+ if (MetatileBehavior_ReturnFalse_4((u8)MapGridGetMetatileBehaviorAt(x, y)))
+ {
+ if (MapGridGetMetatileIdAt(x, y) == 0x20a)
+ StartAshFieldEffect(x, y, 0x212, 4);
+ else
+ StartAshFieldEffect(x, y, 0x206, 4);
+ }
+ }
+}
+
+static void SetCrackedFloorHoleMetatile(s16 x, s16 y)
+{
+ MapGridSetMetatileIdAt(x, y, MapGridGetMetatileIdAt(x, y) == 0x22f ? 0x206 : 0x237);
+ CurrentMapDrawMetatileAt(x, y);
+}
+
+// This is leftover from pokeruby and effectively a no-op.
+static void CrackedFloorPerStepCallback(u8 taskId)
+{
+ s16 x, y;
+ u16 behavior;
+ s16 *data = gTasks[taskId].data;
+ PlayerGetDestCoords(&x, &y);
+ behavior = MapGridGetMetatileBehaviorAt(x, y);
+ if (data[4] != 0 && (--data[4]) == 0)
+ SetCrackedFloorHoleMetatile(data[5], data[6]);
+
+ if (data[7] != 0 && (--data[7]) == 0)
+ SetCrackedFloorHoleMetatile(data[8], data[9]);
+
+ if ((x != data[2] || y != data[3]))
+ {
+ data[2] = x;
+ data[3] = y;
+ if (MetatileBehavior_ReturnFalse_13(behavior))
+ {
+ if (GetPlayerSpeed() != 4)
+ VarSet(VAR_0x4030, 0);
+
+ if (data[4] == 0)
+ {
+ data[4] = 3;
+ data[5] = x;
+ data[6] = y;
+ }
+ else if (data[7] == 0)
+ {
+ data[7] = 3;
+ data[8] = x;
+ data[9] = y;
+ }
+ }
+ }
+}
+
+static void sub_806ED38(void)
+{
+ FlagSet(FLAG_SYS_POKEDEX_GET);
+ FlagSet(FLAG_SYS_POKEMON_GET);
+}
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-31 16:11:12 +0000