From 9b26bd68ad1c79badce3acaf47fff2016c52fd2f Mon Sep 17 00:00:00 2001
From: Ethan Roseman <ethteck@gmail.com>
Date: Sun, 8 Nov 2020 14:02:08 -0500
Subject: [PATCH] more syms

---
 .../AddAnimModelPosition.s                    |  4 +--
 .../ChangeModelAnimation.s                    |  4 +--
 .../GetAnimModelPosition.s                    |  4 +--
 .../code_ef070_len_3400/LoadModelAnimation.s  |  4 +--
 .../code_ef070_len_3400/PlayModelAnimation.s  |  4 +--
 .../SetAnimModelPosition.s                    |  4 +--
 .../SetAnimModelRotation.s                    |  4 +--
 .../code_ef070_len_3400/SetAnimModelScale.s   |  4 +--
 .../code_ef070_len_3400/draw_anim_models.s    |  4 +--
 .../code_ef070_len_3400/func_802CCAC0.s       |  4 +--
 .../code_ef070_len_3400/func_802CCCB0.s       | 12 ++++-----
 .../code_ef070_len_3400/func_802CCDAC.s       |  4 +--
 .../code_ef070_len_3400/func_802CCEDC.s       |  4 +--
 .../code_ef070_len_3400/func_802CD348.s       |  4 +--
 .../code_ef070_len_3400/func_802CD3C0.s       | 26 -------------------
 .../code_ef070_len_3400/func_802CD418.s       |  4 +--
 .../code_ef070_len_3400/func_802CD4B4.s       | 20 +++++++-------
 .../code_ef070_len_3400/func_802CD57C.s       | 16 ++++++------
 .../code_ef070_len_3400/func_802CD5C0.s       |  4 +--
 .../code_ef070_len_3400/func_802CD6E0.s       |  4 +--
 .../code_ef070_len_3400/func_802CD7D8.s       |  4 +--
 .../code_ef070_len_3400/func_802CD8F8.s       |  4 +--
 .../code_ef070_len_3400/func_802CD9F0.s       |  4 +--
 include/variables.h                           |  4 ++-
 src/code_ef070_len_3400.c                     |  8 +++++-
 tools/symbol_addrs.txt                        |  4 ++-
 undefined_syms.txt                            |  5 +++-
 27 files changed, 79 insertions(+), 92 deletions(-)
 delete mode 100644 asm/nonmatchings/code_ef070_len_3400/func_802CD3C0.s

diff --git a/asm/nonmatchings/code_ef070_len_3400/AddAnimModelPosition.s b/asm/nonmatchings/code_ef070_len_3400/AddAnimModelPosition.s
index 0ac33d097c..e15b9635a8 100644
--- a/asm/nonmatchings/code_ef070_len_3400/AddAnimModelPosition.s
+++ b/asm/nonmatchings/code_ef070_len_3400/AddAnimModelPosition.s
@@ -28,8 +28,8 @@ glabel AddAnimModelPosition
 /* F1B38 802CD188 8E050000 */  lw        $a1, ($s0)
 /* F1B3C 802CD18C 0C0B210B */  jal       get_float_variable
 /* F1B40 802CD190 46000506 */   mov.s    $f20, $f0
-/* F1B44 802CD194 3C02802E */  lui       $v0, %hi(gAnimatedMeshesPtr)
-/* F1B48 802CD198 8C42AE30 */  lw        $v0, %lo(gAnimatedMeshesPtr)($v0)
+/* F1B44 802CD194 3C02802E */  lui       $v0, %hi(gMeshAnimationsPtr)
+/* F1B48 802CD198 8C42AE30 */  lw        $v0, %lo(gMeshAnimationsPtr)($v0)
 /* F1B4C 802CD19C 00118880 */  sll       $s1, $s1, 2
 /* F1B50 802CD1A0 02228821 */  addu      $s1, $s1, $v0
 /* F1B54 802CD1A4 8E230000 */  lw        $v1, ($s1)
diff --git a/asm/nonmatchings/code_ef070_len_3400/ChangeModelAnimation.s b/asm/nonmatchings/code_ef070_len_3400/ChangeModelAnimation.s
index 506cfc35ec..95501cdc38 100644
--- a/asm/nonmatchings/code_ef070_len_3400/ChangeModelAnimation.s
+++ b/asm/nonmatchings/code_ef070_len_3400/ChangeModelAnimation.s
@@ -15,8 +15,8 @@ glabel ChangeModelAnimation
 /* F1944 802CCF94 8E050000 */  lw        $a1, ($s0)
 /* F1948 802CCF98 0C0B1EAF */  jal       get_variable
 /* F194C 802CCF9C 0040802D */   daddu    $s0, $v0, $zero
-/* F1950 802CCFA0 3C03802E */  lui       $v1, %hi(gAnimatedMeshesPtr)
-/* F1954 802CCFA4 8C63AE30 */  lw        $v1, %lo(gAnimatedMeshesPtr)($v1)
+/* F1950 802CCFA0 3C03802E */  lui       $v1, %hi(gMeshAnimationsPtr)
+/* F1954 802CCFA4 8C63AE30 */  lw        $v1, %lo(gMeshAnimationsPtr)($v1)
 /* F1958 802CCFA8 00108080 */  sll       $s0, $s0, 2
 /* F195C 802CCFAC 02038021 */  addu      $s0, $s0, $v1
 /* F1960 802CCFB0 8E100000 */  lw        $s0, ($s0)
