oe_images grass animation

data/overworld/oe_effect_table.s

@@ -9,7 +9,7 @@ oe_effect_table:
 .word 0x081D97CA @0x01
 .word 0x081D97D0 @0x02
 .word 0x081D97D6 @0x03
-.word 0x081D97DC @0x04 grass animation
+.word oea_grass @0x04 grass animation
 .word 0x081D97E6 @0x05
 .word 0x081D97F0 @0x06
 .word 0x081D97F6 @0x07
@@ -75,3 +75,15 @@ oe_effect_table:
 .word 0x081D999E @0x43
 .word 0x081D99A4 @0x44
 .word 0x081D99AA @0x45
+
+oea_grass:
+.byte 7
+.word oe_pal_grass_normal
+.word oei_grass_normal+1
+.byte 4
+
+.align 2
+
+oe_pal_grass_normal:
+.word oea_grass_normalPal
+.hword 0x1005

g3headers

@@ -1 +1 @@
-Subproject commit acea6cc201acf0d81a5fd8367f6af9a136e0eab4
+Subproject commit e4bae938451a8cf98b0175876872107ada2d7842

makefile

@@ -1,7 +1,7 @@
 AS      := @arm-none-eabi-as
 LD      := @arm-none-eabi-ld
 OBJCOPY := @arm-none-eabi-objcopy
-GRIT    := @grit
+GRIT    := grit
 CC      := @arm-none-eabi-gcc
 ARS     := @armips
 MAKE    := make

sots-private

@@ -1 +1 @@
-Subproject commit 4824651293b7e65aab39bff4896bea38ada05a84
+Subproject commit 9717c500152f71b9888b0a7da8b973592680c0ca

src/overworld/grass_animation.c

@@ -1,7 +1,21 @@
+#include <oe_images/oea_grass_normal.h>
 #include <pokeagb/pokeagb.h>
 
-void grass_step_general(struct NpcState *npc)
-{
+struct SpriteTiles sprite_tiles_grass_normal[5] = {{.data = oea_grass_normalTiles + (0x80/4) * 0, .tag = 0, .size = 0x80},
+                                                   {.data = oea_grass_normalTiles + (0x80/4) * 1, .tag = 0, .size = 0x80},
+                                                   {.data = oea_grass_normalTiles + (0x80/4) * 2, .tag = 0, .size = 0x80},
+                                                   {.data = oea_grass_normalTiles + (0x80/4) * 3, .tag = 0, .size = 0x80},
+                                                   {.data = oea_grass_normalTiles + (0x80/4) * 4, .tag = 0, .size = 0x80}};
+
+struct Template grass_template_normal = {.tiles_tag = 0xFFFF,
+                                         .pal_tag = 0x1005,
+                                         .oam = &oam_data_grass,
+                                         .animation = &anim_image_grass,
+                                         .graphics = sprite_tiles_grass_normal,
+                                         .rotscale = &rotscale_empty,
+                                         .callback = oac_grass};
+
+void grass_step_general(struct NpcState *npc) {
     oe_state.effect_pos.x = npc->to.x;
     oe_state.effect_pos.y = npc->to.y;
     oe_state.priority = (npc->height) >> 4;
@@ -13,8 +27,7 @@ void grass_step_general(struct NpcState *npc)
     (void)oe_exec(4);
 }
 
-void grass_step_elastic(struct NpcState *npc)
-{
+void grass_step_elastic(struct NpcState *npc) {
     oe_state.effect_pos.x = npc->to.x;
     oe_state.effect_pos.y = npc->to.y;
     oe_state.priority = (npc->height) >> 4;
@@ -28,3 +41,22 @@ void grass_step_elastic(struct NpcState *npc)
     (void)oe_exec(4);
 }
 
+void oei_grass_normal(void) {
+    s16 x = (s16)oe_state.effect_pos.x;
+    s16 y = (s16)oe_state.effect_pos.y;
+    oe_adjust_coordinates(&x, &y, 8, 8);
+    u8 objid = template_instanciate_reverse_search(&grass_template_normal, x, y, 0);
+    if (objid != 64) {
+        struct Object *obj = &objects[objid];
+        obj->bitfield2 |= 2;
+        obj->final_oam.priority = oe_state.field_c & 3;
+        obj->priv[0] = oe_state.priority;
+        obj->priv[1] = oe_state.effect_pos.x;
+        obj->priv[2] = oe_state.effect_pos.y;
+        obj->priv[3] = oe_state.local_id_and_mapnumber;
+        obj->priv[4] = oe_state.local_mapbank;
+        obj->priv[5] = oe_state.sav1_location;
+        if (oe_state.field_1c)
+            obj_anim_image_seek(obj, 4);
+    }
+}