dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Address review comments

Browse Source
This commit is contained in:
PikalaxALT
2020-03-10 15:27:07 -04:00
parent 4594c5dac9
commit 9486d21b8d
2 changed files with 12 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/field_camera.s
-8
View File
@@ -1,8 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
.align 2, 0 @ Don't pad with nop.
src/field_camera.c
+12 -12
View File
@@ -93,7 +93,7 @@ void sub_805A658(s16 *a, s16 *b)
void DrawWholeMapView(void) void DrawWholeMapView(void)
{ {
DrawWholeMapViewInternal(gSaveBlock1Ptr->pos.x, gSaveBlock1Ptr->pos.y, gMapHeader.mapLayout); DrawWholeMapViewInternal(gSaveBlock1Ptr->pos.x, gSaveBlock1Ptr->pos.y, gMapHeader.mapLayout);
// sFieldCameraOffset.copyBGToVRAM = TRUE; // sFieldCameraOffset.copyBGToVRAM = TRUE;
} }
static void DrawWholeMapViewInternal(int x, int y, const struct MapLayout *mapLayout) static void DrawWholeMapViewInternal(int x, int y, const struct MapLayout *mapLayout)
@@ -207,7 +207,7 @@ void CurrentMapDrawMetatileAt(int x, int y)
if (offset >= 0) if (offset >= 0)
{ {
DrawMetatileAt(gMapHeader.mapLayout, offset, x, y); DrawMetatileAt(gMapHeader.mapLayout, offset, x, y);
// sFieldCameraOffset.copyBGToVRAM = TRUE; // sFieldCameraOffset.copyBGToVRAM = TRUE;
} }
} }
@@ -218,7 +218,7 @@ void DrawDoorMetatileAt(int x, int y, const u16 *arr)
if (offset >= 0) if (offset >= 0)
{ {
DrawMetatile(1, arr, offset); DrawMetatile(1, arr, offset);
// sFieldCameraOffset.copyBGToVRAM = TRUE; // sFieldCameraOffset.copyBGToVRAM = TRUE;
} }
} }
@@ -411,8 +411,8 @@ void CameraUpdate(void)
{ {
CameraMove(deltaX, deltaY); CameraMove(deltaX, deltaY);
UpdateObjectEventsForCameraUpdate(deltaX, deltaY); UpdateObjectEventsForCameraUpdate(deltaX, deltaY);
// RotatingGatePuzzleCameraUpdate(deltaX, deltaY); // RotatingGatePuzzleCameraUpdate(deltaX, deltaY);
// ResetBerryTreeSparkleFlags(); // ResetBerryTreeSparkleFlags();
tilemap_move_something(&sFieldCameraOffset, deltaX * 2, deltaY * 2); tilemap_move_something(&sFieldCameraOffset, deltaX * 2, deltaY * 2);
RedrawMapSlicesForCameraUpdate(&sFieldCameraOffset, deltaX * 2, deltaY * 2); RedrawMapSlicesForCameraUpdate(&sFieldCameraOffset, deltaX * 2, deltaY * 2);
} }
@@ -422,7 +422,7 @@ void CameraUpdate(void)
gTotalCameraPixelOffsetY -= movementSpeedY; gTotalCameraPixelOffsetY -= movementSpeedY;
} }
void MoveCameraAndRedrawMap(int deltaX, int deltaY) //unused void MoveCameraAndRedrawMap(int deltaX, int deltaY) // unused
{ {
CameraMove(deltaX, deltaY); CameraMove(deltaX, deltaY);
UpdateObjectEventsForCameraUpdate(deltaX, deltaY); UpdateObjectEventsForCameraUpdate(deltaX, deltaY);
@@ -487,16 +487,16 @@ void sub_805ACF0(void)
if (deltaX != 0 || deltaY != 0) if (deltaX != 0 || deltaY != 0)
{ {
CameraMove(deltaX, deltaY); CameraMove(deltaX, deltaY);
// UpdateObjectEventsForCameraUpdate(deltaX, deltaY); // UpdateObjectEventsForCameraUpdate(deltaX, deltaY);
// RotatingGatePuzzleCameraUpdate(deltaX, deltaY); // RotatingGatePuzzleCameraUpdate(deltaX, deltaY);
// ResetBerryTreeSparkleFlags(); // ResetBerryTreeSparkleFlags();
tilemap_move_something(&sFieldCameraOffset, deltaX * 2, deltaY * 2); tilemap_move_something(&sFieldCameraOffset, deltaX * 2, deltaY * 2);
RedrawMapSlicesForCameraUpdate(&sFieldCameraOffset, deltaX * 2, deltaY * 2); RedrawMapSlicesForCameraUpdate(&sFieldCameraOffset, deltaX * 2, deltaY * 2);
} }
coords8_add(&sFieldCameraOffset, movementSpeedX, movementSpeedY); coords8_add(&sFieldCameraOffset, movementSpeedX, movementSpeedY);
// gTotalCameraPixelOffsetX -= movementSpeedX; // gTotalCameraPixelOffsetX -= movementSpeedX;
// gTotalCameraPixelOffsetY -= movementSpeedY; // gTotalCameraPixelOffsetY -= movementSpeedY;
} }
void SetCameraPanningCallback(void (*a)(void)) void SetCameraPanningCallback(void (*a)(void))
@@ -522,7 +522,7 @@ void UpdateCameraPanning(void)
{ {
if (sFieldCameraPanningCallback != NULL) if (sFieldCameraPanningCallback != NULL)
sFieldCameraPanningCallback(); sFieldCameraPanningCallback();
//Update sprite offset of overworld objects // Update sprite offset of overworld objects
gSpriteCoordOffsetX = gTotalCameraPixelOffsetX - sHorizontalCameraPan; gSpriteCoordOffsetX = gTotalCameraPixelOffsetX - sHorizontalCameraPan;
gSpriteCoordOffsetY = gTotalCameraPixelOffsetY - sVerticalCameraPan - 8; gSpriteCoordOffsetY = gTotalCameraPixelOffsetY - sVerticalCameraPan - 8;
} }