ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-02-21 11:43:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

sub_808F638 and sub_808F648

Browse Source
This commit is contained in:
PikalaxALT 2017-09-13 19:45:59 -04:00
parent 64ffa8f963
commit f9de01dc86
2 changed files with 24 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
asm/field_map_obj.s
View File

@ -5,33 +5,6 @@
.text .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 thumb_func_start sub_808F65C
sub_808F65C: @ 808F65C sub_808F65C: @ 808F65C
push {r4-r7,lr} push {r4-r7,lr}

24
src/field_map_obj.c
View File

@ -1855,3 +1855,27 @@ u8 sub_808F608(s16 x1, s16 x2, s16 y1, s16 y2)
} }
return retval; 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;
}