start with some grass animation stuff

data/overworld/oe_effect_table.s

@@ -0,0 +1,77 @@
+.align 2
+.thumb
+.text
+
+.global oe_effect_table
+oe_effect_table:
+
+.word 0x081D97C4 @0x00
+.word 0x081D97CA @0x01
+.word 0x081D97D0 @0x02
+.word 0x081D97D6 @0x03
+.word 0x081D97DC @0x04 grass animation
+.word 0x081D97E6 @0x05
+.word 0x081D97F0 @0x06
+.word 0x081D97F6 @0x07
+.word 0x081D9800 @0x08
+.word 0x081D9806 @0x09
+.word 0x081D980C @0x0A
+.word 0x081D9816 @0x0B
+.word 0x081D9817 @0x0C
+.word 0x081D9821 @0x0D
+.word 0x081D982B @0x0E
+.word 0x081D9835 @0x0F
+.word 0x081D983F @0x10
+.word 0x081D9849 @0x11
+.word 0x081D9853 @0x12
+.word 0x081D985D @0x13
+.word 0x081D9867 @0x14
+.word 0x081D9871 @0x15
+.word 0x081D987B @0x16
+.word 0x081D9885 @0x17
+.word 0x081D988B @0x18
+.word 0x081D9895 @0x19
+.word 0x081D98A4 @0x1A
+.word 0x081D98A5 @0x1B
+.word 0x081D98A6 @0x1C
+.word 0x081D98AC @0x1D
+.word 0x081D98B2 @0x1E
+.word 0x081D98B8 @0x1F
+.word 0x081D98BE @0x20
+.word 0x081D98C4 @0x21
+.word 0x081D98CA @0x22
+.word 0x081D98D4 @0x23
+.word 0x081D98DE @0x24
+.word 0x081D98E4 @0x25
+.word 0x081D98F0 @0x26
+.word 0x081D98F6 @0x27
+.word 0x081D98EA @0x28
+.word 0x081D9900 @0x29
+.word 0x081D990A @0x2A
+.word 0x081D9914 @0x2B
+.word 0x081D991A @0x2C
+.word 0x081D9920 @0x2D
+.word 0x081D992B @0x2E
+.word 0x081D9931 @0x2F
+.word 0x081D9932 @0x30
+.word 0x081D9933 @0x31
+.word 0x081D993D @0x32
+.word 0x081D9947 @0x33
+.word 0x081D994D @0x34
+.word 0x081D994E @0x35
+.word 0x081D9958 @0x36
+.word 0x081D9962 @0x37
+.word 0x081D9963 @0x38
+.word 0x081D9964 @0x39
+.word 0x081D9965 @0x3A
+.word 0x081D996F @0x3B
+.word 0x081D9975 @0x3C
+.word 0x081D9976 @0x3D
+.word 0x081D9977 @0x3E
+.word 0x081D9986 @0x3F
+.word 0x081D998C @0x40
+.word 0x081D9992 @0x41
+.word 0x081D9998 @0x42
+.word 0x081D999E @0x43
+.word 0x081D99A4 @0x44
+.word 0x081D99AA @0x45

g3headers

@@ -1 +1 @@
-Subproject commit 99262700aa37a47c4ccc7b110dcc5bb716bc1e61
+Subproject commit acea6cc201acf0d81a5fd8367f6af9a136e0eab4

patches/overworlds/overworld.asm

@@ -99,4 +99,7 @@ strb r0, [r4, #0x1A]
 .org 0x080683C8
     ldr r3, =grass_step_elastic+1
     bx r3
-    .pool
+    .pool
+
+.org 0x08083484
+    .word oe_effect_table

sots-private

@@ -1 +1 @@
-Subproject commit d208915b0707c7710bc28ec3b0bea5cfccb86917
+Subproject commit 6f9ef909f235f4f3b14b8269f37153ce5f1f2709

src/overworld/grass_animation.c

@@ -1,35 +1,30 @@
-#include <oe_animation.h>
-#include <npc.h>
-#include <save_one.h>
-#include <agb_debug.h>
+#include <pokeagb/pokeagb.h>
 
-extern u16 current_map_block_role_get(u16 x, u16 y);
-void sp_check_tileset(void);
-
-void grass_step_general(struct npc_state *npc)
+void grass_step_general(struct NpcState *npc)
 {
-    current_oe_state.to_x___local_id = npc->to.x;
-    current_oe_state.to_y___local_mapnumber = npc->to.y;
-    current_oe_state.height_lsr_4___local_mapbank = (npc->height) >> 4;
-    current_oe_state.field_C = 2;
-    current_oe_state.local_id_and_mapnumber = (npc->local_id << 8) | (npc->local_mapnumber);
-    current_oe_state.local_mapbank = npc->local_mapbank;
-    current_oe_state.sav1_location = (((sav_one->location.map) << 8) | sav_one->location.bank);
-    current_oe_state.field_1C = 1;
+    oe_state.effect_pos.x = npc->to.x;
+    oe_state.effect_pos.y = npc->to.y;
+    oe_state.priority = (npc->height) >> 4;
+    oe_state.field_c = 2;
+    oe_state.local_id_and_mapnumber = (npc->local_id << 8) | (npc->local_map_number);
+    oe_state.local_mapbank = npc->local_map_bank;
+    oe_state.sav1_location = (((saveblock1->location.map) << 8) | saveblock1->location.bank);
+    oe_state.field_1c = 1;
     (void)oe_exec(4);
 }
 
-void grass_step_elastic(struct npc_state *npc)
+void grass_step_elastic(struct NpcState *npc)
 {
-    current_oe_state.to_x___local_id = npc->to.x;
-    current_oe_state.to_y___local_mapnumber = npc->to.y;
-    current_oe_state.height_lsr_4___local_mapbank = (npc->height) >> 4;
-    current_oe_state.field_C = 2;
-    current_oe_state.local_id_and_mapnumber = (npc->local_id << 8) | (npc->local_mapnumber);
-    current_oe_state.local_mapbank = npc->local_mapbank;
-    current_oe_state.sav1_location = (((sav_one->location.map) << 8) | sav_one->location.bank);
-    current_oe_state.field_1C = 0;
+    oe_state.effect_pos.x = npc->to.x;
+    oe_state.effect_pos.y = npc->to.y;
+    oe_state.priority = (npc->height) >> 4;
+    oe_state.field_c = 2;
+    oe_state.local_id_and_mapnumber = (npc->local_id << 8) | (npc->local_map_number);
+    oe_state.local_mapbank = npc->local_map_bank;
+    oe_state.sav1_location = (((saveblock1->location.map) << 8) | saveblock1->location.bank);
+    oe_state.field_1c = 0;
 
     /* use variable to determine the oe animation to play */
     (void)oe_exec(4);
-}
+}
+