diff --git a/asm/nonmatchings/code_ef070_len_3400/GetAnimModelPosition.s b/asm/nonmatchings/code_ef070_len_3400/GetAnimModelPosition.s
index ca442837e9..0e0531b8cb 100644
--- a/asm/nonmatchings/code_ef070_len_3400/GetAnimModelPosition.s
+++ b/asm/nonmatchings/code_ef070_len_3400/GetAnimModelPosition.s
@@ -15,8 +15,8 @@ glabel GetAnimModelPosition
 /* F1A68 802CD0B8 26100004 */   addiu    $s0, $s0, 4
 /* F1A6C 802CD0BC 8E050000 */  lw        $a1, ($s0)
 /* F1A70 802CD0C0 26100004 */  addiu     $s0, $s0, 4
-/* F1A74 802CD0C4 3C03802E */  lui       $v1, %hi(gAnimatedMeshesPtr)
-/* F1A78 802CD0C8 8C63AE30 */  lw        $v1, %lo(gAnimatedMeshesPtr)($v1)
+/* F1A74 802CD0C4 3C03802E */  lui       $v1, %hi(gMeshAnimationsPtr)
+/* F1A78 802CD0C8 8C63AE30 */  lw        $v1, %lo(gMeshAnimationsPtr)($v1)
 /* F1A7C 802CD0CC 00021080 */  sll       $v0, $v0, 2
 /* F1A80 802CD0D0 00431021 */  addu      $v0, $v0, $v1
 /* F1A84 802CD0D4 8C510000 */  lw        $s1, ($v0)
diff --git a/asm/nonmatchings/code_ef070_len_3400/LoadModelAnimation.s b/asm/nonmatchings/code_ef070_len_3400/LoadModelAnimation.s
index 8dfce044bb..e90ceb5086 100644
--- a/asm/nonmatchings/code_ef070_len_3400/LoadModelAnimation.s
+++ b/asm/nonmatchings/code_ef070_len_3400/LoadModelAnimation.s
@@ -17,8 +17,8 @@ glabel LoadModelAnimation
 /* F16CC 802CCD1C 0C0B1EAF */  jal       get_variable
 /* F16D0 802CCD20 0040802D */   daddu    $s0, $v0, $zero
 /* F16D4 802CCD24 0040902D */  daddu     $s2, $v0, $zero
-/* F16D8 802CCD28 3C02802E */  lui       $v0, %hi(gAnimatedMeshesPtr)
-/* F16DC 802CCD2C 8C42AE30 */  lw        $v0, %lo(gAnimatedMeshesPtr)($v0)
+/* F16D8 802CCD28 3C02802E */  lui       $v0, %hi(gMeshAnimationsPtr)
+/* F16DC 802CCD2C 8C42AE30 */  lw        $v0, %lo(gMeshAnimationsPtr)($v0)
 /* F16E0 802CCD30 00108080 */  sll       $s0, $s0, 2
 /* F16E4 802CCD34 02028021 */  addu      $s0, $s0, $v0
 /* F16E8 802CCD38 8E100000 */  lw        $s0, ($s0)
diff --git a/asm/nonmatchings/code_ef070_len_3400/PlayModelAnimation.s b/asm/nonmatchings/code_ef070_len_3400/PlayModelAnimation.s
index 689c4fce49..97ef37dc7d 100644
--- a/asm/nonmatchings/code_ef070_len_3400/PlayModelAnimation.s
+++ b/asm/nonmatchings/code_ef070_len_3400/PlayModelAnimation.s
@@ -15,8 +15,8 @@ glabel PlayModelAnimation
 /* F1844 802CCE94 8E050000 */  lw        $a1, ($s0)
 /* F1848 802CCE98 0C0B1EAF */  jal       get_variable
 /* F184C 802CCE9C 0040802D */   daddu    $s0, $v0, $zero
-/* F1850 802CCEA0 3C03802E */  lui       $v1, %hi(gAnimatedMeshesPtr)
-/* F1854 802CCEA4 8C63AE30 */  lw        $v1, %lo(gAnimatedMeshesPtr)($v1)
+/* F1850 802CCEA0 3C03802E */  lui       $v1, %hi(gMeshAnimationsPtr)
+/* F1854 802CCEA4 8C63AE30 */  lw        $v1, %lo(gMeshAnimationsPtr)($v1)
 /* F1858 802CCEA8 00108080 */  sll       $s0, $s0, 2
 /* F185C 802CCEAC 02038021 */  addu      $s0, $s0, $v1
 /* F1860 802CCEB0 8E030000 */  lw        $v1, ($s0)
diff --git a/asm/nonmatchings/code_ef070_len_3400/SetAnimModelPosition.s b/asm/nonmatchings/code_ef070_len_3400/SetAnimModelPosition.s
index f4c9789ee1..97a00c7918 100644
--- a/asm/nonmatchings/code_ef070_len_3400/SetAnimModelPosition.s
+++ b/asm/nonmatchings/code_ef070_len_3400/SetAnimModelPosition.s
@@ -28,8 +28,8 @@ glabel SetAnimModelPosition
 /* F19F0 802CD040 8E050000 */  lw        $a1, ($s0)
 /* F19F4 802CD044 0C0B210B */  jal       get_float_variable
 /* F19F8 802CD048 46000506 */   mov.s    $f20, $f0
-/* F19FC 802CD04C 3C02802E */  lui       $v0, %hi(gAnimatedMeshesPtr)
-/* F1A00 802CD050 8C42AE30 */  lw        $v0, %lo(gAnimatedMeshesPtr)($v0)
+/* F19FC 802CD04C 3C02802E */  lui       $v0, %hi(gMeshAnimationsPtr)
+/* F1A00 802CD050 8C42AE30 */  lw        $v0, %lo(gMeshAnimationsPtr)($v0)
 /* F1A04 802CD054 00118880 */  sll       $s1, $s1, 2
 /* F1A08 802CD058 02228821 */  addu      $s1, $s1, $v0
 /* F1A0C 802CD05C 8E230000 */  lw        $v1, ($s1)
