From fdf9454cde476668dd2d18ea7374a67b1ef5f00b Mon Sep 17 00:00:00 2001
From: Alex Bates <hi@imalex.xyz>
Date: Wed, 30 Dec 2020 09:36:44 +0000
Subject: [PATCH] extern ActorDescs

---
 src/battle/actor/paragoomba.h        |  4 +++-
 src/battle/actor/spiked_goomba.h     |  4 +++-
 src/battle/area_kmr_part_1/battles.c | 24 ++++++++++++------------
 undefined_syms.txt                   |  3 +++
 4 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/src/battle/actor/paragoomba.h b/src/battle/actor/paragoomba.h
index 0f90efadec..1bea71359c 100644
--- a/src/battle/actor/paragoomba.h
+++ b/src/battle/actor/paragoomba.h
@@ -1,7 +1,9 @@
 #ifndef _BATTLE_ACTOR_PARAGOOMBA_
 #define _BATTLE_ACTOR_PARAGOOMBA_
 
+#include "battle/battle.h"
+
 // TODO: disasm
-#define paragoomba 0x8021CD00
+extern ActorDesc paragoomba;
 
 #endif
diff --git a/src/battle/actor/spiked_goomba.h b/src/battle/actor/spiked_goomba.h
index 0c1b89f363..f4a8bb9eb1 100644
--- a/src/battle/actor/spiked_goomba.h
+++ b/src/battle/actor/spiked_goomba.h
@@ -1,7 +1,9 @@
 #ifndef _BATTLE_ACTOR_SPIKED_GOOMBA_
 #define _BATTLE_ACTOR_SPIKED_GOOMBA_
 
+#include "battle/battle.h"
+
 // TODO: disasm
-#define spikedGoomba 0x8021B0AC
+extern ActorDesc spiked_goomba;
 
 #endif
diff --git a/src/battle/area_kmr_part_1/battles.c b/src/battle/area_kmr_part_1/battles.c
index 2acb47e752..5b2401b56f 100644
--- a/src/battle/area_kmr_part_1/battles.c
+++ b/src/battle/area_kmr_part_1/battles.c
@@ -22,7 +22,7 @@ Formation formation2 = {
 
 Formation formation3 = {
     { &goomba, .position = 1, .priority = 10 },
-    { paragoomba, .position = 6, .priority = 9 },
+    { &paragoomba, .position = 6, .priority = 9 },
 };
 
 Formation formation4 = {
@@ -34,37 +34,37 @@ Formation formation4 = {
 
 Formation formation5 = {
     { &goomba, .position = 1, .priority = 10 },
-    { spikedGoomba, .position = 2, .priority = 9 },
+    { &spiked_goomba, .position = 2, .priority = 9 },
 };
 
 Formation formation6 = {
     { &goomba, .position = 0, .priority = 10 },
-    { paragoomba, .position = 5, .priority = 9 },
+    { &paragoomba, .position = 5, .priority = 9 },
     { &goomba, .position = 2, .priority = 8 },
-    { paragoomba, .position = 7, .priority = 7 },
+    { &paragoomba, .position = 7, .priority = 7 },
 };
 
 Formation formation7 = {
-    { paragoomba, .position = 5, .priority = 10 },
+    { &paragoomba, .position = 5, .priority = 10 },
 };
 
 Formation formation8 = {
-    { paragoomba, .position = 5, .priority = 10 },
-    { paragoomba, .position = 6, .priority = 9 },
+    { &paragoomba, .position = 5, .priority = 10 },
+    { &paragoomba, .position = 6, .priority = 9 },
 };
 
 Formation formation9 = {
-    { paragoomba, .position = 4, .priority = 10 },
-    { paragoomba, .position = 5, .priority = 9 },
-    { paragoomba, .position = 6, .priority = 8 },
+    { &paragoomba, .position = 4, .priority = 10 },
+    { &paragoomba, .position = 5, .priority = 9 },
+    { &paragoomba, .position = 6, .priority = 8 },
 };
 
 Formation formation10 = {
-    { spikedGoomba, .position = 1, .priority = 10 },
+    { &spiked_goomba, .position = 1, .priority = 10 },
 };
 
 Formation formation11 = {
-    { spikedGoomba, .position = 1, .priority = 10 },
+    { &spiked_goomba, .position = 1, .priority = 10 },
     { &goomba, .position = 2, .priority = 9 },
 };
 
diff --git a/undefined_syms.txt b/undefined_syms.txt
index b8eb46d8db..263fae24e2 100644
--- a/undefined_syms.txt
+++ b/undefined_syms.txt
@@ -357,3 +357,6 @@ D_DE0079B8 = 0xDE0079B8;
 D_DE003E00 = 0xDE003E00;
 D_C1F06370 = 0xC1F06370;
 D_DE001F00 = 0xDE001F00;
+
+paragoomba = 0x8021CD00;
+spiked_goomba = 0x8021B0AC;