Merge branch 'mr-origin-84'

2024-09-26 19:28:18 -05:00
parent 6ce93c3cd2 2e10d1803c
commit 5fd7e7f3cc
83 changed files with 428 additions and 397 deletions
--- a/include/enums.h
+++ b/include/enums.h
@@ -1752,6 +1752,7 @@ enum actor_e
    ACTOR_67_SNIPPET = 0x67,
    ACTOR_68_SNACKER,
    ACTOR_69_CLAM,
+    ACTOR_6A_UNKNOWN,

    ACTOR_6D_GV_BANJO_DOOR = 0x6D, 

@@ -2047,7 +2048,8 @@ enum actor_e
    ACTOR_34F_MUMMUM,
    ACTOR_350_SEAMAN_GRUBLIN,

-    ACTOR_353_XMAS_TREE_EGG_TOLL = 0x353,
+    ACTOR_352_UNKOWN = 0x352,
+    ACTOR_353_XMAS_TREE_EGG_TOLL,
    ACTOR_354_DRIPS,

    ACTOR_367_GRUNTLING_RED = 0x367,