atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Running-past facing direction callbacks (North/East restricted)

Browse source
This commit is contained in:
PikalaxALT 2017-09-13 19:54:43 -04:00
parent f9de01dc86
commit a04666e2d3
2 changed files with 63 additions and 89 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

84
asm/field_map_obj.s
View file

@ -5,56 +5,6 @@
.text
thumb_func_start sub_808F65C
sub_808F65C: @ 808F65C
push {r4-r7,lr}
lsls r0, 16
asrs r4, r0, 16
lsls r1, 16
asrs r5, r1, 16
lsls r2, 16
asrs r6, r2, 16
lsls r3, 16
asrs r7, r3, 16
adds r0, r4, 0
adds r1, r5, 0
adds r2, r6, 0
adds r3, r7, 0
bl sub_808F608
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
bne _0808F698
adds r0, r4, 0
adds r1, r5, 0
adds r2, r6, 0
adds r3, r7, 0
bl sub_808F648
lsls r0, 24
lsrs r0, 24
cmp r0, 0x4
bne _0808F6B2
b _0808F6B0
_0808F698:
cmp r0, 0x4
bne _0808F6B2
adds r0, r4, 0
adds r1, r5, 0
adds r2, r6, 0
adds r3, r7, 0
bl sub_808F638
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
bne _0808F6B2
_0808F6B0:
movs r0, 0x2
_0808F6B2:
pop {r4-r7}
pop {r1}
bx r1
thumb_func_end sub_808F65C
thumb_func_start sub_808F6B8
sub_808F6B8: @ 808F6B8
push {r4-r7,lr}
@ -70,7 +20,7 @@ sub_808F6B8: @ 808F6B8
adds r1, r5, 0
adds r2, r6, 0
adds r3, r7, 0
bl sub_808F608
bl GetRegularRunningPastFacingDirection
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@ -79,7 +29,7 @@ sub_808F6B8: @ 808F6B8
adds r1, r5, 0
adds r2, r6, 0
adds r3, r7, 0
bl sub_808F648
bl GetEastWestRunningPastFacingDirection
lsls r0, 24
lsrs r0, 24
cmp r0, 0x3
@ -92,7 +42,7 @@ _0808F6F4:
adds r1, r5, 0
adds r2, r6, 0
adds r3, r7, 0
bl sub_808F638
bl GetNorthSouthRunningPastFacingDirection
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@ -120,7 +70,7 @@ sub_808F714: @ 808F714
adds r1, r5, 0
adds r2, r6, 0
adds r3, r7, 0
bl sub_808F608
bl GetRegularRunningPastFacingDirection
lsls r0, 24
lsrs r0, 24
cmp r0, 0x2
@ -129,7 +79,7 @@ sub_808F714: @ 808F714
adds r1, r5, 0
adds r2, r6, 0
adds r3, r7, 0
bl sub_808F648
bl GetEastWestRunningPastFacingDirection
lsls r0, 24
lsrs r0, 24
cmp r0, 0x4
@ -142,7 +92,7 @@ _0808F750:
adds r1, r5, 0
adds r2, r6, 0
adds r3, r7, 0
bl sub_808F638
bl GetNorthSouthRunningPastFacingDirection
lsls r0, 24
lsrs r0, 24
cmp r0, 0x2
@ -170,7 +120,7 @@ sub_808F770: @ 808F770
adds r1, r5, 0
adds r2, r6, 0
adds r3, r7, 0
bl sub_808F608
bl GetRegularRunningPastFacingDirection
lsls r0, 24
lsrs r0, 24
cmp r0, 0x2
@ -179,7 +129,7 @@ sub_808F770: @ 808F770
adds r1, r5, 0
adds r2, r6, 0
adds r3, r7, 0
bl sub_808F648
bl GetEastWestRunningPastFacingDirection
lsls r0, 24
lsrs r0, 24
cmp r0, 0x3
@ -192,7 +142,7 @@ _0808F7AC:
adds r1, r5, 0
adds r2, r6, 0
adds r3, r7, 0
bl sub_808F638
bl GetNorthSouthRunningPastFacingDirection
lsls r0, 24
lsrs r0, 24
cmp r0, 0x2
@ -220,7 +170,7 @@ sub_808F7CC: @ 808F7CC
adds r1, r6, 0
adds r2, r5, 0
adds r3, r4, 0
bl sub_808F608
bl GetRegularRunningPastFacingDirection
lsls r0, 24
lsrs r0, 24
cmp r0, 0x4
@ -229,7 +179,7 @@ sub_808F7CC: @ 808F7CC
adds r1, r6, 0
adds r2, r5, 0
adds r3, r4, 0
bl sub_808F638
bl GetNorthSouthRunningPastFacingDirection
lsls r0, 24
lsrs r0, 24
_0808F802:
@ -253,7 +203,7 @@ sub_808F808: @ 808F808
adds r1, r6, 0
adds r2, r5, 0
adds r3, r4, 0
bl sub_808F608
bl GetRegularRunningPastFacingDirection
lsls r0, 24
lsrs r0, 24
cmp r0, 0x3
@ -262,7 +212,7 @@ sub_808F808: @ 808F808
adds r1, r6, 0
adds r2, r5, 0
adds r3, r4, 0
bl sub_808F638
bl GetNorthSouthRunningPastFacingDirection
lsls r0, 24
lsrs r0, 24
_0808F83E:
@ -286,7 +236,7 @@ sub_808F844: @ 808F844
adds r1, r6, 0
adds r2, r5, 0
adds r3, r4, 0
bl sub_808F608
bl GetRegularRunningPastFacingDirection
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@ -295,7 +245,7 @@ sub_808F844: @ 808F844
adds r1, r6, 0
adds r2, r5, 0
adds r3, r4, 0
bl sub_808F648
bl GetEastWestRunningPastFacingDirection
lsls r0, 24
lsrs r0, 24
_0808F87A:
@ -319,7 +269,7 @@ sub_808F880: @ 808F880
adds r1, r6, 0
adds r2, r5, 0
adds r3, r4, 0
bl sub_808F608
bl GetRegularRunningPastFacingDirection
lsls r0, 24
lsrs r0, 24
cmp r0, 0x2
@ -328,7 +278,7 @@ sub_808F880: @ 808F880
adds r1, r6, 0
adds r2, r5, 0
adds r3, r4, 0
bl sub_808F648
bl GetEastWestRunningPastFacingDirection
lsls r0, 24
lsrs r0, 24
_0808F8B6:

