diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2017-06-26 22:32:18 -0400 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-06-26 22:32:18 -0400 |
commit | 2c4dc3b5be3b45a50387b1b0677d8f4b64391575 (patch) | |
tree | 26d83bebd80189c0cb13ac03684b58ecf469f45f | |
parent | 57a6a5e6564aec89ab45f2d4c3b911f59f7db210 (diff) |
sub_806A040
-rwxr-xr-x | asm/field_tasks.s | 30 | ||||
-rwxr-xr-x | src/field_tasks.c | 6 |
2 files changed, 6 insertions, 30 deletions
diff --git a/asm/field_tasks.s b/asm/field_tasks.s index a1541d822..188b67c64 100755 --- a/asm/field_tasks.s +++ b/asm/field_tasks.s @@ -6,36 +6,6 @@ .text - thumb_func_start sub_806A040 -sub_806A040: @ 806A040 - 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, _0806A074 @ =0x0000022f - ldr r2, _0806A078 @ =0x00000237 - cmp r0, r1 - bne _0806A05C - subs r2, 0x31 -_0806A05C: - 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 -_0806A074: .4byte 0x0000022f -_0806A078: .4byte 0x00000237 - thumb_func_end sub_806A040 - thumb_func_start PerStepCallback_806A07C PerStepCallback_806A07C: @ 806A07C push {r4-r7,lr} diff --git a/src/field_tasks.c b/src/field_tasks.c index ea70cf227..021f2c070 100755 --- a/src/field_tasks.c +++ b/src/field_tasks.c @@ -724,3 +724,9 @@ void PerStepCallback_8069F64(u8 taskId) } } } + +void sub_806A040(s16 x, s16 y) +{ + MapGridSetMetatileIdAt(x, y, MapGridGetMetatileIdAt(x, y) == 0x22f ? 0x206 : 0x237); + CurrentMapDrawMetatileAt(x, y); +} |