ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-03-06 07:27:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

UpdateFieldObjectsForCameraUpdate

Browse Source
This commit is contained in:
scnorton 2017-09-10 15:56:03 -04:00
parent d8e2238086
commit 5a5ea8c740
2 changed files with 7 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
asm/field_map_obj.s
View File

@ -5,30 +5,6 @@
.text .text
thumb_func_start UpdateFieldObjectsForCameraUpdate
@ void UpdateFieldObjectsForCameraUpdate(u16 movingCameraOffsetX, u16 movingCameraOffsetY)
UpdateFieldObjectsForCameraUpdate: @ 808ED08
push {r4,r5,lr}
adds r4, r0, 0
adds r5, r1, 0
lsls r4, 16
lsrs r4, 16
lsls r5, 16
lsrs r5, 16
bl UpdateFieldObjectCoordsForCameraUpdate
lsls r4, 16
asrs r4, 16
lsls r5, 16
asrs r5, 16
adds r0, r4, 0
adds r1, r5, 0
bl SpawnFieldObjectsInView
bl RemoveFieldObjectsOutsideView
pop {r4,r5}
pop {r0}
bx r0
thumb_func_end UpdateFieldObjectsForCameraUpdate
thumb_func_start AddCameraObject thumb_func_start AddCameraObject
@ u8 AddCameraObject(u8 followedObjectId) @ u8 AddCameraObject(u8 followedObjectId)
AddCameraObject: @ 808ED34 AddCameraObject: @ 808ED34

7
src/field_map_obj.c
View File

@ -1329,3 +1329,10 @@ static bool8 FieldObjectDoesZCoordMatch(struct MapObject *mapObject, u8 z)
} }
return TRUE; return TRUE;
} }
void UpdateFieldObjectsForCameraUpdate(s16 x, s16 y)
{
UpdateFieldObjectCoordsForCameraUpdate();
SpawnFieldObjectsInView(x, y);
RemoveFieldObjectsOutsideView();
}