diff --git a/asm/nonmatchings/code_ef070_len_3400/SetAnimModelRotation.s b/asm/nonmatchings/code_ef070_len_3400/SetAnimModelRotation.s
index 515d4a83a5..30fe94eae5 100644
--- a/asm/nonmatchings/code_ef070_len_3400/SetAnimModelRotation.s
+++ b/asm/nonmatchings/code_ef070_len_3400/SetAnimModelRotation.s
@@ -28,8 +28,8 @@ glabel SetAnimModelRotation
 /* F1BFC 802CD24C 8E050000 */  lw        $a1, ($s0)
 /* F1C00 802CD250 0C0B210B */  jal       get_float_variable
 /* F1C04 802CD254 46000506 */   mov.s    $f20, $f0
-/* F1C08 802CD258 3C02802E */  lui       $v0, %hi(gAnimatedMeshesPtr)
-/* F1C0C 802CD25C 8C42AE30 */  lw        $v0, %lo(gAnimatedMeshesPtr)($v0)
+/* F1C08 802CD258 3C02802E */  lui       $v0, %hi(gMeshAnimationsPtr)
+/* F1C0C 802CD25C 8C42AE30 */  lw        $v0, %lo(gMeshAnimationsPtr)($v0)
 /* F1C10 802CD260 00118880 */  sll       $s1, $s1, 2
 /* F1C14 802CD264 02228821 */  addu      $s1, $s1, $v0
 /* F1C18 802CD268 8E230000 */  lw        $v1, ($s1)
diff --git a/asm/nonmatchings/code_ef070_len_3400/SetAnimModelScale.s b/asm/nonmatchings/code_ef070_len_3400/SetAnimModelScale.s
index d344d5709f..4284ac469a 100644
--- a/asm/nonmatchings/code_ef070_len_3400/SetAnimModelScale.s
+++ b/asm/nonmatchings/code_ef070_len_3400/SetAnimModelScale.s
@@ -28,8 +28,8 @@ glabel SetAnimModelScale
 /* F1CA8 802CD2F8 8E050000 */  lw        $a1, ($s0)
 /* F1CAC 802CD2FC 0C0B210B */  jal       get_float_variable
 /* F1CB0 802CD300 46000506 */   mov.s    $f20, $f0
-/* F1CB4 802CD304 3C02802E */  lui       $v0, %hi(gAnimatedMeshesPtr)
-/* F1CB8 802CD308 8C42AE30 */  lw        $v0, %lo(gAnimatedMeshesPtr)($v0)
+/* F1CB4 802CD304 3C02802E */  lui       $v0, %hi(gMeshAnimationsPtr)
+/* F1CB8 802CD308 8C42AE30 */  lw        $v0, %lo(gMeshAnimationsPtr)($v0)
 /* F1CBC 802CD30C 00118880 */  sll       $s1, $s1, 2
 /* F1CC0 802CD310 02228821 */  addu      $s1, $s1, $v0
 /* F1CC4 802CD314 8E230000 */  lw        $v1, ($s1)
diff --git a/asm/nonmatchings/code_ef070_len_3400/draw_anim_models.s b/asm/nonmatchings/code_ef070_len_3400/draw_anim_models.s
index bfe5be11ce..6fbf7df9e1 100644
--- a/asm/nonmatchings/code_ef070_len_3400/draw_anim_models.s
+++ b/asm/nonmatchings/code_ef070_len_3400/draw_anim_models.s
@@ -28,8 +28,8 @@ glabel draw_anim_models
 /* F1524 802CCB74 AFB00220 */  sw        $s0, 0x220($sp)
 /* F1528 802CCB78 AFA80218 */  sw        $t0, 0x218($sp)
 .L802CCB7C:
-/* F152C 802CCB7C 3C02802E */  lui       $v0, %hi(gAnimatedMeshesPtr)
-/* F1530 802CCB80 8C42AE30 */  lw        $v0, %lo(gAnimatedMeshesPtr)($v0)
+/* F152C 802CCB7C 3C02802E */  lui       $v0, %hi(gMeshAnimationsPtr)
+/* F1530 802CCB80 8C42AE30 */  lw        $v0, %lo(gMeshAnimationsPtr)($v0)
 /* F1534 802CCB84 00131880 */  sll       $v1, $s3, 2
 /* F1538 802CCB88 00621821 */  addu      $v1, $v1, $v0
 /* F153C 802CCB8C 8C710000 */  lw        $s1, ($v1)
diff --git a/asm/nonmatchings/code_ef070_len_3400/func_802CCAC0.s b/asm/nonmatchings/code_ef070_len_3400/func_802CCAC0.s
index 415a1da8fb..01562b94be 100644
--- a/asm/nonmatchings/code_ef070_len_3400/func_802CCAC0.s
+++ b/asm/nonmatchings/code_ef070_len_3400/func_802CCAC0.s
@@ -7,8 +7,8 @@ glabel func_802CCAC0
 /* F1478 802CCAC8 0000802D */  daddu     $s0, $zero, $zero
 /* F147C 802CCACC AFBF0014 */  sw        $ra, 0x14($sp)
 .L802CCAD0:
-/* F1480 802CCAD0 3C03802E */  lui       $v1, %hi(gAnimatedMeshesPtr)
-/* F1484 802CCAD4 8C63AE30 */  lw        $v1, %lo(gAnimatedMeshesPtr)($v1)
+/* F1480 802CCAD0 3C03802E */  lui       $v1, %hi(gMeshAnimationsPtr)
+/* F1484 802CCAD4 8C63AE30 */  lw        $v1, %lo(gMeshAnimationsPtr)($v1)
 /* F1488 802CCAD8 00101080 */  sll       $v0, $s0, 2
 /* F148C 802CCADC 00431021 */  addu      $v0, $v0, $v1
 /* F1490 802CCAE0 8C420000 */  lw        $v0, ($v0)
