Merge branch 'master' into fldeff

1 files changed, 2 insertions, 2 deletions

diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h
index 1f14880f0..5ed9b250a 100644
--- a/include/global.fieldmap.h
+++ b/include/global.fieldmap.h
@@ -294,10 +294,10 @@ struct PlayerAvatar
     /*0x09*/ u8 newDirBackup; // during bike movement, the new direction as opposed to player's direction is backed up here.
     /*0x0A*/ u8 bikeFrameCounter; // on the mach bike, when this value is 1, the bike is moving but not accelerating yet for 1 tile. on the acro bike, this acts as a timer for acro bike.
     /*0x0B*/ u8 bikeSpeed;
-	// acro bike only
+    // acro bike only
     /*0x0C*/ u32 directionHistory; // up/down/left/right history is stored in each nybble, but using the field directions and not the io inputs.
     /*0x10*/ u32 abStartSelectHistory; // same as above but for A + B + start + select only
-	// these two are timer history arrays which [0] is the active timer for acro bike. every element is backed up to the next element upon update.
+    // these two are timer history arrays which [0] is the active timer for acro bike. every element is backed up to the next element upon update.
     /*0x14*/ u8 dirTimerHistory[8];
     /*0x1C*/ u8 abStartSelectTimerHistory[8];
 };