Merge branch 'dev' into coop

2023-06-23 17:07:52 -07:00 · 2023-06-23 17:07:52 -07:00 · 549c35ec4f
parent a2b31c6f1c 243bddf634
commit 549c35ec4f
1055 changed files with 14627 additions and 100799 deletions
--- a/47
+++ b/47
@ -61,6 +61,8 @@ OPT_LEVEL ?= -1
 DEBUG_INFO_LEVEL ?= 2
 # Enable profiling
 PROFILE ?= 0
+# Enable address sanitizer
+ASAN ?= 0
 # Compile headless
 HEADLESS ?= 0
 # Enable Game ICON
@ -158,9 +160,9 @@ endif
 ifeq ($(WINDOWS_AUTO_BUILDER),1)
  export SHELL=sh.exe

-  ifeq ($(TARGET_BITS), 32)
+  ifeq ($(TARGET_BITS),32)
    EXTRA_INCLUDES := ../include/1 ../include/2 ../include/3 ../include/4
-    EXTRA_CPP_INCLUDES := ../include/cpp
+    EXTRA_CPP_INCLUDES := -I../include/cpp
  else
    EXTRA_INCLUDES :=
    EXTRA_CPP_INCLUDES :=
@ -532,7 +534,7 @@ SRC_DIRS := src src/engine src/game src/audio src/bass_audio src/menu src/buffer
 BIN_DIRS := bin bin/$(VERSION)

 # PC files
-SRC_DIRS += src/pc src/pc/gfx src/pc/audio src/pc/controller src/pc/fs src/pc/fs/packtypes src/pc/mods src/dev src/pc/network src/pc/network/packets src/pc/network/socket src/pc/network/coopnet src/pc/utils src/pc/utils/miniz src/pc/djui src/pc/lua src/pc/lua/utils
+SRC_DIRS += src/pc src/pc/gfx src/pc/audio src/pc/controller src/pc/fs src/pc/fs/packtypes src/pc/mods src/dev src/pc/network src/pc/network/packets src/pc/network/socket src/pc/network/coopnet src/pc/utils src/pc/utils/miniz src/pc/djui src/pc/lua src/pc/lua/utils src/pc/os

 ifeq ($(DISCORD_SDK),1)
  SRC_DIRS += src/pc/discord
@ -931,22 +933,18 @@ ifeq ($(WINDOWS_BUILD),1)
  endif
 endif

-# precomp custom sounds
-# hacky stupid thing for windows builds (non-auto-builder)
-# this way it won't fail to compile custom sounds anymore
-ifeq ($(WINDOWS_BUILD),999)
-  ifeq ($(WINDOWS_AUTO_BUILDER),1)
-  else
-    ifeq ($(filter clean distclean,$(MAKECMDGOALS)),)
-      $(info Copying precomp samples...)
-      Command := mkdir -p "$(BUILD_DIR)/sound"
-      Resp := $(shell $(call Command))
-      Command := mkdir -p "$(BUILD_DIR)/sound/samples"
-      Resp := $(shell $(call Command))
-      Command := unzip -o "sound/precomp/samples.zip" -d "$(BUILD_DIR)/sound/"
-      Resp := $(shell $(call Command))
-    endif
+ifeq ($(ASAN),1)
+
+  ifeq ($(COMPILER),gcc)
+    EXTRA_CFLAGS += -fsanitize=address -fsanitize=bounds-strict -fsanitize=undefined -ggdb
+    EXTRA_CPP_FLAGS += -fsanitize=address -fsanitize=bounds-strict -fsanitize=undefined -ggdb
+    LDFLAGS += -fsanitize=address -fsanitize=bounds-strict -fsanitize=undefined -static-libasan
+  else ifeq ($(COMPILER),clang)
+    EXTRA_CFLAGS += -fsanitize=address -fsanitize=undefined -ggdb
+    EXTRA_CPP_FLAGS += -fsanitize=address -fsanitize=undefined -ggdb
+    LDFLAGS += -fsanitize=address -fsanitize=undefined
  endif
+
 endif

 # Coop specific libraries
@ -978,9 +976,9 @@ COOPNET_LIBS :=
 ifeq ($(COOPNET),1)
  ifeq ($(WINDOWS_BUILD),1)
    ifeq ($(TARGET_BITS), 32)
-      LDFLAGS += -Llib/coopnet/win32 -l:libcoopnet.a -l:libjuice.a -lbcrypt -lws2_32
+      LDFLAGS += -Llib/coopnet/win32 -l:libcoopnet.a -l:libjuice.a -lbcrypt -lws2_32 -liphlpapi
    else
-      LDFLAGS += -Llib/coopnet/win64 -l:libcoopnet.a -l:libjuice.a -lbcrypt -lws2_32
+      LDFLAGS += -Llib/coopnet/win64 -l:libcoopnet.a -l:libjuice.a -lbcrypt -lws2_32 -liphlpapi
    endif
  else ifeq ($(OSX_BUILD),1)
    LDFLAGS += -Wl,-rpath,@loader_path -L./lib/coopnet/mac/ -l coopnet
@ -1147,7 +1145,6 @@ N64CKSUM              := $(TOOLS_DIR)/n64cksum
 N64GRAPHICS           := $(TOOLS_DIR)/n64graphics
 N64GRAPHICS_CI        := $(TOOLS_DIR)/n64graphics_ci
 TEXTCONV              := $(TOOLS_DIR)/textconv
-AIFF_EXTRACT_FAILSAFE := $(TOOLS_DIR)/aiff_extract_codebook_failsafe.py
 AIFF_EXTRACT_CODEBOOK := $(TOOLS_DIR)/aiff_extract_codebook
 VADPCM_ENC            := $(TOOLS_DIR)/vadpcm_enc
 EXTRACT_DATA_FOR_MIO  := $(TOOLS_DIR)/extract_data_for_mio
@ -1307,6 +1304,12 @@ ifeq ($(VERSION),eu)
  $(BUILD_DIR)/levels/menu/leveldata.o: $(BUILD_DIR)/text/us/define_courses.inc.c
  $(BUILD_DIR)/levels/menu/leveldata.o: $(BUILD_DIR)/text/de/define_courses.inc.c
  $(BUILD_DIR)/levels/menu/leveldata.o: $(BUILD_DIR)/text/fr/define_courses.inc.c
+  $(BUILD_DIR)/src/game/level_info.o: $(BUILD_DIR)/include/text_strings.h
+  $(BUILD_DIR)/src/game/level_info.o: $(BUILD_DIR)/text/us/define_courses.inc.c
+  $(BUILD_DIR)/src/game/level_info.o: $(BUILD_DIR)/text/de/define_courses.inc.c
+  $(BUILD_DIR)/src/game/level_info.o: $(BUILD_DIR)/text/fr/define_courses.inc.c
+  
+  O_FILES += $(BUILD_DIR)/bin/eu/translation_en.o $(BUILD_DIR)/bin/eu/translation_de.o $(BUILD_DIR)/bin/eu/translation_fr.o
 else
  ifeq ($(VERSION),sh)
    TEXT_DIRS := text/jp
@ -1638,7 +1641,7 @@ ifeq ($(TARGET_N64),1)
 else
  $(EXE): $(O_FILES) $(MIO0_FILES:.mio0=.o) $(ULTRA_O_FILES) $(GODDARD_O_FILES) $(BUILD_DIR)/$(RPC_LIBS) $(BUILD_DIR)/$(DISCORD_SDK_LIBS) $(BUILD_DIR)/$(BASS_LIBS) $(BUILD_DIR)/$(COOPNET_LIBS) $(BUILD_DIR)/$(LANG_DIR) $(BUILD_DIR)/$(MOD_DIR)
 	@$(PRINT) "$(GREEN)Linking executable: $(BLUE)$@ $(NO_COL)\n"
-	$(V)$(LD) $(PROF_FLAGS) -L $(BUILD_DIR) -o $@ $(O_FILES) $(ULTRA_O_FILES) $(GODDARD_O_FILES) $(LDFLAGS) $(EXTRA_INCLUDES)
+	$(V)$(LD) $(PROF_FLAGS) -L $(BUILD_DIR) -o $@ $(O_FILES) $(ULTRA_O_FILES) $(GODDARD_O_FILES) $(LDFLAGS)
 endif


--- a/actors/amp/anims/anim_0800401C.inc.c
+++ b/actors/amp/anims/anim_0800401C.inc.c
@ -51,4 +51,6 @@ static const struct Animation amp_seg8_anim_0800401C = {
    amp_seg8_animvalue_08003E30,
    amp_seg8_animindex_08003F74,
    0,
+    ANIM_FIELD_LENGTH(amp_seg8_animvalue_08003E30),
+    ANIM_FIELD_LENGTH(amp_seg8_animindex_08003F74),
 };
