1 files changed, 15 insertions, 13 deletions

diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c
index bc7177bd7..52babe346 100644
--- a/src/hall_of_fame.c
+++ b/src/hall_of_fame.c
@@ -9,21 +9,22 @@
 #include "gpu_regs.h"
 #include "main.h"
 #include "sound.h"
-#include "songs.h"
+#include "constants/songs.h"
 #include "decompress.h"
 #include "save.h"
 #include "window.h"
 #include "bg.h"
-#include "species.h"
-#include "game_stat.h"
+#include "constants/species.h"
+#include "constants/game_stat.h"
 #include "blend_palette.h"
 #include "string_util.h"
 #include "m4a.h"
 #include "international_string_util.h"
 #include "unknown_task.h"
 #include "trig.h"
-#include "rng.h"
+#include "random.h"
 #include "event_data.h"
+#include "overworld.h"
 
 struct HallofFameMon
 {
@@ -57,6 +58,7 @@ extern struct MusicPlayerInfo gMPlay_BGM;
 extern MainCallback gGameContinueCallback;
 extern u32 gDamagedSaveSectors;
 extern u8 gReservedSpritePaletteCount;
+extern const u8 gSpeciesNames[][11];
 
 #define HALL_OF_FAME_MAX_TEAMS 50
 
@@ -580,9 +582,9 @@ static void Task_Hof_SetMonDisplayTask(u8 taskId)
     gTasks[taskId].func = Task_Hof_DisplayMon;
 }
 
-#define tDestinationX  data1
-#define tDestinationY  data2
-#define tSpecies       data7
+#define tDestinationX  data[1]
+#define tDestinationY  data[2]
+#define tSpecies       data[7]
 
 static void Task_Hof_DisplayMon(u8 taskId)
 {
@@ -613,7 +615,7 @@ static void Task_Hof_DisplayMon(u8 taskId)
     spriteId = sub_818D3E4(currMon->species, currMon->tid, currMon->personality, 1, xPos, yPos, currMonId, 0xFFFF);
     gSprites[spriteId].tDestinationX = field4;
     gSprites[spriteId].tDestinationY = field6;
-    gSprites[spriteId].data0 = 0;
+    gSprites[spriteId].data[0] = 0;
     gSprites[spriteId].tSpecies = currMon->species;
     gSprites[spriteId].callback = SpriteCB_GetOnScreenAndAnimate;
     gTasks[taskId].tMonSpriteId(currMonId) = spriteId;
@@ -1404,13 +1406,13 @@ static void sub_81751A4(struct Sprite* sprite)
         u8 tableID;
 
         sprite->pos2.y++;
-        sprite->pos2.y += sprite->data1;
+        sprite->pos2.y += sprite->data[1];
 
-        tableID = sprite->data0;
+        tableID = sprite->data[0];
         rand = (Random() % 4) + 8;
         sprite->pos2.x = rand * gSineTable[tableID] / 256;
 
-        sprite->data0 += 4;
+        sprite->data[0] += 4;
     }
 }
 
@@ -1428,9 +1430,9 @@ static bool8 sub_81751FC(void)
     StartSpriteAnim(sprite, Random() % 17);
 
     if (Random() & 3)
-        sprite->data1 = 0;
+        sprite->data[1] = 0;
     else
-        sprite->data1 = 1;
+        sprite->data[1] = 1;
 
     return FALSE;
 }