ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-18 01:14:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

callers of callers of sub_80940C4

Browse Source
This commit is contained in:
PikalaxALT 2017-09-17 09:52:17 -04:00
parent 9dc7839dd8
commit 99e0fe1f24
2 changed files with 18 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
asm/field_map_obj.s
View File

@ -5,40 +5,6 @@
.text
thumb_func_start sub_80941B0
sub_80941B0: @ 80941B0
push {lr}
bl sub_8094188
lsls r0, 24
lsrs r0, 24
cmp r0, 0xFF
beq _080941C2
movs r0, 0
b _080941C4
_080941C2:
movs r0, 0x1
_080941C4:
pop {r1}
bx r1
thumb_func_end sub_80941B0
thumb_func_start sub_80941C8
sub_80941C8: @ 80941C8
push {lr}
bl sub_809419C
lsls r0, 24
lsrs r0, 24
cmp r0, 0xFF
beq _080941DA
movs r0, 0
b _080941DC
_080941DA:
movs r0, 0x1
_080941DC:
pop {r1}
bx r1
thumb_func_end sub_80941C8
thumb_func_start sub_80941E0
sub_80941E0: @ 80941E0
push {r4,r5,lr}

18
src/field_map_obj.c
View File

@ -4326,3 +4326,21 @@ u8 sub_809419C(struct MapObject *mapObject, struct Sprite *sprite)
{
return sub_80940C4(mapObject, sprite, sub_80978E4);
}
bool8 sub_80941B0(struct MapObject *mapObject, struct Sprite *sprite)
{
if (sub_8094188(mapObject, sprite) == 0xFF)
{
return TRUE;
}
return FALSE;
}
bool8 sub_80941C8(struct MapObject *mapObject, struct Sprite *sprite)
{
if (sub_809419C(mapObject, sprite) == 0xFF)
{
return TRUE;
}
return FALSE;
}