diff --git a/asm/nonmatchings/code_ef070_len_3400/func_802CCCB0.s b/asm/nonmatchings/code_ef070_len_3400/func_802CCCB0.s
index 843e352f97..fc4a3981d0 100644
--- a/asm/nonmatchings/code_ef070_len_3400/func_802CCCB0.s
+++ b/asm/nonmatchings/code_ef070_len_3400/func_802CCCB0.s
@@ -7,15 +7,15 @@ glabel func_802CCCB0
 /* F1668 802CCCB8 80420070 */  lb        $v0, 0x70($v0)
 /* F166C 802CCCBC 14400005 */  bnez      $v0, .L802CCCD4
 /* F1670 802CCCC0 00000000 */   nop      
-/* F1674 802CCCC4 3C02802E */  lui       $v0, 0x802e
-/* F1678 802CCCC8 2442ADF0 */  addiu     $v0, $v0, -0x5210
+/* F1674 802CCCC4 3C02802E */  lui       $v0, %hi(gWorldMeshAnimations)
+/* F1678 802CCCC8 2442ADF0 */  addiu     $v0, $v0, %lo(gWorldMeshAnimations)
 /* F167C 802CCCCC 080B3337 */  j         .L802CCCDC
 /* F1680 802CCCD0 00000000 */   nop      
 .L802CCCD4:
-/* F1684 802CCCD4 3C02802E */  lui       $v0, 0x802e
-/* F1688 802CCCD8 2442ADB0 */  addiu     $v0, $v0, -0x5250
+/* F1684 802CCCD4 3C02802E */  lui       $v0, %hi(gBattleMeshAnimations)
+/* F1688 802CCCD8 2442ADB0 */  addiu     $v0, $v0, %lo(gBattleMeshAnimations)
 .L802CCCDC:
-/* F168C 802CCCDC 3C01802E */  lui       $at, %hi(gAnimatedMeshesPtr)
-/* F1690 802CCCE0 AC22AE30 */  sw        $v0, %lo(gAnimatedMeshesPtr)($at)
+/* F168C 802CCCDC 3C01802E */  lui       $at, %hi(gMeshAnimationsPtr)
+/* F1690 802CCCE0 AC22AE30 */  sw        $v0, %lo(gMeshAnimationsPtr)($at)
 /* F1694 802CCCE4 03E00008 */  jr        $ra
 /* F1698 802CCCE8 24020002 */   addiu    $v0, $zero, 2
diff --git a/asm/nonmatchings/code_ef070_len_3400/func_802CCDAC.s b/asm/nonmatchings/code_ef070_len_3400/func_802CCDAC.s
index 190f75001e..92ccddbbba 100644
--- a/asm/nonmatchings/code_ef070_len_3400/func_802CCDAC.s
+++ b/asm/nonmatchings/code_ef070_len_3400/func_802CCDAC.s
@@ -17,8 +17,8 @@ glabel func_802CCDAC
 /* F178C 802CCDDC 0C0B1EAF */  jal       get_variable
 /* F1790 802CCDE0 0040802D */   daddu    $s0, $v0, $zero
 /* F1794 802CCDE4 0040902D */  daddu     $s2, $v0, $zero
-/* F1798 802CCDE8 3C02802E */  lui       $v0, %hi(gAnimatedMeshesPtr)
-/* F179C 802CCDEC 8C42AE30 */  lw        $v0, %lo(gAnimatedMeshesPtr)($v0)
+/* F1798 802CCDE8 3C02802E */  lui       $v0, %hi(gMeshAnimationsPtr)
+/* F179C 802CCDEC 8C42AE30 */  lw        $v0, %lo(gMeshAnimationsPtr)($v0)
 /* F17A0 802CCDF0 00108080 */  sll       $s0, $s0, 2
 /* F17A4 802CCDF4 02028021 */  addu      $s0, $s0, $v0
 /* F17A8 802CCDF8 8E100000 */  lw        $s0, ($s0)
diff --git a/asm/nonmatchings/code_ef070_len_3400/func_802CCEDC.s b/asm/nonmatchings/code_ef070_len_3400/func_802CCEDC.s
index 3ad5040621..cd06f9f31f 100644
--- a/asm/nonmatchings/code_ef070_len_3400/func_802CCEDC.s
+++ b/asm/nonmatchings/code_ef070_len_3400/func_802CCEDC.s
@@ -21,8 +21,8 @@ glabel func_802CCEDC
 /* F18CC 802CCF1C 8E050000 */  lw        $a1, ($s0)
 /* F18D0 802CCF20 0C0B1EAF */  jal       get_variable
 /* F18D4 802CCF24 0040802D */   daddu    $s0, $v0, $zero
-/* F18D8 802CCF28 3C03802E */  lui       $v1, %hi(gAnimatedMeshesPtr)
-/* F18DC 802CCF2C 8C63AE30 */  lw        $v1, %lo(gAnimatedMeshesPtr)($v1)
+/* F18D8 802CCF28 3C03802E */  lui       $v1, %hi(gMeshAnimationsPtr)
+/* F18DC 802CCF2C 8C63AE30 */  lw        $v1, %lo(gMeshAnimationsPtr)($v1)
 /* F18E0 802CCF30 00118880 */  sll       $s1, $s1, 2
 /* F18E4 802CCF34 02238821 */  addu      $s1, $s1, $v1
 /* F18E8 802CCF38 8E230000 */  lw        $v1, ($s1)
diff --git a/asm/nonmatchings/code_ef070_len_3400/func_802CD348.s b/asm/nonmatchings/code_ef070_len_3400/func_802CD348.s
index 5de604dcfb..ebb2f3d1cc 100644
--- a/asm/nonmatchings/code_ef070_len_3400/func_802CD348.s
+++ b/asm/nonmatchings/code_ef070_len_3400/func_802CD348.s
@@ -15,8 +15,8 @@ glabel func_802CD348
 /* F1D20 802CD370 8E050000 */  lw        $a1, ($s0)
 /* F1D24 802CD374 0C0B210B */  jal       get_float_variable
 /* F1D28 802CD378 0040802D */   daddu    $s0, $v0, $zero
