diff options
| -rwxr-xr-x | asm/field_tasks.s | 37 | ||||
| -rwxr-xr-x[-rw-r--r--] | data/field_tasks.s | 30 | ||||
| -rwxr-xr-x | src/field_tasks.c | 38 |
3 files changed, 38 insertions, 67 deletions
diff --git a/asm/field_tasks.s b/asm/field_tasks.s index 547a43668..83e0a8371 100755 --- a/asm/field_tasks.s +++ b/asm/field_tasks.s @@ -6,43 +6,6 @@ .text - thumb_func_start sub_8069CB8 -sub_8069CB8: @ 8069CB8 - push {lr} - lsls r1, 16 - lsrs r1, 16 - lsls r0, 16 - ldr r2, _08069CE8 @ =0xfffd0000 - adds r0, r2 - lsrs r0, 16 - cmp r0, 0xA - bhi _08069CF4 - lsls r0, r1, 16 - asrs r1, r0, 16 - ldr r2, _08069CEC @ =0xfffa0000 - adds r0, r2 - lsrs r0, 16 - cmp r0, 0xD - bhi _08069CF4 - ldr r0, _08069CF0 @ =gUnknown_083763E4 - lsls r1, 1 - adds r1, r0 - ldrh r0, [r1] - cmp r0, 0 - beq _08069CF4 - movs r0, 0x1 - b _08069CF6 - .align 2, 0 -_08069CE8: .4byte 0xfffd0000 -_08069CEC: .4byte 0xfffa0000 -_08069CF0: .4byte gUnknown_083763E4 -_08069CF4: - movs r0, 0 -_08069CF6: - pop {r1} - bx r1 - thumb_func_end sub_8069CB8 - thumb_func_start sub_8069CFC sub_8069CFC: @ 8069CFC push {r4,r5,lr} diff --git a/data/field_tasks.s b/data/field_tasks.s index a4b78df2e..faaa12342 100644..100755 --- a/data/field_tasks.s +++ b/data/field_tasks.s @@ -3,36 +3,6 @@ .section .rodata - - .align 1 -gUnknown_083763E4:: @ 83763E4 - .2byte 0 - .2byte 0 - .2byte 0 - .2byte 0 - .2byte 0 - .2byte 0 - .2byte 0x4001 - .2byte 0x4002 - .2byte 0x4003 - .2byte 0x4004 - .2byte 0 - .2byte 0 - .2byte 0x4005 - .2byte 0x4006 - .2byte 0x4007 - .2byte 0 - .2byte 0 - .2byte 0x4008 - .2byte 0x4009 - .2byte 0x400A - .2byte 0 - .2byte 0 - .2byte 0 - .2byte 0 - .2byte 0 - .2byte 0 - .align 1 gUnknown_08376418:: @ 8376418 .2byte 0xE8, 0xEB, 0xEA, 0xE9 diff --git a/src/field_tasks.c b/src/field_tasks.c index 5ccd3fa14..88dd025cc 100755 --- a/src/field_tasks.c +++ b/src/field_tasks.c @@ -535,3 +535,41 @@ void PerStepCallback_8069AA0(u8 taskId) break; } } + +const u16 gUnknown_083763E4[] = { + 0, + 0, + 0, + 0, + 0, + 0, + 0x4001, + 0x4002, + 0x4003, + 0x4004, + 0, + 0, + 0x4005, + 0x4006, + 0x4007, + 0, + 0, + 0x4008, + 0x4009, + 0x400A, + 0, + 0, + 0, + 0, + 0, + 0 +}; + +bool8 sub_8069CB8(s16 x, s16 y) +{ + if ((u16)(x - 3) < 11 && (u16)(y - 6) < 14 && gUnknown_083763E4[y]) + { + return TRUE; + } + return FALSE; +} |