fix merge conflicts

2019-12-04 18:58:55 -07:00
parent 6581fdb69d aa272d1e51
commit bc36d1cb2a
2 changed files with 1 additions and 2 deletions
@@ -210,7 +210,7 @@ struct Sprite
    /*0x2D*/ u8 animLoopCounter;

    // general purpose data fields
-    /*0x2E*/ s16 data[8];	//2e, 30, 32, 34, 36, 38, 3a, 3c
+    /*0x2E*/ s16 data[8];

    /*0x3E*/ u16 inUse:1;               //1
             u16 coordOffsetEnabled:1;  //2