-/* F1D2C 802CD37C 3C02802E */  lui       $v0, %hi(gAnimatedMeshesPtr)
-/* F1D30 802CD380 8C42AE30 */  lw        $v0, %lo(gAnimatedMeshesPtr)($v0)
+/* F1D2C 802CD37C 3C02802E */  lui       $v0, %hi(gMeshAnimationsPtr)
+/* F1D30 802CD380 8C42AE30 */  lw        $v0, %lo(gMeshAnimationsPtr)($v0)
 /* F1D34 802CD384 00108080 */  sll       $s0, $s0, 2
 /* F1D38 802CD388 02028021 */  addu      $s0, $s0, $v0
 /* F1D3C 802CD38C 8E020000 */  lw        $v0, ($s0)
diff --git a/asm/nonmatchings/code_ef070_len_3400/func_802CD3C0.s b/asm/nonmatchings/code_ef070_len_3400/func_802CD3C0.s
deleted file mode 100644
index 99c9f226a4..0000000000
--- a/asm/nonmatchings/code_ef070_len_3400/func_802CD3C0.s
+++ /dev/null
@@ -1,26 +0,0 @@
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-
-glabel func_802CD3C0
-/* F1D70 802CD3C0 27BDFFE8 */  addiu     $sp, $sp, -0x18
-/* F1D74 802CD3C4 AFBF0014 */  sw        $ra, 0x14($sp)
-/* F1D78 802CD3C8 AFB00010 */  sw        $s0, 0x10($sp)
-/* F1D7C 802CD3CC 8C82000C */  lw        $v0, 0xc($a0)
-/* F1D80 802CD3D0 0C0B1EAF */  jal       get_variable
-/* F1D84 802CD3D4 8C450000 */   lw       $a1, ($v0)
-/* F1D88 802CD3D8 3C03802E */  lui       $v1, %hi(gAnimatedMeshesPtr)
-/* F1D8C 802CD3DC 8C63AE30 */  lw        $v1, %lo(gAnimatedMeshesPtr)($v1)
-/* F1D90 802CD3E0 00021080 */  sll       $v0, $v0, 2
-/* F1D94 802CD3E4 00431021 */  addu      $v0, $v0, $v1
-/* F1D98 802CD3E8 8C500000 */  lw        $s0, ($v0)
-/* F1D9C 802CD3EC 0C047FF8 */  jal       func_8011FFE0
-/* F1DA0 802CD3F0 8E040000 */   lw       $a0, ($s0)
-/* F1DA4 802CD3F4 0C04790E */  jal       func_8011E438
-/* F1DA8 802CD3F8 0040202D */   daddu    $a0, $v0, $zero
-/* F1DAC 802CD3FC 2403FFFF */  addiu     $v1, $zero, -1
-/* F1DB0 802CD400 AE030000 */  sw        $v1, ($s0)
-/* F1DB4 802CD404 8FBF0014 */  lw        $ra, 0x14($sp)
-/* F1DB8 802CD408 8FB00010 */  lw        $s0, 0x10($sp)
-/* F1DBC 802CD40C 24020002 */  addiu     $v0, $zero, 2
-/* F1DC0 802CD410 03E00008 */  jr        $ra
-/* F1DC4 802CD414 27BD0018 */   addiu    $sp, $sp, 0x18
diff --git a/asm/nonmatchings/code_ef070_len_3400/func_802CD418.s b/asm/nonmatchings/code_ef070_len_3400/func_802CD418.s
index 6b7ec0c39a..56eaf7f3f8 100644
--- a/asm/nonmatchings/code_ef070_len_3400/func_802CD418.s
+++ b/asm/nonmatchings/code_ef070_len_3400/func_802CD418.s
@@ -17,8 +17,8 @@ glabel func_802CD418
 /* F1DF8 802CD448 8E120000 */  lw        $s2, ($s0)
 /* F1DFC 802CD44C 0C0B1EAF */  jal       get_variable
 /* F1E00 802CD450 0040882D */   daddu    $s1, $v0, $zero
-/* F1E04 802CD454 3C03802E */  lui       $v1, %hi(gAnimatedMeshesPtr)
-/* F1E08 802CD458 8C63AE30 */  lw        $v1, %lo(gAnimatedMeshesPtr)($v1)
+/* F1E04 802CD454 3C03802E */  lui       $v1, %hi(gMeshAnimationsPtr)
+/* F1E08 802CD458 8C63AE30 */  lw        $v1, %lo(gMeshAnimationsPtr)($v1)
 /* F1E0C 802CD45C 00118880 */  sll       $s1, $s1, 2
 /* F1E10 802CD460 02238821 */  addu      $s1, $s1, $v1
 /* F1E14 802CD464 8E230000 */  lw        $v1, ($s1)
diff --git a/asm/nonmatchings/code_ef070_len_3400/func_802CD4B4.s b/asm/nonmatchings/code_ef070_len_3400/func_802CD4B4.s
index 17fac9a61d..ff00bc5b1b 100644
--- a/asm/nonmatchings/code_ef070_len_3400/func_802CD4B4.s
+++ b/asm/nonmatchings/code_ef070_len_3400/func_802CD4B4.s
@@ -12,24 +12,24 @@ glabel func_802CD4B4
 /* F1E80 802CD4D0 80420070 */  lb        $v0, 0x70($v0)
 /* F1E84 802CD4D4 14400005 */  bnez      $v0, .L802CD4EC
 /* F1E88 802CD4D8 00000000 */   nop      