--- a/actors/amp/anims/table.inc.c
+++ b/actors/amp/anims/table.inc.c
@ -1,4 +1,5 @@
 // 0x08004034
-const struct Animation *const amp_seg8_anims_08004034[] = {
-    &amp_seg8_anim_0800401C,
+const struct AnimationTable amp_seg8_anims_08004034 = {
+    .anims = { &amp_seg8_anim_0800401C, },
+    .count = 1
 };
--- a/actors/bird/anims/anim_050008D0.inc.c
+++ b/actors/bird/anims/anim_050008D0.inc.c
@ -33,4 +33,6 @@ static const struct Animation birds_seg5_anim_050008D0 = {
    birds_seg5_animvalue_050007E0,
    birds_seg5_animindex_5000870,
    0,
+    ANIM_FIELD_LENGTH(birds_seg5_animvalue_050007E0),
+    ANIM_FIELD_LENGTH(birds_seg5_animindex_5000870),
 };
--- a/actors/bird/anims/anim_050009D0.inc.c
+++ b/actors/bird/anims/anim_050009D0.inc.c
@ -33,4 +33,6 @@ static const struct Animation birds_seg5_anim_050009D0 = {
    birds_seg5_animvalue_050008E8,
    birds_seg5_animindex_5000970,
    0,
+    ANIM_FIELD_LENGTH(birds_seg5_animvalue_050008E8),
+    ANIM_FIELD_LENGTH(birds_seg5_animindex_5000970),
 };
--- a/actors/bird/anims/table.inc.c
+++ b/actors/bird/anims/table.inc.c
@ -1,5 +1,8 @@
 // 0x050009E8
-const struct Animation *const birds_seg5_anims_050009E8[] = {
-    &birds_seg5_anim_050008D0,
-    &birds_seg5_anim_050009D0,
+const struct AnimationTable birds_seg5_anims_050009E8 = {
+    .anims = {
+        &birds_seg5_anim_050008D0,
+        &birds_seg5_anim_050009D0,
+    },
+    .count = 2
 };
--- a/actors/blargg/anims/anim_05006070.inc.c
+++ b/actors/blargg/anims/anim_05006070.inc.c
@ -45,4 +45,6 @@ static const struct Animation blargg_seg5_anim_05006070 = {
    blargg_seg5_animvalue_05005EB8,
    blargg_seg5_animindex_05006028,
    0,
+    ANIM_FIELD_LENGTH(blargg_seg5_animvalue_05005EB8),
+    ANIM_FIELD_LENGTH(blargg_seg5_animindex_05006028),
 };
--- a/actors/blargg/anims/anim_05006154.inc.c
+++ b/actors/blargg/anims/anim_05006154.inc.c
@ -31,4 +31,6 @@ static const struct Animation blargg_seg5_anim_05006154 = {
    blargg_seg5_animvalue_05006088,
    blargg_seg5_animindex_0500610C,
    0,
+    ANIM_FIELD_LENGTH(blargg_seg5_animvalue_05006088),
+    ANIM_FIELD_LENGTH(blargg_seg5_animindex_0500610C),
 };
--- a/actors/blargg/anims/table.inc.c
+++ b/actors/blargg/anims/table.inc.c
@ -1,7 +1,10 @@
 // unreferenced
 // 0x0500616C
-const struct Animation *const blargg_seg5_anims_0500616C[] = {
-    &blargg_seg5_anim_05006154,
-    &blargg_seg5_anim_05006070,
-    NULL,
+const struct AnimationTable blargg_seg5_anims_0500616C = {
+    .anims = {
+        &blargg_seg5_anim_05006154,
+        &blargg_seg5_anim_05006070,
+        NULL,
+    },
+    .count = 2
 };
--- a/actors/blue_fish/anims/anim_0301C298.inc.c
+++ b/actors/blue_fish/anims/anim_0301C298.inc.c
@ -32,4 +32,6 @@ static const struct Animation blue_fish_seg3_anim_0301C298 = {
    blue_fish_seg3_animvalue_0301C1B0,
    blue_fish_seg3_animindex_0301C268,
    0,
+    ANIM_FIELD_LENGTH(blue_fish_seg3_animvalue_0301C1B0),
+    ANIM_FIELD_LENGTH(blue_fish_seg3_animindex_0301C268),
 };
--- a/actors/blue_fish/anims/table.inc.c
+++ b/actors/blue_fish/anims/table.inc.c
@ -1,5 +1,5 @@
 // 0x0301C2B0
-const struct Animation *const blue_fish_seg3_anims_0301C2B0[] = {
-    &blue_fish_seg3_anim_0301C298,
-    NULL,
+const struct AnimationTable blue_fish_seg3_anims_0301C2B0 = {
+    .anims = { &blue_fish_seg3_anim_0301C298, NULL },
+    .count = 1
 };
--- a/actors/bobomb/anims/anim_080237FC.inc.c
+++ b/actors/bobomb/anims/anim_080237FC.inc.c
@ -65,4 +65,6 @@ static const struct Animation bobomb_seg8_anim_080237FC = {
    bobomb_seg8_animvalue_08023528,
    bobomb_seg8_animindex_08023754,
    0,
+    ANIM_FIELD_LENGTH(bobomb_seg8_animvalue_08023528),
+    ANIM_FIELD_LENGTH(bobomb_seg8_animindex_08023754),
 };
--- a/actors/bobomb/anims/anim_08023954.inc.c
+++ b/actors/bobomb/anims/anim_08023954.inc.c
@ -40,4 +40,6 @@ static const struct Animation bobomb_seg8_anim_08023954 = {
    bobomb_seg8_animvalue_08023814,
    bobomb_seg8_animindex_080238AC,
    0,
+    ANIM_FIELD_LENGTH(bobomb_seg8_animvalue_08023814),
+    ANIM_FIELD_LENGTH(bobomb_seg8_animindex_080238AC),
 };
--- a/actors/bobomb/anims/table.inc.c
+++ b/actors/bobomb/anims/table.inc.c
@ -1,6 +1,9 @@
 // 0x0802396C
-const struct Animation *const bobomb_seg8_anims_0802396C[] = {
-    &bobomb_seg8_anim_080237FC,
-    &bobomb_seg8_anim_08023954,
-    NULL,
+const struct AnimationTable bobomb_seg8_anims_0802396C = {
+    .anims = {
+        &bobomb_seg8_anim_080237FC,
+        &bobomb_seg8_anim_08023954,
+        NULL,
+    },
+    .count = 2
 };
--- a/actors/bookend/anims/anim_050023F4.inc.c
+++ b/actors/bookend/anims/anim_050023F4.inc.c
@ -29,4 +29,6 @@ static const struct Animation bookend_seg5_anim_050023F4 = {
    bookend_seg5_animvalue_05002350,
    bookend_seg5_animindex_05002370,
    0,
+    ANIM_FIELD_LENGTH(bookend_seg5_animvalue_05002350),
+    ANIM_FIELD_LENGTH(bookend_seg5_animindex_05002370),
 };
--- a/actors/bookend/anims/anim_05002510.inc.c
+++ b/actors/bookend/anims/anim_05002510.inc.c
@ -35,6 +35,8 @@ static const struct Animation bookend_seg5_anim_05002510 = {
    bookend_seg5_animvalue_0500240C,
    bookend_seg5_animindex_0500248C,
    0,
+    ANIM_FIELD_LENGTH(bookend_seg5_animvalue_0500240C),
+    ANIM_FIELD_LENGTH(bookend_seg5_animindex_0500248C),
 };

 // what the hell? no values/indexes for the table?
--- a/actors/bookend/anims/anim_05002528.inc.c
+++ b/actors/bookend/anims/anim_05002528.inc.c
@ -9,4 +9,6 @@ static const struct Animation bookend_seg5_anim_05002528 = {
    bookend_seg5_animvalue_0500240C,
    bookend_seg5_animindex_0500248C,
    0,
+    ANIM_FIELD_LENGTH(bookend_seg5_animvalue_0500240C),
+    ANIM_FIELD_LENGTH(bookend_seg5_animindex_0500248C),
 };
--- a/actors/bookend/anims/table.inc.c
+++ b/actors/bookend/anims/table.inc.c
@ -1,7 +1,10 @@
 // 0x05002540
-const struct Animation *const bookend_seg5_anims_05002540[] = {
-    &bookend_seg5_anim_05002528,
-    &bookend_seg5_anim_050023F4,
-    &bookend_seg5_anim_05002510,
-    NULL,
+const struct AnimationTable bookend_seg5_anims_05002540 = {
+    .anims = {
+        &bookend_seg5_anim_05002528,
+        &bookend_seg5_anim_050023F4,
+        &bookend_seg5_anim_05002510,
+        NULL,
+    },
+    .count = 3
 };
--- a/actors/bowser/anims/anim_060445EC.inc.c
+++ b/actors/bowser/anims/anim_060445EC.inc.c
@ -266,4 +266,6 @@ static const struct Animation bowser_seg6_anim_060445EC = {
    bowser_seg6_animvalue_06043700,
    bowser_seg6_animindex_060443D0,
    0,
+    ANIM_FIELD_LENGTH(bowser_seg6_animvalue_06043700),
+    ANIM_FIELD_LENGTH(bowser_seg6_animindex_060443D0),
 };
--- a/actors/bowser/anims/anim_060453C8.inc.c
+++ b/actors/bowser/anims/anim_060453C8.inc.c
@ -248,4 +248,6 @@ static const struct Animation bowser_seg6_anim_060453C8 = {
    bowser_seg6_animvalue_06044604,
    bowser_seg6_animindex_060451AC,
    0,
+    ANIM_FIELD_LENGTH(bowser_seg6_animvalue_06044604),
+    ANIM_FIELD_LENGTH(bowser_seg6_animindex_060451AC),
 };
--- a/actors/bowser/anims/anim_06045D28.inc.c
+++ b/actors/bowser/anims/anim_06045D28.inc.c
@ -176,4 +176,6 @@ static const struct Animation bowser_seg6_anim_06045D28 = {
    bowser_seg6_animvalue_060453E0,
    bowser_seg6_animindex_06045B0C,
    0,
+    ANIM_FIELD_LENGTH(bowser_seg6_animvalue_060453E0),
+    ANIM_FIELD_LENGTH(bowser_seg6_animindex_06045B0C),
 };
--- a/actors/bowser/anims/anim_0604671C.inc.c
+++ b/actors/bowser/anims/anim_0604671C.inc.c
@ -185,4 +185,6 @@ static const struct Animation bowser_seg6_anim_0604671C = {
    bowser_seg6_animvalue_06045D40,
    bowser_seg6_animindex_06046500,
    0,
+    ANIM_FIELD_LENGTH(bowser_seg6_animvalue_06045D40),
+    ANIM_FIELD_LENGTH(bowser_seg6_animindex_06046500),
 };
--- a/actors/bowser/anims/anim_0604675C.inc.c
+++ b/actors/bowser/anims/anim_0604675C.inc.c
@ -19,4 +19,6 @@ static const struct Animation bowser_seg6_anim_0604675C = {
    bowser_seg6_animvalue_06046734,
    bowser_seg6_animindex_06046744,
    0,
+    ANIM_FIELD_LENGTH(bowser_seg6_animvalue_06046734),
+    ANIM_FIELD_LENGTH(bowser_seg6_animindex_06046744),
 };
--- a/actors/bowser/anims/anim_06048200.inc.c
+++ b/actors/bowser/anims/anim_06048200.inc.c
@ -452,4 +452,6 @@ static const struct Animation bowser_seg6_anim_06048200 = {
    bowser_seg6_animvalue_06046774,
    bowser_seg6_animindex_06047FE4,
    0,
+    ANIM_FIELD_LENGTH(bowser_seg6_animvalue_06046774),
+    ANIM_FIELD_LENGTH(bowser_seg6_animindex_06047FE4),
 };
--- a/actors/bowser/anims/anim_06049880.inc.c
+++ b/actors/bowser/anims/anim_06049880.inc.c
@ -386,4 +386,6 @@ static const struct Animation bowser_seg6_anim_06049880 = {
    bowser_seg6_animvalue_06048218,
    bowser_seg6_animindex_06049664,
    0,
+    ANIM_FIELD_LENGTH(bowser_seg6_animvalue_06048218),
+    ANIM_FIELD_LENGTH(bowser_seg6_animindex_06049664),
 };
--- a/actors/bowser/anims/anim_0604A8E4.inc.c
+++ b/actors/bowser/anims/anim_0604A8E4.inc.c
@ -288,4 +288,6 @@ static const struct Animation bowser_seg6_anim_0604A8E4 = {
    bowser_seg6_animvalue_06049898,
    bowser_seg6_animindex_0604A6C8,
    0,
+    ANIM_FIELD_LENGTH(bowser_seg6_animvalue_06049898),
+    ANIM_FIELD_LENGTH(bowser_seg6_animindex_0604A6C8),
 };
--- a/actors/bowser/anims/anim_0604B178.inc.c
+++ b/actors/bowser/anims/anim_0604B178.inc.c
@ -163,4 +163,6 @@ static const struct Animation bowser_seg6_anim_0604B178 = {
    bowser_seg6_animvalue_0604A8FC,
    bowser_seg6_animindex_0604AF5C,
    0,
+    ANIM_FIELD_LENGTH(bowser_seg6_animvalue_0604A8FC),
+    ANIM_FIELD_LENGTH(bowser_seg6_animindex_0604AF5C),
 };
--- a/actors/bowser/anims/anim_0604B8CC.inc.c
+++ b/actors/bowser/anims/anim_0604B8CC.inc.c
@ -143,4 +143,6 @@ static const struct Animation bowser_seg6_anim_0604B8CC = {
    bowser_seg6_animvalue_0604B190,
    bowser_seg6_animindex_0604B6B0,
    0,
+    ANIM_FIELD_LENGTH(bowser_seg6_animvalue_0604B190),
+    ANIM_FIELD_LENGTH(bowser_seg6_animindex_0604B6B0),
 };
--- a/actors/bowser/anims/anim_0604D184.inc.c
+++ b/actors/bowser/anims/anim_0604D184.inc.c
@ -422,4 +422,6 @@ static const struct Animation bowser_seg6_anim_0604D184 = {
    bowser_seg6_animvalue_0604B8E4,
    bowser_seg6_animindex_0604CF68,
    0,
+    ANIM_FIELD_LENGTH(bowser_seg6_animvalue_0604B8E4),
+    ANIM_FIELD_LENGTH(bowser_seg6_animindex_0604CF68),
 };
--- a/actors/bowser/anims/anim_0604E5A0.inc.c
+++ b/actors/bowser/anims/anim_0604E5A0.inc.c
@ -348,4 +348,6 @@ static const struct Animation bowser_seg6_anim_0604E5A0 = {
    bowser_seg6_animvalue_0604D19C,
    bowser_seg6_animindex_0604E384,
    0,
+    ANIM_FIELD_LENGTH(bowser_seg6_animvalue_0604D19C),
+    ANIM_FIELD_LENGTH(bowser_seg6_animindex_0604E384),
 };
--- a/actors/bowser/anims/anim_0604F030.inc.c
+++ b/actors/bowser/anims/anim_0604F030.inc.c
@ -195,4 +195,6 @@ static const struct Animation bowser_seg6_anim_0604F030 = {
    bowser_seg6_animvalue_0604E5B8,
    bowser_seg6_animindex_0604EE14,
    0,
+    ANIM_FIELD_LENGTH(bowser_seg6_animvalue_0604E5B8),
+    ANIM_FIELD_LENGTH(bowser_seg6_animindex_0604EE14),
 };
--- a/actors/bowser/anims/anim_0604FF4C.inc.c
+++ b/actors/bowser/anims/anim_0604FF4C.inc.c
@ -268,4 +268,6 @@ static const struct Animation bowser_seg6_anim_0604FF4C = {
    bowser_seg6_animvalue_0604F048,
    bowser_seg6_animindex_0604FD30,
    0,
+    ANIM_FIELD_LENGTH(bowser_seg6_animvalue_0604F048),
+    ANIM_FIELD_LENGTH(bowser_seg6_animindex_0604FD30),
 };
--- a/actors/bowser/anims/anim_06050530.inc.c
+++ b/actors/bowser/anims/anim_06050530.inc.c
@ -120,4 +120,6 @@ static const struct Animation bowser_seg6_anim_06050530 = {
    bowser_seg6_animvalue_0604FF64,
    bowser_seg6_animindex_06050314,
    0,
+    ANIM_FIELD_LENGTH(bowser_seg6_animvalue_0604FF64),
+    ANIM_FIELD_LENGTH(bowser_seg6_animindex_06050314),
 };
--- a/actors/bowser/anims/anim_060514E8.inc.c
+++ b/actors/bowser/anims/anim_060514E8.inc.c
@ -278,4 +278,6 @@ static const struct Animation bowser_seg6_anim_060514E8 = {
    bowser_seg6_animvalue_06050548,
    bowser_seg6_animindex_060512CC,
    0,
+    ANIM_FIELD_LENGTH(bowser_seg6_animvalue_06050548),
+    ANIM_FIELD_LENGTH(bowser_seg6_animindex_060512CC),
 };
--- a/actors/bowser/anims/anim_06051C68.inc.c
+++ b/actors/bowser/anims/anim_06051C68.inc.c
@ -146,4 +146,6 @@ static const struct Animation bowser_seg6_anim_06051C68 = {
    bowser_seg6_animvalue_06051500,
    bowser_seg6_animindex_06051A4C,
    0,
+    ANIM_FIELD_LENGTH(bowser_seg6_animvalue_06051500),
+    ANIM_FIELD_LENGTH(bowser_seg6_animindex_06051A4C),
 };
--- a/actors/bowser/anims/anim_06052680.inc.c
+++ b/actors/bowser/anims/anim_06052680.inc.c
@ -188,4 +188,6 @@ static const struct Animation bowser_seg6_anim_06052680 = {
    bowser_seg6_animvalue_06051C80,
    bowser_seg6_animindex_06052464,
    0,
+    ANIM_FIELD_LENGTH(bowser_seg6_animvalue_06051C80),
+    ANIM_FIELD_LENGTH(bowser_seg6_animindex_06052464),
 };
--- a/actors/bowser/anims/anim_06052D94.inc.c
+++ b/actors/bowser/anims/anim_06052D94.inc.c
@ -139,4 +139,6 @@ static const struct Animation bowser_seg6_anim_06052D94 = {
    bowser_seg6_animvalue_06052698,
    bowser_seg6_animindex_06052B78,
    0,
+    ANIM_FIELD_LENGTH(bowser_seg6_animvalue_06052698),
+    ANIM_FIELD_LENGTH(bowser_seg6_animindex_06052B78),
 };
--- a/actors/bowser/anims/anim_060534F4.inc.c
+++ b/actors/bowser/anims/anim_060534F4.inc.c
@ -144,4 +144,6 @@ static const struct Animation bowser_seg6_anim_060534F4 = {
    bowser_seg6_animvalue_06052DAC,
    bowser_seg6_animindex_060532D8,
    0,
+    ANIM_FIELD_LENGTH(bowser_seg6_animvalue_06052DAC),
+    ANIM_FIELD_LENGTH(bowser_seg6_animindex_060532D8),
 };
--- a/actors/bowser/anims/anim_06053B8C.inc.c
+++ b/actors/bowser/anims/anim_06053B8C.inc.c
@ -132,4 +132,6 @@ static const struct Animation bowser_seg6_anim_06053B8C = {
    bowser_seg6_animvalue_0605350C,
    bowser_seg6_animindex_06053970,
    0,
+    ANIM_FIELD_LENGTH(bowser_seg6_animvalue_0605350C),
+    ANIM_FIELD_LENGTH(bowser_seg6_animindex_06053970),
 };
--- a/actors/bowser/anims/anim_06054290.inc.c
+++ b/actors/bowser/anims/anim_06054290.inc.c
@ -138,4 +138,6 @@ static const struct Animation bowser_seg6_anim_06054290 = {
    bowser_seg6_animvalue_06053BA4,
    bowser_seg6_animindex_06054074,
    0,
+    ANIM_FIELD_LENGTH(bowser_seg6_animvalue_06053BA4),
+    ANIM_FIELD_LENGTH(bowser_seg6_animindex_06054074),
 };
--- a/actors/bowser/anims/anim_06054950.inc.c
+++ b/actors/bowser/anims/anim_06054950.inc.c
@ -134,4 +134,6 @@ static const struct Animation bowser_seg6_anim_06054950 = {
    bowser_seg6_animvalue_060542A8,
    bowser_seg6_animindex_06054734,
    0,
+    ANIM_FIELD_LENGTH(bowser_seg6_animvalue_060542A8),
+    ANIM_FIELD_LENGTH(bowser_seg6_animindex_06054734),
 };
--- a/actors/bowser/anims/anim_06055210.inc.c
+++ b/actors/bowser/anims/anim_06055210.inc.c
@ -166,4 +166,6 @@ static const struct Animation bowser_seg6_anim_06055210 = {
    bowser_seg6_animvalue_06054968,
    bowser_seg6_animindex_06054FF4,
    0,
+    ANIM_FIELD_LENGTH(bowser_seg6_animvalue_06054968),
+    ANIM_FIELD_LENGTH(bowser_seg6_animindex_06054FF4),
 };
--- a/actors/bowser/anims/anim_06055984.inc.c
+++ b/actors/bowser/anims/anim_06055984.inc.c
@ -145,4 +145,6 @@ static const struct Animation bowser_seg6_anim_06055984 = {
    bowser_seg6_animvalue_06055228,
    bowser_seg6_animindex_06055768,
    0,
+    ANIM_FIELD_LENGTH(bowser_seg6_animvalue_06055228),
+    ANIM_FIELD_LENGTH(bowser_seg6_animindex_06055768),
 };
--- a/actors/bowser/anims/anim_06056774.inc.c
+++ b/actors/bowser/anims/anim_06056774.inc.c
@ -249,4 +249,6 @@ static const struct Animation bowser_seg6_anim_06056774 = {
    bowser_seg6_animvalue_0605599C,
    bowser_seg6_animindex_06056558,
    0,
+    ANIM_FIELD_LENGTH(bowser_seg6_animvalue_0605599C),
+    ANIM_FIELD_LENGTH(bowser_seg6_animindex_06056558),
 };
--- a/actors/bowser/anims/anim_06057678.inc.c
+++ b/actors/bowser/anims/anim_06057678.inc.c
@ -266,4 +266,6 @@ static const struct Animation bowser_seg6_anim_06057678 = {
    bowser_seg6_animvalue_0605678C,
    bowser_seg6_animindex_0605745C,
    0,
+    ANIM_FIELD_LENGTH(bowser_seg6_animvalue_0605678C),
+    ANIM_FIELD_LENGTH(bowser_seg6_animindex_0605745C),
 };
--- a/actors/bowser/anims/table.inc.c
+++ b/actors/bowser/anims/table.inc.c
@ -1,30 +1,33 @@
 // 0x06057690
-const struct Animation *const bowser_seg6_anims_06057690[] = {
-    &bowser_seg6_anim_060445EC,
-    &bowser_seg6_anim_060453C8,
-    &bowser_seg6_anim_06045D28,
-    &bowser_seg6_anim_0604671C,
-    &bowser_seg6_anim_0604675C,
-    &bowser_seg6_anim_06048200,
-    &bowser_seg6_anim_06049880,
-    &bowser_seg6_anim_0604A8E4,
-    &bowser_seg6_anim_0604B178,
-    &bowser_seg6_anim_0604B8CC,
-    &bowser_seg6_anim_0604D184,
-    &bowser_seg6_anim_0604E5A0,
-    &bowser_seg6_anim_0604F030,
-    &bowser_seg6_anim_0604FF4C,
-    &bowser_seg6_anim_06050530,
-    &bowser_seg6_anim_060514E8,
-    &bowser_seg6_anim_06051C68,
-    &bowser_seg6_anim_06052680,
-    &bowser_seg6_anim_06054290,
-    &bowser_seg6_anim_06052D94,
-    &bowser_seg6_anim_060534F4,
-    &bowser_seg6_anim_06053B8C,
-    &bowser_seg6_anim_06054950,
-    &bowser_seg6_anim_06055210,
-    &bowser_seg6_anim_06055984,
-    &bowser_seg6_anim_06056774,
-    &bowser_seg6_anim_06057678,
+const struct AnimationTable bowser_seg6_anims_06057690 = {
+    .anims = {
+        &bowser_seg6_anim_060445EC,
+        &bowser_seg6_anim_060453C8,
+        &bowser_seg6_anim_06045D28,
+        &bowser_seg6_anim_0604671C,
+        &bowser_seg6_anim_0604675C,
+        &bowser_seg6_anim_06048200,
+        &bowser_seg6_anim_06049880,
+        &bowser_seg6_anim_0604A8E4,
+        &bowser_seg6_anim_0604B178,
+        &bowser_seg6_anim_0604B8CC,
+        &bowser_seg6_anim_0604D184,
+        &bowser_seg6_anim_0604E5A0,
+        &bowser_seg6_anim_0604F030,
+        &bowser_seg6_anim_0604FF4C,
+        &bowser_seg6_anim_06050530,
+        &bowser_seg6_anim_060514E8,
+        &bowser_seg6_anim_06051C68,
+        &bowser_seg6_anim_06052680,
+        &bowser_seg6_anim_06054290,
+        &bowser_seg6_anim_06052D94,
+        &bowser_seg6_anim_060534F4,
+        &bowser_seg6_anim_06053B8C,
+        &bowser_seg6_anim_06054950,
+        &bowser_seg6_anim_06055210,
+        &bowser_seg6_anim_06055984,
+        &bowser_seg6_anim_06056774,
+        &bowser_seg6_anim_06057678,
+    },
+    .count = 27
 };
--- a/actors/bowser_key/anims/anim_course_exit.inc.c
+++ b/actors/bowser_key/anims/anim_course_exit.inc.c
@ -125,4 +125,6 @@ static const struct Animation bowser_key_seg3_anim_course_exit = {
    bowser_key_seg3_animvalue_course_exit,
    bowser_key_seg3_animindex_course_exit,
    0,
+    ANIM_FIELD_LENGTH(bowser_key_seg3_animvalue_course_exit),
+    ANIM_FIELD_LENGTH(bowser_key_seg3_animindex_course_exit),
 };
--- a/actors/bowser_key/anims/anim_unlock_door.inc.c
+++ b/actors/bowser_key/anims/anim_unlock_door.inc.c
@ -125,4 +125,6 @@ static const struct Animation bowser_key_seg3_anim_unlock_door = {
    bowser_key_seg3_animvalue_unlock_door,
    bowser_key_seg3_animindex_unlock_door,
    0,
+    ANIM_FIELD_LENGTH(bowser_key_seg3_animvalue_unlock_door),
+    ANIM_FIELD_LENGTH(bowser_key_seg3_animindex_unlock_door),
 };
--- a/actors/bowser_key/anims/table.inc.c
+++ b/actors/bowser_key/anims/table.inc.c
@ -1,5 +1,8 @@
 // 0x030172D0
-const struct Animation *const bowser_key_seg3_anims_list[] = {
-    &bowser_key_seg3_anim_unlock_door, // id 0
-    &bowser_key_seg3_anim_course_exit, // id 1
+const struct AnimationTable bowser_key_seg3_anims_list = {
+    .anims = {
+        &bowser_key_seg3_anim_unlock_door, // id 0
+        &bowser_key_seg3_anim_course_exit, // id 1
+    },
+    .count = 2
 };
--- a/actors/bub/anims/anim_0601233C.inc.c
+++ b/actors/bub/anims/anim_0601233C.inc.c
@ -70,4 +70,6 @@ static const struct Animation bub_seg6_anim_0601233C = {
    bub_seg6_animvalue_06012000,
    bub_seg6_animindex_060122DC,
    0,
+    ANIM_FIELD_LENGTH(bub_seg6_animvalue_06012000),
+    ANIM_FIELD_LENGTH(bub_seg6_animindex_060122DC),
 };
--- a/actors/bub/anims/table.inc.c
+++ b/actors/bub/anims/table.inc.c
@ -1,6 +1,9 @@
 // 0x06012354
-const struct Animation *const bub_seg6_anims_06012354[] = {
-    &bub_seg6_anim_0601233C,
-    NULL,
-    NULL,
+const struct AnimationTable bub_seg6_anims_06012354 = {
+    .anims = {
+        &bub_seg6_anim_0601233C,
+        NULL,
+        NULL,
+    },
+    .count = 1
 };
--- a/actors/bully/anims/anim_050042A4.inc.c
+++ b/actors/bully/anims/anim_050042A4.inc.c
@ -59,4 +59,6 @@ static const struct Animation bully_seg5_anim_050042A4 = {
    bully_seg5_animvalue_05004038,
    bully_seg5_animindex_050041FC,
    0,
+    ANIM_FIELD_LENGTH(bully_seg5_animvalue_05004038),
+    ANIM_FIELD_LENGTH(bully_seg5_animindex_050041FC),
 };
--- a/actors/bully/anims/anim_050043D8.inc.c
+++ b/actors/bully/anims/anim_050043D8.inc.c
@ -38,4 +38,6 @@ static const struct Animation bully_seg5_anim_050043D8 = {
    bully_seg5_animvalue_050042BC,
    bully_seg5_animindex_05004330,
    0,
+    ANIM_FIELD_LENGTH(bully_seg5_animvalue_050042BC),
+    ANIM_FIELD_LENGTH(bully_seg5_animindex_05004330),
 };
--- a/actors/bully/anims/anim_05004598.inc.c
+++ b/actors/bully/anims/anim_05004598.inc.c
@ -47,4 +47,6 @@ static const struct Animation bully_seg5_anim_05004598 = {
    bully_seg5_animvalue_050043F0,
    bully_seg5_animindex_050044F0,
    0,
+    ANIM_FIELD_LENGTH(bully_seg5_animvalue_050043F0),
+    ANIM_FIELD_LENGTH(bully_seg5_animindex_050044F0),
 };
--- a/actors/bully/anims/anim_050046F4.inc.c
+++ b/actors/bully/anims/anim_050046F4.inc.c
@ -40,4 +40,6 @@ static const struct Animation bully_seg5_anim_050046F4 = {
    bully_seg5_animvalue_050045B0,
    bully_seg5_animindex_0500464C,
    0,
+    ANIM_FIELD_LENGTH(bully_seg5_animvalue_050045B0),
+    ANIM_FIELD_LENGTH(bully_seg5_animindex_0500464C),
 };
--- a/actors/bully/anims/table.inc.c
+++ b/actors/bully/anims/table.inc.c
@ -1,8 +1,11 @@
 // 0x0500470C
-const struct Animation *const bully_seg5_anims_0500470C[] = {
-    &bully_seg5_anim_05004598,
-    &bully_seg5_anim_050043D8,
-    &bully_seg5_anim_050042A4,
-    &bully_seg5_anim_050046F4,
-    NULL,
+const struct AnimationTable bully_seg5_anims_0500470C = {
+    .anims = {
+        &bully_seg5_anim_05004598,
+        &bully_seg5_anim_050043D8,
+        &bully_seg5_anim_050042A4,
+        &bully_seg5_anim_050046F4,
+        NULL,
+    },
+    .count = 4
 };
--- a/actors/butterfly/anims/anim_030055B0.inc.c
+++ b/actors/butterfly/anims/anim_030055B0.inc.c
@ -26,4 +26,6 @@ static const struct Animation butterfly_seg3_anim_030055B0 = {
    butterfly_seg3_animvalue_03005538,
    butterfly_seg3_animindex_0300555C,
    0,
+    ANIM_FIELD_LENGTH(butterfly_seg3_animvalue_03005538),
+    ANIM_FIELD_LENGTH(butterfly_seg3_animindex_0300555C),
 };
--- a/actors/butterfly/anims/anim_03005698.inc.c
+++ b/actors/butterfly/anims/anim_03005698.inc.c
@ -31,4 +31,6 @@ static const struct Animation butterfly_seg3_anim_03005698 = {
    butterfly_seg3_animvalue_030055C8,
    butterfly_seg3_animindex_03005644,
    0,
+    ANIM_FIELD_LENGTH(butterfly_seg3_animvalue_030055C8),
+    ANIM_FIELD_LENGTH(butterfly_seg3_animindex_03005644),
 };
--- a/actors/butterfly/anims/table.inc.c
+++ b/actors/butterfly/anims/table.inc.c
@ -1,5 +1,8 @@
 // 0x030056B0
-const struct Animation *const butterfly_seg3_anims_030056B0[] = {
-    &butterfly_seg3_anim_030055B0,
-    &butterfly_seg3_anim_03005698,
+const struct AnimationTable butterfly_seg3_anims_030056B0 = {
+    .anims = {
+        &butterfly_seg3_anim_030055B0,
+        &butterfly_seg3_anim_03005698,
+    },
+    .count = 2
 };
--- a/actors/chain_chomp/anims/anim_06025160.inc.c
+++ b/actors/chain_chomp/anims/anim_06025160.inc.c
@ -37,4 +37,6 @@ static const struct Animation chain_chomp_seg6_anim_06025160 = {
    chain_chomp_seg6_animvalue_06025030,
    chain_chomp_seg6_animindex_06025100,
    0,
+    ANIM_FIELD_LENGTH(chain_chomp_seg6_animvalue_06025030),
+    ANIM_FIELD_LENGTH(chain_chomp_seg6_animindex_06025100),
 };
--- a/actors/chain_chomp/anims/table.inc.c
+++ b/actors/chain_chomp/anims/table.inc.c
@ -1,5 +1,8 @@
 // 0x06025178
-const struct Animation *const chain_chomp_seg6_anims_06025178[] = {
-    &chain_chomp_seg6_anim_06025160,
-    NULL,
+const struct AnimationTable chain_chomp_seg6_anims_06025178 = {
+    .anims = {
+        &chain_chomp_seg6_anim_06025160,
+        NULL,
+    },
+    .count = 1
 };
--- a/actors/chair/anims/anim_0500576C.inc.c
+++ b/actors/chair/anims/anim_0500576C.inc.c
@ -26,4 +26,6 @@ static const struct Animation chair_seg5_anim_0500576C = {
    chair_seg5_animvalue_050056F0,
    chair_seg5_animindex_05005700,
    0,
+    ANIM_FIELD_LENGTH(chair_seg5_animvalue_050056F0),
+    ANIM_FIELD_LENGTH(chair_seg5_animindex_05005700),
 };
--- a/actors/chair/anims/table.inc.c
+++ b/actors/chair/anims/table.inc.c
@ -1,4 +1,7 @@
 // 0x05005784
-const struct Animation *const chair_seg5_anims_05005784[] = {
-    &chair_seg5_anim_0500576C,
+const struct AnimationTable chair_seg5_anims_05005784 = {
+    .anims = {
+        &chair_seg5_anim_0500576C,
+    },
+    .count = 1
 };
--- a/actors/chillychief/anims/anim_060032EC.inc.c
+++ b/actors/chillychief/anims/anim_060032EC.inc.c
@ -59,4 +59,6 @@ static const struct Animation chilly_chief_seg6_anim_060032EC = {
    chilly_chief_seg6_animvalue_06003080,
    chilly_chief_seg6_animindex_06003244,
    0,
+    ANIM_FIELD_LENGTH(chilly_chief_seg6_animvalue_06003080),
+    ANIM_FIELD_LENGTH(chilly_chief_seg6_animindex_06003244),
 };
--- a/actors/chillychief/anims/anim_06003420.inc.c
+++ b/actors/chillychief/anims/anim_06003420.inc.c
@ -38,4 +38,6 @@ static const struct Animation chilly_chief_seg6_anim_06003420 = {
    chilly_chief_seg6_animvalue_06003304,
    chilly_chief_seg6_animindex_06003378,
    0,
+    ANIM_FIELD_LENGTH(chilly_chief_seg6_animvalue_06003304),
+    ANIM_FIELD_LENGTH(chilly_chief_seg6_animindex_06003378),
 };
--- a/actors/chillychief/anims/anim_060035E0.inc.c
+++ b/actors/chillychief/anims/anim_060035E0.inc.c
@ -46,4 +46,6 @@ static const struct Animation chilly_chief_seg6_anim_060035E0 = {
    chilly_chief_seg6_animvalue_06003438,
    chilly_chief_seg6_animindex_06003538,
    0,
+    ANIM_FIELD_LENGTH(chilly_chief_seg6_animvalue_06003438),
+    ANIM_FIELD_LENGTH(chilly_chief_seg6_animindex_06003538),
 };
--- a/actors/chillychief/anims/anim_0600373C.inc.c
+++ b/actors/chillychief/anims/anim_0600373C.inc.c
@ -40,4 +40,6 @@ static const struct Animation chilly_chief_seg6_anim_0600373C = {
    chilly_chief_seg6_animvalue_060035F8,
    chilly_chief_seg6_animindex_06003694,
    0,
+    ANIM_FIELD_LENGTH(chilly_chief_seg6_animvalue_060035F8),
+    ANIM_FIELD_LENGTH(chilly_chief_seg6_animindex_06003694),
 };
--- a/actors/chillychief/anims/table.inc.c
+++ b/actors/chillychief/anims/table.inc.c
@ -1,8 +1,11 @@
 // 0x06003994
-const struct Animation *const chilly_chief_seg6_anims_06003994[] = {
-    &chilly_chief_seg6_anim_060035E0,
-    &chilly_chief_seg6_anim_06003420,
-    &chilly_chief_seg6_anim_060032EC,
-    &chilly_chief_seg6_anim_0600373C,
-    NULL,
+const struct AnimationTable chilly_chief_seg6_anims_06003994 = {
+    .anims = {
+        &chilly_chief_seg6_anim_060035E0,
+        &chilly_chief_seg6_anim_06003420,
+        &chilly_chief_seg6_anim_060032EC,
+        &chilly_chief_seg6_anim_0600373C,
+        NULL,
+    },
+    .count = 4
 };
--- a/actors/chuckya/anims/anim_0800AF68.inc.c
+++ b/actors/chuckya/anims/anim_0800AF68.inc.c
@ -77,4 +77,6 @@ static const struct Animation chuckya_seg8_anim_0800AF68 = {
    chuckya_seg8_animvalue_0800AC18,
    chuckya_seg8_animindex_0800ADF4,
    0,
+    ANIM_FIELD_LENGTH(chuckya_seg8_animvalue_0800AC18),
+    ANIM_FIELD_LENGTH(chuckya_seg8_animindex_0800ADF4),
 };
--- a/actors/chuckya/anims/anim_0800B1A8.inc.c
+++ b/actors/chuckya/anims/anim_0800B1A8.inc.c
@ -59,4 +59,6 @@ static const struct Animation chuckya_seg8_anim_0800B1A8 = {
    chuckya_seg8_animvalue_0800AF80,
    chuckya_seg8_animindex_0800B034,
    0,
+    ANIM_FIELD_LENGTH(chuckya_seg8_animvalue_0800AF80),
+    ANIM_FIELD_LENGTH(chuckya_seg8_animindex_0800B034),
 };
--- a/actors/chuckya/anims/anim_0800B4A8.inc.c
+++ b/actors/chuckya/anims/anim_0800B4A8.inc.c
@ -71,4 +71,6 @@ static const struct Animation chuckya_seg8_anim_0800B4A8 = {
    chuckya_seg8_animvalue_0800B1C0,
    chuckya_seg8_animindex_0800B334,
    0,
+    ANIM_FIELD_LENGTH(chuckya_seg8_animvalue_0800B1C0),
+    ANIM_FIELD_LENGTH(chuckya_seg8_animindex_0800B334),
 };
--- a/actors/chuckya/anims/anim_0800B9F8.inc.c
+++ b/actors/chuckya/anims/anim_0800B9F8.inc.c
@ -108,4 +108,6 @@ static const struct Animation chuckya_seg8_anim_0800B9F8 = {
    chuckya_seg8_animvalue_0800B4C0,
    chuckya_seg8_animindex_0800B884,
    0,
+    ANIM_FIELD_LENGTH(chuckya_seg8_animvalue_0800B4C0),
+    ANIM_FIELD_LENGTH(chuckya_seg8_animindex_0800B884),
 };
--- a/actors/chuckya/anims/anim_0800BBEC.inc.c
+++ b/actors/chuckya/anims/anim_0800BBEC.inc.c
@ -54,4 +54,6 @@ static const struct Animation chuckya_seg8_anim_0800BBEC = {
    chuckya_seg8_animvalue_0800BA10,
    chuckya_seg8_animindex_0800BA78,
    0,
+    ANIM_FIELD_LENGTH(chuckya_seg8_animvalue_0800BA10),
+    ANIM_FIELD_LENGTH(chuckya_seg8_animindex_0800BA78),
 };
--- a/actors/chuckya/anims/anim_0800C058.inc.c
+++ b/actors/chuckya/anims/anim_0800C058.inc.c
@ -93,4 +93,6 @@ static const struct Animation chuckya_seg8_anim_0800C058 = {
    chuckya_seg8_animvalue_0800BC04,
    chuckya_seg8_animindex_0800BEE4,
    0,
+    ANIM_FIELD_LENGTH(chuckya_seg8_animvalue_0800BC04),
+    ANIM_FIELD_LENGTH(chuckya_seg8_animindex_0800BEE4),
 };
--- a/actors/chuckya/anims/table.inc.c
+++ b/actors/chuckya/anims/table.inc.c
@ -1,9 +1,12 @@
 // 0x0800C070
-const struct Animation *const chuckya_seg8_anims_0800C070[] = {
-    &chuckya_seg8_anim_0800AF68,
-    &chuckya_seg8_anim_0800B1A8,
-    &chuckya_seg8_anim_0800B4A8,
-    &chuckya_seg8_anim_0800B9F8,
-    &chuckya_seg8_anim_0800BBEC,
-    &chuckya_seg8_anim_0800C058,
+const struct AnimationTable chuckya_seg8_anims_0800C070 = {
+    .anims = {
+        &chuckya_seg8_anim_0800AF68,
+        &chuckya_seg8_anim_0800B1A8,
+        &chuckya_seg8_anim_0800B4A8,
+        &chuckya_seg8_anim_0800B9F8,
+        &chuckya_seg8_anim_0800BBEC,
+        &chuckya_seg8_anim_0800C058,
+    },
+    .count = 6
 };
--- a/actors/clam_shell/anims/anim_05001654.inc.c
+++ b/actors/clam_shell/anims/anim_05001654.inc.c
@ -26,4 +26,6 @@ static const struct Animation clam_shell_seg5_anim_05001654 = {
    clam_shell_seg5_animvalue_050015D0,
    clam_shell_seg5_animindex_05001618,
    0,
+    ANIM_FIELD_LENGTH(clam_shell_seg5_animvalue_050015D0),
+    ANIM_FIELD_LENGTH(clam_shell_seg5_animindex_05001618),
 };
--- a/actors/clam_shell/anims/anim_0500172C.inc.c
+++ b/actors/clam_shell/anims/anim_0500172C.inc.c
@ -30,4 +30,6 @@ static const struct Animation clam_shell_seg5_anim_0500172C = {
    clam_shell_seg5_animvalue_0500166C,
    clam_shell_seg5_animindex_050016F0,
    0,
+    ANIM_FIELD_LENGTH(clam_shell_seg5_animvalue_0500166C),
+    ANIM_FIELD_LENGTH(clam_shell_seg5_animindex_050016F0),
 };
--- a/actors/clam_shell/anims/table.inc.c
+++ b/actors/clam_shell/anims/table.inc.c
@ -1,6 +1,9 @@
 // 0x05001744
-const struct Animation *const clam_shell_seg5_anims_05001744[] = {
-    &clam_shell_seg5_anim_05001654,
-    &clam_shell_seg5_anim_0500172C,
-    NULL,
+const struct AnimationTable clam_shell_seg5_anims_05001744 = {
+    .anims = {
+        &clam_shell_seg5_anim_05001654,
+        &clam_shell_seg5_anim_0500172C,
+        NULL,
+    },
+    .count = 2
 };
--- a/actors/common0.h
+++ b/actors/common0.h
@ -21,7 +21,7 @@ extern const Gfx amp_seg8_dl_080039D0[];
 extern const Gfx amp_seg8_dl_08003DA8[];
 extern const Gfx amp_seg8_dl_08003DD8[];
 extern const Gfx amp_seg8_dl_08003E00[];
-extern const struct Animation *const amp_seg8_anims_08004034[];
+extern const struct AnimationTable amp_seg8_anims_08004034;

 // blue_coin_switch
 extern const GeoLayout blue_coin_switch_geo[];
@ -44,7 +44,7 @@ extern const Gfx bobomb_seg8_dl_08022D78[];
 extern const Gfx bobomb_seg8_dl_08023270[];
 extern const Gfx bobomb_seg8_dl_08023378[];
 extern const Gfx bobomb_seg8_dl_08023480[];
-extern const struct Animation *const bobomb_seg8_anims_0802396C[];
+extern const struct AnimationTable bobomb_seg8_anims_0802396C;

 // bowling_ball
 extern const GeoLayout bowling_ball_geo[];
@ -108,7 +108,7 @@ extern const Gfx chuckya_seg8_dl_0800A958[];
 extern const Gfx chuckya_seg8_dl_0800A998[];
 extern const Gfx chuckya_seg8_dl_0800AB70[];
 extern const Gfx chuckya_seg8_dl_0800ABE8[];
-extern const struct Animation *const chuckya_seg8_anims_0800C070[];
+extern const struct AnimationTable chuckya_seg8_anims_0800C070;

 // exclamation_box
 extern const GeoLayout exclamation_box_geo[];
@ -149,7 +149,7 @@ extern const Gfx flyguy_seg8_dl_080113A8[];
 extern const Gfx flyguy_seg8_dl_08011420[];
 extern const Gfx flyguy_seg8_dl_080116D0[];
 extern const Gfx flyguy_seg8_dl_08011710[];
-extern const struct Animation *const flyguy_seg8_anims_08011A64[];
+extern const struct AnimationTable flyguy_seg8_anims_08011A64;

 // goomba
 extern const GeoLayout goomba_geo[];
@ -165,7 +165,7 @@ extern const Gfx goomba_seg8_dl_0801CF78[];
 extern const Gfx goomba_seg8_dl_0801D0D0[];
 extern const Gfx goomba_seg8_dl_0801D360[];
 extern const Gfx goomba_seg8_dl_0801D760[];
-extern const struct Animation *const goomba_seg8_anims_0801DA4C[];
+extern const struct AnimationTable goomba_seg8_anims_0801DA4C;

 // heart
 extern const GeoLayout heart_geo[];
--- a/actors/common1.h
+++ b/actors/common1.h
@ -10,19 +10,19 @@ extern const Gfx blue_fish_seg3_dl_0301BEC0[];
 extern const Gfx blue_fish_seg3_dl_0301BFB8[];
 extern const Gfx blue_fish_seg3_dl_0301C0A8[];
 extern const Gfx blue_fish_seg3_dl_0301C150[];
-extern const struct Animation *const blue_fish_seg3_anims_0301C2B0[];
+extern const struct AnimationTable blue_fish_seg3_anims_0301C2B0;

 // bowser_key
 extern const GeoLayout bowser_key_geo[];
 extern const GeoLayout bowser_key_cutscene_geo[];
 extern const Gfx bowser_key_dl[];
-extern const struct Animation *const bowser_key_seg3_anims_list[];
+extern const struct AnimationTable bowser_key_seg3_anims_list;

 // butterfly
 extern const GeoLayout butterfly_geo[];
 extern const Gfx butterfly_seg3_dl_03005408[];
 extern const Gfx butterfly_seg3_dl_030054A0[];
-extern const struct Animation *const butterfly_seg3_anims_030056B0[];
+extern const struct AnimationTable butterfly_seg3_anims_030056B0;

 // coin
 extern const GeoLayout yellow_coin_geo[];
@ -112,7 +112,7 @@ extern const Gfx door_seg3_dl_03015008[];
 extern const Gfx door_seg3_dl_03015078[];
 extern const Gfx door_seg3_dl_030150E8[];
 extern const Gfx door_seg3_dl_03015158[];
-extern const struct Animation *const door_seg3_anims_030156C0[];
+extern const struct AnimationTable door_seg3_anims_030156C0;

 // explosion
 extern const GeoLayout explosion_geo[];
--- a/actors/cyan_fish/anims/anim_0600E24C.inc.c
+++ b/actors/cyan_fish/anims/anim_0600E24C.inc.c
@ -45,4 +45,6 @@ static const struct Animation cyan_fish_seg6_anim_0600E24C = {
    cyan_fish_seg6_animvalue_0600E098,
    cyan_fish_seg6_animindex_0600E204,
    0,
+    ANIM_FIELD_LENGTH(cyan_fish_seg6_animvalue_0600E098),
+    ANIM_FIELD_LENGTH(cyan_fish_seg6_animindex_0600E204),
 };
--- a/actors/cyan_fish/anims/table.inc.c
+++ b/actors/cyan_fish/anims/table.inc.c
@ -1,6 +1,9 @@
 // 0x0600E264
-const struct Animation *const cyan_fish_seg6_anims_0600E264[] = {
-    &cyan_fish_seg6_anim_0600E24C,
-    NULL,
-    NULL,
+const struct AnimationTable cyan_fish_seg6_anims_0600E264 = {
+    .anims = {
+        &cyan_fish_seg6_anim_0600E24C,
+        NULL,
+        NULL,
+    },
+    .count = 1
 };
--- a/actors/door/anims/anim_03015208.inc.c
+++ b/actors/door/anims/anim_03015208.inc.c
@ -22,4 +22,6 @@ static const struct Animation door_seg3_anim_03015208 = {
    door_seg3_animvalue_030151C8,
    door_seg3_animindex_030151CC,
    0,
+    ANIM_FIELD_LENGTH(door_seg3_animvalue_030151C8),
+    ANIM_FIELD_LENGTH(door_seg3_animindex_030151CC),
 };
--- a/actors/door/anims/anim_03015440.inc.c
+++ b/actors/door/anims/anim_03015440.inc.c
@ -52,4 +52,6 @@ static const struct Animation door_seg3_anim_03015440 = {
    door_seg3_animvalue_03015220,
    door_seg3_animindex_03015404,
    0,
+    ANIM_FIELD_LENGTH(door_seg3_animvalue_03015220),
+    ANIM_FIELD_LENGTH(door_seg3_animindex_03015404),
 };
--- a/actors/door/anims/anim_03015458.inc.c
+++ b/actors/door/anims/anim_03015458.inc.c
@ -9,4 +9,6 @@ static const struct Animation door_seg3_anim_03015458 = {
    door_seg3_animvalue_03015220,
    door_seg3_animindex_03015404,
    0,
+    ANIM_FIELD_LENGTH(door_seg3_animvalue_03015220),
+    ANIM_FIELD_LENGTH(door_seg3_animindex_03015404),
 };
--- a/actors/door/anims/anim_03015690.inc.c
+++ b/actors/door/anims/anim_03015690.inc.c
@ -52,4 +52,6 @@ static const struct Animation door_seg3_anim_03015690 = {
    door_seg3_animvalue_03015470,
    door_seg3_animindex_03015654,
    0,
+    ANIM_FIELD_LENGTH(door_seg3_animvalue_03015470),
+    ANIM_FIELD_LENGTH(door_seg3_animindex_03015654),
 };
--- a/actors/door/anims/anim_030156A8.inc.c
+++ b/actors/door/anims/anim_030156A8.inc.c
@ -9,4 +9,6 @@ static const struct Animation door_seg3_anim_030156A8 = {
    door_seg3_animvalue_03015470,
    door_seg3_animindex_03015654,
    0,
+    ANIM_FIELD_LENGTH(door_seg3_animvalue_03015470),
+    ANIM_FIELD_LENGTH(door_seg3_animindex_03015654),
 };
--- a/actors/door/anims/table.inc.c
+++ b/actors/door/anims/table.inc.c
@ -1,9 +1,12 @@
 // 0x030156C0
-const struct Animation *const door_seg3_anims_030156C0[] = {
-    &door_seg3_anim_03015208,
-    &door_seg3_anim_03015440,
-    &door_seg3_anim_03015690,
-    &door_seg3_anim_03015458,
-    &door_seg3_anim_030156A8,
-    NULL,
+const struct AnimationTable door_seg3_anims_030156C0 = {
+    .anims = {
+        &door_seg3_anim_03015208,
+        &door_seg3_anim_03015440,
+        &door_seg3_anim_03015690,
+        &door_seg3_anim_03015458,
+        &door_seg3_anim_030156A8,
+        NULL,
+    },
+    .count = 5
 };
--- a/actors/dorrie/anims/anim_0600E18C.inc.c
+++ b/actors/dorrie/anims/anim_0600E18C.inc.c
@ -40,4 +40,6 @@ static const struct Animation dorrie_seg6_anim_0600E18C = {
    dorrie_seg6_animvalue_0600E060,
    dorrie_seg6_animindex_0600E0A8,
    0,
+    ANIM_FIELD_LENGTH(dorrie_seg6_animvalue_0600E060),
+    ANIM_FIELD_LENGTH(dorrie_seg6_animindex_0600E0A8),
 };
--- a/actors/dorrie/anims/anim_0600E9BC.inc.c
+++ b/actors/dorrie/anims/anim_0600E9BC.inc.c
@ -151,4 +151,6 @@ static const struct Animation dorrie_seg6_anim_0600E9BC = {
    dorrie_seg6_animvalue_0600E1A4,
    dorrie_seg6_animindex_0600E8D8,
    0,
+    ANIM_FIELD_LENGTH(dorrie_seg6_animvalue_0600E1A4),
+    ANIM_FIELD_LENGTH(dorrie_seg6_animindex_0600E8D8),
 };
--- a/actors/dorrie/anims/anim_0600F620.inc.c
+++ b/actors/dorrie/anims/anim_0600F620.inc.c
@ -218,4 +218,6 @@ static const struct Animation dorrie_seg6_anim_0600F620 = {
    dorrie_seg6_animvalue_0600E9D4,
    dorrie_seg6_animindex_0600F53C,
    0,
+    ANIM_FIELD_LENGTH(dorrie_seg6_animvalue_0600E9D4),
+    ANIM_FIELD_LENGTH(dorrie_seg6_animindex_0600F53C),
 };
--- a/actors/dorrie/anims/table.inc.c
+++ b/actors/dorrie/anims/table.inc.c
@ -1,6 +1,9 @@
 // 0x0600F638
-const struct Animation *const dorrie_seg6_anims_0600F638[] = {
-    &dorrie_seg6_anim_0600E18C,
-    &dorrie_seg6_anim_0600E9BC,
-    &dorrie_seg6_anim_0600F620,
+const struct AnimationTable dorrie_seg6_anims_0600F638 = {
+    .anims = {
+        &dorrie_seg6_anim_0600E18C,
+        &dorrie_seg6_anim_0600E9BC,
+        &dorrie_seg6_anim_0600F620,
+    },
+    .count = 3
 };
--- a/actors/eyerok/anims/anim_0500D270.inc.c
+++ b/actors/eyerok/anims/anim_0500D270.inc.c
@ -126,4 +126,6 @@ static const struct Animation eyerok_seg5_anim_0500D270 = {
    eyerok_seg5_animvalue_0500CC48,
    eyerok_seg5_animindex_0500D06C,
    0,
+    ANIM_FIELD_LENGTH(eyerok_seg5_animvalue_0500CC48),
+    ANIM_FIELD_LENGTH(eyerok_seg5_animindex_0500D06C),
 };
--- a/actors/eyerok/anims/anim_0500DF50.inc.c
+++ b/actors/eyerok/anims/anim_0500DF50.inc.c
@ -232,4 +232,6 @@ static const struct Animation eyerok_seg5_anim_0500DF50 = {
    eyerok_seg5_animvalue_0500D288,
    eyerok_seg5_animindex_0500DD4C,
    0,
+    ANIM_FIELD_LENGTH(eyerok_seg5_animvalue_0500D288),
+    ANIM_FIELD_LENGTH(eyerok_seg5_animindex_0500DD4C),
 };
--- a/actors/eyerok/anims/anim_0500E1D8.inc.c
+++ b/actors/eyerok/anims/anim_0500E1D8.inc.c
@ -66,4 +66,6 @@ static const struct Animation eyerok_seg5_anim_0500E1D8 = {
    eyerok_seg5_animvalue_0500DF68,
    eyerok_seg5_animindex_0500DFD4,
    0,
+    ANIM_FIELD_LENGTH(eyerok_seg5_animvalue_0500DF68),
+    ANIM_FIELD_LENGTH(eyerok_seg5_animindex_0500DFD4),
 };
--- a/actors/eyerok/anims/anim_0500E99C.inc.c
+++ b/actors/eyerok/anims/anim_0500E99C.inc.c
@ -150,4 +150,6 @@ static const struct Animation eyerok_seg5_anim_0500E99C = {
    eyerok_seg5_animvalue_0500E1F0,
    eyerok_seg5_animindex_0500E798,
    0,
+    ANIM_FIELD_LENGTH(eyerok_seg5_animvalue_0500E1F0),
+    ANIM_FIELD_LENGTH(eyerok_seg5_animindex_0500E798),
 };
--- a/actors/eyerok/anims/anim_0500F3D8.inc.c
+++ b/actors/eyerok/anims/anim_0500F3D8.inc.c
@ -190,6 +190,8 @@ static const struct Animation eyerok_seg5_anim_0500F3D8 = {
    eyerok_seg5_animvalue_0500E9B4,
    eyerok_seg5_animindex_0500F1D4,
    0,
+    ANIM_FIELD_LENGTH(eyerok_seg5_animvalue_0500E9B4),
+    ANIM_FIELD_LENGTH(eyerok_seg5_animindex_0500F1D4),
 };

 // Same entries as above
--- a/actors/eyerok/anims/anim_0500F3F0.inc.c
+++ b/actors/eyerok/anims/anim_0500F3F0.inc.c
@ -9,4 +9,6 @@ static const struct Animation eyerok_seg5_anim_0500F3F0 = {
    eyerok_seg5_animvalue_0500E9B4,
    eyerok_seg5_animindex_0500F1D4,
    0,
+    ANIM_FIELD_LENGTH(eyerok_seg5_animvalue_0500E9B4),
+    ANIM_FIELD_LENGTH(eyerok_seg5_animindex_0500F1D4),
 };
--- a/actors/eyerok/anims/anim_0500FCCC.inc.c
+++ b/actors/eyerok/anims/anim_0500FCCC.inc.c
@ -167,4 +167,6 @@ static const struct Animation eyerok_seg5_anim_0500FCCC = {
    eyerok_seg5_animvalue_0500F408,
    eyerok_seg5_animindex_0500FAC8,
    0,
+    ANIM_FIELD_LENGTH(eyerok_seg5_animvalue_0500F408),
+    ANIM_FIELD_LENGTH(eyerok_seg5_animindex_0500FAC8),
 };
--- a/actors/eyerok/anims/anim_050116CC.inc.c
+++ b/actors/eyerok/anims/anim_050116CC.inc.c
@ -442,4 +442,6 @@ static const struct Animation eyerok_seg5_anim_050116CC = {
    eyerok_seg5_animvalue_0500FCE4,
    eyerok_seg5_animindex_050114C8,
    0,
+    ANIM_FIELD_LENGTH(eyerok_seg5_animvalue_0500FCE4),
+    ANIM_FIELD_LENGTH(eyerok_seg5_animindex_050114C8),
 };
--- a/Show More
+++ b/Show More