68
src/field_map_obj.c
View file

@ -1833,49 +1833,73 @@ bool8 FieldObjectIsTrainerAndCloseToPlayer(struct MapObject *mapObject)
return TRUE;
}
u8 sub_808F608(s16 x1, s16 x2, s16 y1, s16 y2)
u8 GetRegularRunningPastFacingDirection(s16 dx1, s16 dy1, s16 dx2, s16 dy2)
{
u8 retval;
u8 direction;
if (y1 > y2)
if (dx2 > dy2)
{
retval = DIR_EAST;
if (x1 < 0)
direction = DIR_EAST;
if (dx1 < 0)
{
retval = DIR_WEST;
direction = DIR_WEST;
}
}
else
{
retval = DIR_SOUTH;
if (x2 < 0)
direction = DIR_SOUTH;
if (dy1 < 0)
{
retval = DIR_NORTH;
direction = DIR_NORTH;
}
}
return retval;
return direction;
}
u8 sub_808F638(s16 x1, s16 x2, s16 y1, s16 y2)
u8 GetNorthSouthRunningPastFacingDirection(s16 dx1, s16 dy1, s16 dx2, s16 dy2)
{
u8 retval;
u8 direction;
retval = DIR_SOUTH;
if (x2 < 0)
direction = DIR_SOUTH;
if (dy1 < 0)
{
retval = DIR_NORTH;
direction = DIR_NORTH;
}
return retval;
return direction;
}
u8 sub_808F648(s16 x1, s16 x2, s16 y1, s16 y2)
u8 GetEastWestRunningPastFacingDirection(s16 dx1, s16 dy1, s16 dx2, s16 dy2)
{
u8 retval;
u8 direction;
retval = DIR_EAST;
if (x1 < 0)
direction = DIR_EAST;
if (dx1 < 0)
{
retval = DIR_WEST;
direction = DIR_WEST;
}
return retval;
return direction;
}
u8 GetNorthEastRunningPastFacingDirection(s16 dx1, s16 dy1, s16 dx2, s16 dy2)
{
u8 direction;
direction = GetRegularRunningPastFacingDirection(dx1, dy1, dx2, dy2);
if (direction == DIR_SOUTH)
{
direction = GetEastWestRunningPastFacingDirection(dx1, dy1, dx2, dy2);
if (direction == DIR_EAST)
{
direction = DIR_NORTH;
}
}
else if (direction == DIR_EAST)
{
direction = GetNorthSouthRunningPastFacingDirection(dx1, dy1, dx2, dy2);
if (direction == DIR_SOUTH)
{
direction = DIR_NORTH;
}
}
return direction;
}