-/* F1E8C 802CD4DC 3C02802E */  lui       $v0, 0x802e
-/* F1E90 802CD4E0 2442ADF0 */  addiu     $v0, $v0, -0x5210
+/* F1E8C 802CD4DC 3C02802E */  lui       $v0, %hi(gWorldMeshAnimations)
+/* F1E90 802CD4E0 2442ADF0 */  addiu     $v0, $v0, %lo(gWorldMeshAnimations)
 /* F1E94 802CD4E4 080B353D */  j         .L802CD4F4
 /* F1E98 802CD4E8 00000000 */   nop      
 .L802CD4EC:
-/* F1E9C 802CD4EC 3C02802E */  lui       $v0, 0x802e
-/* F1EA0 802CD4F0 2442ADB0 */  addiu     $v0, $v0, -0x5250
+/* F1E9C 802CD4EC 3C02802E */  lui       $v0, %hi(gBattleMeshAnimations)
+/* F1EA0 802CD4F0 2442ADB0 */  addiu     $v0, $v0, %lo(gBattleMeshAnimations)
 .L802CD4F4:
-/* F1EA4 802CD4F4 3C01802E */  lui       $at, %hi(gAnimatedMeshesPtr)
-/* F1EA8 802CD4F8 AC22AE30 */  sw        $v0, %lo(gAnimatedMeshesPtr)($at)
+/* F1EA4 802CD4F4 3C01802E */  lui       $at, %hi(gMeshAnimationsPtr)
+/* F1EA8 802CD4F8 AC22AE30 */  sw        $v0, %lo(gMeshAnimationsPtr)($at)
 /* F1EAC 802CD4FC 0000882D */  daddu     $s1, $zero, $zero
 /* F1EB0 802CD500 2412FFFF */  addiu     $s2, $zero, -1
 /* F1EB4 802CD504 0220802D */  daddu     $s0, $s1, $zero
 .L802CD508:
 /* F1EB8 802CD508 0C00AB39 */  jal       heap_malloc
 /* F1EBC 802CD50C 24040070 */   addiu    $a0, $zero, 0x70
-/* F1EC0 802CD510 3C03802E */  lui       $v1, %hi(gAnimatedMeshesPtr)
-/* F1EC4 802CD514 8C63AE30 */  lw        $v1, %lo(gAnimatedMeshesPtr)($v1)
+/* F1EC0 802CD510 3C03802E */  lui       $v1, %hi(gMeshAnimationsPtr)
+/* F1EC4 802CD514 8C63AE30 */  lw        $v1, %lo(gMeshAnimationsPtr)($v1)
 /* F1EC8 802CD518 02031821 */  addu      $v1, $s0, $v1
 /* F1ECC 802CD51C 14400003 */  bnez      $v0, .L802CD52C
 /* F1ED0 802CD520 AC620000 */   sw       $v0, ($v1)
@@ -37,8 +37,8 @@ glabel func_802CD4B4
 /* F1ED4 802CD524 080B3549 */  j         .L802CD524
 /* F1ED8 802CD528 00000000 */   nop      
 .L802CD52C:
-/* F1EDC 802CD52C 3C02802E */  lui       $v0, %hi(gAnimatedMeshesPtr)
-/* F1EE0 802CD530 8C42AE30 */  lw        $v0, %lo(gAnimatedMeshesPtr)($v0)
+/* F1EDC 802CD52C 3C02802E */  lui       $v0, %hi(gMeshAnimationsPtr)
+/* F1EE0 802CD530 8C42AE30 */  lw        $v0, %lo(gMeshAnimationsPtr)($v0)
 /* F1EE4 802CD534 26310001 */  addiu     $s1, $s1, 1
 /* F1EE8 802CD538 02021021 */  addu      $v0, $s0, $v0
 /* F1EEC 802CD53C 8C420000 */  lw        $v0, ($v0)
diff --git a/asm/nonmatchings/code_ef070_len_3400/func_802CD57C.s b/asm/nonmatchings/code_ef070_len_3400/func_802CD57C.s
index f7a235528e..ef7a07845b 100644
--- a/asm/nonmatchings/code_ef070_len_3400/func_802CD57C.s
+++ b/asm/nonmatchings/code_ef070_len_3400/func_802CD57C.s
@@ -7,16 +7,16 @@ glabel func_802CD57C
 /* F1F34 802CD584 80420070 */  lb        $v0, 0x70($v0)
 /* F1F38 802CD588 14400007 */  bnez      $v0, .L802CD5A8
 /* F1F3C 802CD58C 00000000 */   nop      
-/* F1F40 802CD590 3C02802E */  lui       $v0, 0x802e
-/* F1F44 802CD594 2442ADF0 */  addiu     $v0, $v0, -0x5210
-/* F1F48 802CD598 3C01802E */  lui       $at, %hi(gAnimatedMeshesPtr)
-/* F1F4C 802CD59C AC22AE30 */  sw        $v0, %lo(gAnimatedMeshesPtr)($at)
+/* F1F40 802CD590 3C02802E */  lui       $v0, %hi(gWorldMeshAnimations)
+/* F1F44 802CD594 2442ADF0 */  addiu     $v0, $v0, %lo(gWorldMeshAnimations)
+/* F1F48 802CD598 3C01802E */  lui       $at, %hi(gMeshAnimationsPtr)
+/* F1F4C 802CD59C AC22AE30 */  sw        $v0, %lo(gMeshAnimationsPtr)($at)
 /* F1F50 802CD5A0 03E00008 */  jr        $ra
 /* F1F54 802CD5A4 00000000 */   nop      
 .L802CD5A8:
-/* F1F58 802CD5A8 3C02802E */  lui       $v0, 0x802e
-/* F1F5C 802CD5AC 2442ADB0 */  addiu     $v0, $v0, -0x5250
-/* F1F60 802CD5B0 3C01802E */  lui       $at, %hi(gAnimatedMeshesPtr)
-/* F1F64 802CD5B4 AC22AE30 */  sw        $v0, %lo(gAnimatedMeshesPtr)($at)
+/* F1F58 802CD5A8 3C02802E */  lui       $v0, %hi(gBattleMeshAnimations)
+/* F1F5C 802CD5AC 2442ADB0 */  addiu     $v0, $v0, %lo(gBattleMeshAnimations)
+/* F1F60 802CD5B0 3C01802E */  lui       $at, %hi(gMeshAnimationsPtr)
+/* F1F64 802CD5B4 AC22AE30 */  sw        $v0, %lo(gMeshAnimationsPtr)($at)
 /* F1F68 802CD5B8 03E00008 */  jr        $ra
 /* F1F6C 802CD5BC 00000000 */   nop      
diff --git a/asm/nonmatchings/code_ef070_len_3400/func_802CD5C0.s b/asm/nonmatchings/code_ef070_len_3400/func_802CD5C0.s
index 85b1d66239..e30d159494 100644
--- a/asm/nonmatchings/code_ef070_len_3400/func_802CD5C0.s
+++ b/asm/nonmatchings/code_ef070_len_3400/func_802CD5C0.s
@@ -23,8 +23,8 @@ glabel func_802CD5C0
 /* F1FB8 802CD608 00118880 */  sll       $s1, $s1, 2
 /* F1FBC 802CD60C 8E140000 */  lw        $s4, ($s0)
 /* F1FC0 802CD610 26100004 */  addiu     $s0, $s0, 4
-/* F1FC4 802CD614 3C03802E */  lui       $v1, %hi(gAnimatedMeshesPtr)
-/* F1FC8 802CD618 8C63AE30 */  lw        $v1, %lo(gAnimatedMeshesPtr)($v1)
+/* F1FC4 802CD614 3C03802E */  lui       $v1, %hi(gMeshAnimationsPtr)
+/* F1FC8 802CD618 8C63AE30 */  lw        $v1, %lo(gMeshAnimationsPtr)($v1)
 /* F1FCC 802CD61C 8E150000 */  lw        $s5, ($s0)
 /* F1FD0 802CD620 02238821 */  addu      $s1, $s1, $v1
 /* F1FD4 802CD624 8E330000 */  lw        $s3, ($s1)
diff --git a/asm/nonmatchings/code_ef070_len_3400/func_802CD6E0.s b/asm/nonmatchings/code_ef070_len_3400/func_802CD6E0.s
index 6f0d7dca0f..fe83bbbae9 100644
--- a/asm/nonmatchings/code_ef070_len_3400/func_802CD6E0.s
+++ b/asm/nonmatchings/code_ef070_len_3400/func_802CD6E0.s
@@ -23,8 +23,8 @@ glabel func_802CD6E0
 /* F20D8 802CD728 00118880 */  sll       $s1, $s1, 2
 /* F20DC 802CD72C 8E130000 */  lw        $s3, ($s0)
 /* F20E0 802CD730 26100004 */  addiu     $s0, $s0, 4
-/* F20E4 802CD734 3C03802E */  lui       $v1, %hi(gAnimatedMeshesPtr)
-/* F20E8 802CD738 8C63AE30 */  lw        $v1, %lo(gAnimatedMeshesPtr)($v1)
+/* F20E4 802CD734 3C03802E */  lui       $v1, %hi(gMeshAnimationsPtr)
+/* F20E8 802CD738 8C63AE30 */  lw        $v1, %lo(gMeshAnimationsPtr)($v1)
 /* F20EC 802CD73C 8E140000 */  lw        $s4, ($s0)
 /* F20F0 802CD740 02238821 */  addu      $s1, $s1, $v1
 /* F20F4 802CD744 8E230000 */  lw        $v1, ($s1)
diff --git a/asm/nonmatchings/code_ef070_len_3400/func_802CD7D8.s b/asm/nonmatchings/code_ef070_len_3400/func_802CD7D8.s
index 631537bc1c..03323eca79 100644
--- a/asm/nonmatchings/code_ef070_len_3400/func_802CD7D8.s
+++ b/asm/nonmatchings/code_ef070_len_3400/func_802CD7D8.s
@@ -23,8 +23,8 @@ glabel func_802CD7D8
 /* F21D0 802CD820 00118880 */  sll       $s1, $s1, 2
 /* F21D4 802CD824 8E140000 */  lw        $s4, ($s0)
 /* F21D8 802CD828 26100004 */  addiu     $s0, $s0, 4
-/* F21DC 802CD82C 3C03802E */  lui       $v1, %hi(gAnimatedMeshesPtr)
-/* F21E0 802CD830 8C63AE30 */  lw        $v1, %lo(gAnimatedMeshesPtr)($v1)
+/* F21DC 802CD82C 3C03802E */  lui       $v1, %hi(gMeshAnimationsPtr)
+/* F21E0 802CD830 8C63AE30 */  lw        $v1, %lo(gMeshAnimationsPtr)($v1)
 /* F21E4 802CD834 8E150000 */  lw        $s5, ($s0)
 /* F21E8 802CD838 02238821 */  addu      $s1, $s1, $v1
 /* F21EC 802CD83C 8E330000 */  lw        $s3, ($s1)
diff --git a/asm/nonmatchings/code_ef070_len_3400/func_802CD8F8.s b/asm/nonmatchings/code_ef070_len_3400/func_802CD8F8.s
index 575f1f4f91..358262361b 100644
--- a/asm/nonmatchings/code_ef070_len_3400/func_802CD8F8.s
+++ b/asm/nonmatchings/code_ef070_len_3400/func_802CD8F8.s
@@ -23,8 +23,8 @@ glabel func_802CD8F8
 /* F22F0 802CD940 00118880 */  sll       $s1, $s1, 2
 /* F22F4 802CD944 8E130000 */  lw        $s3, ($s0)
 /* F22F8 802CD948 26100004 */  addiu     $s0, $s0, 4
