diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2017-09-29 20:05:01 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-29 20:05:01 -0700 |
| commit | 13f16b577935635546698aca88b3d1780cbc4991 (patch) | |
| tree | 30b1690824dd0486b0e7abe84f56b17aad799b87 /src/field_map_obj.c | |
| parent | cf0bf8a1f2d3cd97e0fe967270188dda24b8fac2 (diff) | |
| parent | b3477c99c6d53c02ed38c2a0fcd02fd5c8d5278d (diff) | |
Merge pull request #431 from PikalaxALT/field_effect_helpers
Field effect helpers
Diffstat (limited to 'src/field_map_obj.c')
| -rw-r--r-- | src/field_map_obj.c | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/src/field_map_obj.c b/src/field_map_obj.c index 0e7cd7896..551964d72 100644 --- a/src/field_map_obj.c +++ b/src/field_map_obj.c @@ -1901,7 +1901,7 @@ extern void CameraObjectReset1(void); extern struct LinkPlayerMapObject gLinkPlayerMapObjects[]; extern u8 gReservedSpritePaletteCount; -extern struct Camera gUnknown_0202E844; +extern struct Camera gCamera; static u8 gUnknown_030005A4; static u16 gUnknown_030005A6; @@ -2986,24 +2986,21 @@ void UpdateFieldObjectCoordsForCameraUpdate(void) s16 deltaX; s16 deltaY; -#ifndef NONMATCHING - asm(""::"r"(i)); //makes the compiler store i in r3 -#endif - - if (gUnknown_0202E844.field_0) + if (gCamera.field_0) { - for (i = 0, deltaX = gUnknown_0202E844.x, deltaY = gUnknown_0202E844.y; i < 16; i++) + deltaX = gCamera.x; + deltaY = gCamera.y; + for (i = 0; i < 16; i++) { - struct MapObject *mapObject = &gMapObjects[i]; - if (mapObject->active) + if (gMapObjects[i].active) { - mapObject->coords1.x -= deltaX; - mapObject->coords1.y -= deltaY; - mapObject->coords2.x -= deltaX; - mapObject->coords2.y -= deltaY; - mapObject->coords3.x -= deltaX; - mapObject->coords3.y -= deltaY; + gMapObjects[i].coords1.x -= deltaX; + gMapObjects[i].coords1.y -= deltaY; + gMapObjects[i].coords2.x -= deltaX; + gMapObjects[i].coords2.y -= deltaY; + gMapObjects[i].coords3.x -= deltaX; + gMapObjects[i].coords3.y -= deltaY; } } } |