diff options
| -rwxr-xr-x | asm/field_map_obj.s | 27 | ||||
| -rwxr-xr-x | src/field_map_obj.c | 24 |
2 files changed, 24 insertions, 27 deletions
diff --git a/asm/field_map_obj.s b/asm/field_map_obj.s index 3abd53321..972dbbd50 100755 --- a/asm/field_map_obj.s +++ b/asm/field_map_obj.s @@ -5,33 +5,6 @@ .text - thumb_func_start sub_808F638 -sub_808F638: @ 808F638 - push {lr} - movs r0, 0x1 - lsls r1, 16 - cmp r1, 0 - bge _0808F644 - movs r0, 0x2 -_0808F644: - pop {r1} - bx r1 - thumb_func_end sub_808F638 - - thumb_func_start sub_808F648 -sub_808F648: @ 808F648 - push {lr} - movs r1, 0x4 - lsls r0, 16 - cmp r0, 0 - bge _0808F654 - movs r1, 0x3 -_0808F654: - adds r0, r1, 0 - pop {r1} - bx r1 - thumb_func_end sub_808F648 - thumb_func_start sub_808F65C sub_808F65C: @ 808F65C push {r4-r7,lr} diff --git a/src/field_map_obj.c b/src/field_map_obj.c index fd3cc7967..0cb73620c 100755 --- a/src/field_map_obj.c +++ b/src/field_map_obj.c @@ -1855,3 +1855,27 @@ u8 sub_808F608(s16 x1, s16 x2, s16 y1, s16 y2) } return retval; } + +u8 sub_808F638(s16 x1, s16 x2, s16 y1, s16 y2) +{ + u8 retval; + + retval = DIR_SOUTH; + if (x2 < 0) + { + retval = DIR_NORTH; + } + return retval; +} + +u8 sub_808F648(s16 x1, s16 x2, s16 y1, s16 y2) +{ + u8 retval; + + retval = DIR_EAST; + if (x1 < 0) + { + retval = DIR_WEST; + } + return retval; +} |