-/* F22FC 802CD94C 3C03802E */  lui       $v1, %hi(gAnimatedMeshesPtr)
-/* F2300 802CD950 8C63AE30 */  lw        $v1, %lo(gAnimatedMeshesPtr)($v1)
+/* F22FC 802CD94C 3C03802E */  lui       $v1, %hi(gMeshAnimationsPtr)
+/* F2300 802CD950 8C63AE30 */  lw        $v1, %lo(gMeshAnimationsPtr)($v1)
 /* F2304 802CD954 8E140000 */  lw        $s4, ($s0)
 /* F2308 802CD958 02238821 */  addu      $s1, $s1, $v1
 /* F230C 802CD95C 8E230000 */  lw        $v1, ($s1)
diff --git a/asm/nonmatchings/code_ef070_len_3400/func_802CD9F0.s b/asm/nonmatchings/code_ef070_len_3400/func_802CD9F0.s
index a1dd7b41ef..bafc068c6b 100644
--- a/asm/nonmatchings/code_ef070_len_3400/func_802CD9F0.s
+++ b/asm/nonmatchings/code_ef070_len_3400/func_802CD9F0.s
@@ -23,8 +23,8 @@ glabel func_802CD9F0
 /* F23E8 802CDA38 8E130000 */  lw        $s3, ($s0)
 /* F23EC 802CDA3C 0C0B1EAF */  jal       get_variable
 /* F23F0 802CDA40 0040902D */   daddu    $s2, $v0, $zero
-/* F23F4 802CDA44 3C03802E */  lui       $v1, %hi(gAnimatedMeshesPtr)
-/* F23F8 802CDA48 8C63AE30 */  lw        $v1, %lo(gAnimatedMeshesPtr)($v1)
+/* F23F4 802CDA44 3C03802E */  lui       $v1, %hi(gMeshAnimationsPtr)
+/* F23F8 802CDA48 8C63AE30 */  lw        $v1, %lo(gMeshAnimationsPtr)($v1)
 /* F23FC 802CDA4C 00118880 */  sll       $s1, $s1, 2
 /* F2400 802CDA50 02238821 */  addu      $s1, $s1, $v1
 /* F2404 802CDA54 8E230000 */  lw        $v1, ($s1)
diff --git a/include/variables.h b/include/variables.h
index e18c758128..cdd6635377 100644
--- a/include/variables.h
+++ b/include/variables.h
@@ -88,7 +88,9 @@ extern PrintContext* D_802DB268;
 
 // Animation related
 extern PartnerAnimations gPartnerAnimations[12];
-extern AnimatedModel** gAnimatedMeshesPtr;
+extern AnimatedModel* gBattleMeshAnimations[16];
+extern AnimatedModel* gWorldMeshAnimations[16];
+extern AnimatedModel** gMeshAnimationsPtr;
 
 // Triggers
 extern s16 gTriggerCount;
diff --git a/src/code_ef070_len_3400.c b/src/code_ef070_len_3400.c
index 9f892bd319..d9de3affac 100644
--- a/src/code_ef070_len_3400.c
+++ b/src/code_ef070_len_3400.c
@@ -493,7 +493,13 @@ INCLUDE_ASM(s32, "code_ef070_len_3400", SetAnimModelScale);
 
 INCLUDE_ASM(s32, "code_ef070_len_3400", func_802CD348);
 
-INCLUDE_ASM(s32, "code_ef070_len_3400", func_802CD3C0);
+ApiStatus func_802CD3C0(ScriptInstance* script, s32 isInitialCall) {
+    AnimatedModel* model = gMeshAnimationsPtr[get_variable(script, *script->ptrReadPos)];
+
+    func_8011E438(func_8011FFE0(model->animModelID));
+    model->animModelID = -1;
+    return ApiStatus_DONE2;
+}
 
 INCLUDE_ASM(s32, "code_ef070_len_3400", func_802CD418);
 
diff --git a/tools/symbol_addrs.txt b/tools/symbol_addrs.txt
index d8d888cc08..342a89fc97 100644
--- a/tools/symbol_addrs.txt
+++ b/tools/symbol_addrs.txt
@@ -1891,7 +1891,9 @@ gGlobalTimeSpace = 0x802D9CA8;
 ShakeCam1 = 0x802D9CB0;
 ShakeCamX = 0x802D9CE8;
 D_802D9D50 = 0x802D9D50;
-gAnimatedMeshesPtr = 0x802DAE30;
+gBattleMeshAnimations = 0x802DADB0; // size:0x40
+gWorldMeshAnimations = 0x802DADF0; // size:0x40
+gMeshAnimationsPtr = 0x802DAE30;
 gWorldMapFlags = 0x802DBC70; // size:0xC
 gWorldMapVars = 0x802DBCA8; // size:0x40
 gBattleMapVars = 0x802DBCE8; // size:0x40
diff --git a/undefined_syms.txt b/undefined_syms.txt
index eb8954ce0c..fc123c5c23 100644
--- a/undefined_syms.txt
+++ b/undefined_syms.txt
@@ -229,7 +229,10 @@ gCurrentSaveFile = 0x800DACC0;
 
 gMapFlags = 0x802DA480;
 gMapVars = 0x802DA484;
-gAnimatedMeshesPtr = 0x802DAE30;
+
+gBattleMeshAnimations = 0x802DADB0;
+gWorldMeshAnimations = 0x802DADF0;
+gMeshAnimationsPtr = 0x802DAE30;
 
 gEffectTable = 0x8007F214;