Merge pull request #310 from GriffinRichards/move-evobjmv

Move event_object_movement data to src
2020-03-26 14:20:33 -04:00
parent 4f65d54095 73503e3e4d
commit 7a6d4525c4
207 changed files with 10673 additions and 9898 deletions
@@ -1990,7 +1990,7 @@ sub_805C20C: @ 805C20C
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
-	bl GetWalkSlowMovementAction
+	bl GetFaceDirectionFastMovementAction
 	lsls r0, 24
 	lsrs r0, 24
 	movs r1, 0x1
@@ -69,7 +69,7 @@ gUnknown_835B874:: @ 835B874
 	.byte OBJ_EVENT_GFX_RED_SURF,      OBJ_EVENT_GFX_GREEN_SURF
 	.byte OBJ_EVENT_GFX_RED_ITEM,      OBJ_EVENT_GFX_GREEN_ITEM
 	.byte OBJ_EVENT_GFX_RED_FISH,      OBJ_EVENT_GFX_GREEN_FISH
-	.byte OBJ_EVENT_GFX_RED_ITEM_COPY, OBJ_EVENT_GFX_GREEN_ITEM_COPY
+	.byte OBJ_EVENT_GFX_RED_VS_SEEKER, OBJ_EVENT_GFX_GREEN_VS_SEEKER
 gUnknown_835B880:: @ 835B880
 	.byte OBJ_EVENT_GFX_RS_BRENDAN
@@ -86,8 +86,8 @@ gUnknown_835B882:: @ 835B882
 	.byte OBJ_EVENT_GFX_GREEN_SURF, 0x08
 gUnknown_835B88E:: @ 835B88E
-	.byte OBJ_EVENT_GFX_RED_VS_SEEKER
+	.byte OBJ_EVENT_GFX_RED_VS_SEEKER_BIKE
-	.byte OBJ_EVENT_GFX_GREEN_VS_SEEKER
+	.byte OBJ_EVENT_GFX_GREEN_VS_SEEKER_BIKE
 gUnknown_835B890:: @ 835B890
 	.4byte MetatileBehavior_IsSouthArrowWarp
@@ -170,7 +170,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "OBJ_EVENT_GFX_TUBER_M_1",
+      "graphics_id": "OBJ_EVENT_GFX_TUBER_M_WATER",
      "x": 9,
      "y": 41,
      "elevation": 1,
@@ -79,7 +79,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "OBJ_EVENT_GFX_TUBER_M_1",
+      "graphics_id": "OBJ_EVENT_GFX_TUBER_M_WATER",
      "x": 15,
      "y": 35,
      "elevation": 1,
@@ -87,7 +87,7 @@
      "flag": "0"
    },
    {
-      "graphics_id": "OBJ_EVENT_GFX_TUBER_M_1",
+      "graphics_id": "OBJ_EVENT_GFX_TUBER_M_WATER",
      "x": 11,
      "y": 44,
      "elevation": 1,
--- a/Show More
+++ b/Show More