Merge pull request #482 from camthesaxman/fldeff_data

convert fldeff data to C

1 files changed, 49 insertions, 4 deletions

diff --git a/src/field/fldeff_cut.c b/src/field/fldeff_cut.c
index edf38d800..e4328acfc 100644
--- a/src/field/fldeff_cut.c
+++ b/src/field/fldeff_cut.c
@@ -2,6 +2,7 @@
 #include "fldeff_cut.h"
 #include "field_camera.h"
 #include "field_effect.h"
+#include "field_map_obj.h"
 #include "field_player_avatar.h"
 #include "fieldmap.h"
 #include "map_obj_lock.h"
@@ -20,12 +21,56 @@
 
 extern void (*gFieldCallback)(void);
 extern void (*gUnknown_03005CE4)(void);
+extern u8 gLastFieldPokeMenuOpened;
 
-extern struct SpriteTemplate gSpriteTemplate_CutGrass;
+extern const u8 S_UseCut[];
 
-extern u8 gLastFieldPokeMenuOpened;
+const struct OamData gOamData_CutGrass =
+{
+    .y = 0,
+    .affineMode = 0,
+    .objMode = 0,
+    .mosaic = 0,
+    .bpp = 0,
+    .shape = 0,
+    .x = 0,
+    .matrixNum = 0,
+    .size = 0,
+    .tileNum = 1,
+    .priority = 1,
+    .paletteNum = 1,
+    .affineParam = 0,
+};
 
-extern u8 S_UseCut[];
+const union AnimCmd gSpriteAnim_CutGrass[] =
+{
+    ANIMCMD_FRAME(0, 30),
+    ANIMCMD_JUMP(0),
+};
+
+const union AnimCmd *const gSpriteAnimTable_CutGrass[] =
+{
+    gSpriteAnim_CutGrass,
+};
+
+const struct SpriteFrameImage gSpriteImageTable_CutGrass[] =
+{
+    {gFieldEffectPic_CutGrass, 0x20},
+};
+
+const struct SpritePalette gFieldEffectObjectPaletteInfo6 = {gFieldEffectObjectPalette6, 0x1000};
+
+static void sub_80A2A48(struct Sprite *);
+static const struct SpriteTemplate gSpriteTemplate_CutGrass =
+{
+    .tileTag = 0xFFFF,
+    .paletteTag = 0x1000,
+    .oam = &gOamData_CutGrass,
+    .anims = gSpriteAnimTable_CutGrass,
+    .images = gSpriteImageTable_CutGrass,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = sub_80A2A48,
+};
 
 bool8 SetUpFieldMove_Cut(void)
 {
@@ -238,7 +283,7 @@ void sub_80A28F4(s16 x, s16 y)
     }
 }
 
-void sub_80A2A48(struct Sprite *sprite)
+static void sub_80A2A48(struct Sprite *sprite)
 {
     sprite->data[0] = 8;
     sprite->data[1] = 0;