diff --git a/ld/gamefiles.jpn-final.inc b/ld/gamefiles.jpn-final.inc
index 6dd4c8663..863c2a30f 100644
--- a/ld/gamefiles.jpn-final.inc
+++ b/ld/gamefiles.jpn-final.inc
@@ -26,7 +26,7 @@
 	build/ROMID/game/titlereset.o (section); \
 	build/ROMID/game/chrmgr.o (section); \
 	build/ROMID/game/bodyreset.o (section); \
-	build/ROMID/game/game_00b820.o (section); \
+	build/ROMID/game/chraireset.o (section); \
 	build/ROMID/game/varsreset.o (section); \
 	build/ROMID/game/setup.o (section); \
 	build/ROMID/game/propsndreset.o (section); \
@@ -95,7 +95,7 @@
 	build/ROMID/game/setuputils.o (section); \
 	build/ROMID/game/propsnd.o (section); \
 	build/ROMID/game/objectives.o (section); \
-	build/ROMID/game/game_096360.o (section); \
+	build/ROMID/game/projectile.o (section); \
 	build/ROMID/game/game_096700.o (section); \
 	build/ROMID/game/atan2f.o (section); \
 	build/ROMID/game/acosasin.o (section); \
@@ -110,7 +110,7 @@
 	build/ROMID/game/bondgun.o (section); \
 	build/ROMID/game/gunfx.o (section); \
 	build/ROMID/game/mpstats.o (section); \
-	build/ROMID/game/game_0b0fd0.o (section); \
+	build/ROMID/game/gset.o (section); \
 	build/ROMID/game/game_0b2150.o (section); \
 	build/ROMID/game/modelmgr.o (section); \
 	build/ROMID/game/texselect.o (section); \
@@ -178,7 +178,7 @@
 	build/ROMID/game/stars.o (section); \
 	build/ROMID/game/credits.o (section); \
 	build/ROMID/game/dyntex.o (section); \
-	build/ROMID/game/game_13c510.o (section); \
+	build/ROMID/game/artifact.o (section); \
 	build/ROMID/game/wallhit.o (section); \
 	build/ROMID/game/bondview.o (section); \
 	build/ROMID/game/splat.o (section); \
@@ -186,7 +186,7 @@
 	build/ROMID/game/shards.o (section); \
 	build/ROMID/game/options.o (section); \
 	build/ROMID/game/game_152fa0.o (section); \
-	build/ROMID/game/game_1531a0.o (section); \
+	build/ROMID/game/text.o (section); \
 	build/ROMID/game/collisionutils.o (section); \
 	build/ROMID/game/bg.o (section); \
 	build/ROMID/game/bgbss.o (section); \
diff --git a/ld/gamefiles.ntsc-beta.inc b/ld/gamefiles.ntsc-beta.inc
index 1f2ff50bc..a20da6f3d 100644
--- a/ld/gamefiles.ntsc-beta.inc
+++ b/ld/gamefiles.ntsc-beta.inc
@@ -26,7 +26,7 @@
 	build/ROMID/game/titlereset.o (section); \
 	build/ROMID/game/chrmgr.o (section); \
 	build/ROMID/game/bodyreset.o (section); \
-	build/ROMID/game/game_00b820.o (section); \
+	build/ROMID/game/chraireset.o (section); \
 	build/ROMID/game/varsreset.o (section); \
 	build/ROMID/game/setup.o (section); \
 	build/ROMID/game/propsndreset.o (section); \
@@ -95,7 +95,7 @@
 	build/ROMID/game/setuputils.o (section); \
 	build/ROMID/game/propsnd.o (section); \
 	build/ROMID/game/objectives.o (section); \
-	build/ROMID/game/game_096360.o (section); \
+	build/ROMID/game/projectile.o (section); \
 	build/ROMID/game/game_096700.o (section); \
 	build/ROMID/game/atan2f.o (section); \
 	build/ROMID/game/acosasin.o (section); \
@@ -110,7 +110,7 @@
 	build/ROMID/game/bondgun.o (section); \
 	build/ROMID/game/gunfx.o (section); \
 	build/ROMID/game/mpstats.o (section); \
-	build/ROMID/game/game_0b0fd0.o (section); \
+	build/ROMID/game/gset.o (section); \
 	build/ROMID/game/game_0b2150.o (section); \
 	build/ROMID/game/modelmgr.o (section); \
 	build/ROMID/game/texselect.o (section); \
@@ -178,7 +178,7 @@
 	build/ROMID/game/stars.o (section); \
 	build/ROMID/game/credits.o (section); \
 	build/ROMID/game/dyntex.o (section); \
-	build/ROMID/game/game_13c510.o (section); \
+	build/ROMID/game/artifact.o (section); \
 	build/ROMID/game/wallhit.o (section); \
 	build/ROMID/game/bondview.o (section); \
 	build/ROMID/game/splat.o (section); \
@@ -186,7 +186,7 @@
 	build/ROMID/game/shards.o (section); \
 	build/ROMID/game/options.o (section); \
 	build/ROMID/game/game_152fa0.o (section); \
-	build/ROMID/game/game_1531a0.o (section); \
+	build/ROMID/game/text.o (section); \
 	build/ROMID/game/collisionutils.o (section); \
 	build/ROMID/game/bg.o (section); \
 	build/ROMID/game/bgbss.o (section); \
diff --git a/ld/gamefiles.ntsc-final.inc b/ld/gamefiles.ntsc-final.inc
index 6dd4c8663..863c2a30f 100644
--- a/ld/gamefiles.ntsc-final.inc
+++ b/ld/gamefiles.ntsc-final.inc
@@ -26,7 +26,7 @@
 	build/ROMID/game/titlereset.o (section); \
 	build/ROMID/game/chrmgr.o (section); \
 	build/ROMID/game/bodyreset.o (section); \
-	build/ROMID/game/game_00b820.o (section); \
+	build/ROMID/game/chraireset.o (section); \
 	build/ROMID/game/varsreset.o (section); \
 	build/ROMID/game/setup.o (section); \
 	build/ROMID/game/propsndreset.o (section); \
@@ -95,7 +95,7 @@
 	build/ROMID/game/setuputils.o (section); \
 	build/ROMID/game/propsnd.o (section); \
 	build/ROMID/game/objectives.o (section); \
-	build/ROMID/game/game_096360.o (section); \
+	build/ROMID/game/projectile.o (section); \
 	build/ROMID/game/game_096700.o (section); \
 	build/ROMID/game/atan2f.o (section); \
 	build/ROMID/game/acosasin.o (section); \
@@ -110,7 +110,7 @@
 	build/ROMID/game/bondgun.o (section); \
 	build/ROMID/game/gunfx.o (section); \
 	build/ROMID/game/mpstats.o (section); \
-	build/ROMID/game/game_0b0fd0.o (section); \
+	build/ROMID/game/gset.o (section); \
 	build/ROMID/game/game_0b2150.o (section); \
 	build/ROMID/game/modelmgr.o (section); \
 	build/ROMID/game/texselect.o (section); \
@@ -178,7 +178,7 @@
 	build/ROMID/game/stars.o (section); \
 	build/ROMID/game/credits.o (section); \
 	build/ROMID/game/dyntex.o (section); \
-	build/ROMID/game/game_13c510.o (section); \
+	build/ROMID/game/artifact.o (section); \
 	build/ROMID/game/wallhit.o (section); \
 	build/ROMID/game/bondview.o (section); \
 	build/ROMID/game/splat.o (section); \
@@ -186,7 +186,7 @@
 	build/ROMID/game/shards.o (section); \
 	build/ROMID/game/options.o (section); \
 	build/ROMID/game/game_152fa0.o (section); \
-	build/ROMID/game/game_1531a0.o (section); \
+	build/ROMID/game/text.o (section); \
 	build/ROMID/game/collisionutils.o (section); \
 	build/ROMID/game/bg.o (section); \
 	build/ROMID/game/bgbss.o (section); \
diff --git a/ld/gamefiles.pal-beta.inc b/ld/gamefiles.pal-beta.inc
index 6dd4c8663..863c2a30f 100644
--- a/ld/gamefiles.pal-beta.inc
+++ b/ld/gamefiles.pal-beta.inc
@@ -26,7 +26,7 @@
 	build/ROMID/game/titlereset.o (section); \
 	build/ROMID/game/chrmgr.o (section); \
 	build/ROMID/game/bodyreset.o (section); \
-	build/ROMID/game/game_00b820.o (section); \
+	build/ROMID/game/chraireset.o (section); \
 	build/ROMID/game/varsreset.o (section); \
 	build/ROMID/game/setup.o (section); \
 	build/ROMID/game/propsndreset.o (section); \
@@ -95,7 +95,7 @@
 	build/ROMID/game/setuputils.o (section); \
 	build/ROMID/game/propsnd.o (section); \
 	build/ROMID/game/objectives.o (section); \
-	build/ROMID/game/game_096360.o (section); \
+	build/ROMID/game/projectile.o (section); \
 	build/ROMID/game/game_096700.o (section); \
 	build/ROMID/game/atan2f.o (section); \
 	build/ROMID/game/acosasin.o (section); \
@@ -110,7 +110,7 @@
 	build/ROMID/game/bondgun.o (section); \
 	build/ROMID/game/gunfx.o (section); \
 	build/ROMID/game/mpstats.o (section); \
-	build/ROMID/game/game_0b0fd0.o (section); \
+	build/ROMID/game/gset.o (section); \
 	build/ROMID/game/game_0b2150.o (section); \
 	build/ROMID/game/modelmgr.o (section); \
 	build/ROMID/game/texselect.o (section); \
@@ -178,7 +178,7 @@
 	build/ROMID/game/stars.o (section); \
 	build/ROMID/game/credits.o (section); \
 	build/ROMID/game/dyntex.o (section); \
-	build/ROMID/game/game_13c510.o (section); \
+	build/ROMID/game/artifact.o (section); \
 	build/ROMID/game/wallhit.o (section); \
 	build/ROMID/game/bondview.o (section); \
 	build/ROMID/game/splat.o (section); \
@@ -186,7 +186,7 @@
 	build/ROMID/game/shards.o (section); \
 	build/ROMID/game/options.o (section); \
 	build/ROMID/game/game_152fa0.o (section); \
-	build/ROMID/game/game_1531a0.o (section); \
+	build/ROMID/game/text.o (section); \
 	build/ROMID/game/collisionutils.o (section); \
 	build/ROMID/game/bg.o (section); \
 	build/ROMID/game/bgbss.o (section); \
diff --git a/ld/gamefiles.pal-final.inc b/ld/gamefiles.pal-final.inc
index 6dd4c8663..863c2a30f 100644
--- a/ld/gamefiles.pal-final.inc
+++ b/ld/gamefiles.pal-final.inc
@@ -26,7 +26,7 @@
 	build/ROMID/game/titlereset.o (section); \
 	build/ROMID/game/chrmgr.o (section); \
 	build/ROMID/game/bodyreset.o (section); \
-	build/ROMID/game/game_00b820.o (section); \
+	build/ROMID/game/chraireset.o (section); \
 	build/ROMID/game/varsreset.o (section); \
 	build/ROMID/game/setup.o (section); \
 	build/ROMID/game/propsndreset.o (section); \
@@ -95,7 +95,7 @@
 	build/ROMID/game/setuputils.o (section); \
 	build/ROMID/game/propsnd.o (section); \
 	build/ROMID/game/objectives.o (section); \
-	build/ROMID/game/game_096360.o (section); \
+	build/ROMID/game/projectile.o (section); \
 	build/ROMID/game/game_096700.o (section); \
 	build/ROMID/game/atan2f.o (section); \
 	build/ROMID/game/acosasin.o (section); \
@@ -110,7 +110,7 @@
 	build/ROMID/game/bondgun.o (section); \
 	build/ROMID/game/gunfx.o (section); \
 	build/ROMID/game/mpstats.o (section); \
-	build/ROMID/game/game_0b0fd0.o (section); \
+	build/ROMID/game/gset.o (section); \
 	build/ROMID/game/game_0b2150.o (section); \
 	build/ROMID/game/modelmgr.o (section); \
 	build/ROMID/game/texselect.o (section); \
@@ -178,7 +178,7 @@
 	build/ROMID/game/stars.o (section); \
 	build/ROMID/game/credits.o (section); \
 	build/ROMID/game/dyntex.o (section); \
-	build/ROMID/game/game_13c510.o (section); \
+	build/ROMID/game/artifact.o (section); \
 	build/ROMID/game/wallhit.o (section); \
 	build/ROMID/game/bondview.o (section); \
 	build/ROMID/game/splat.o (section); \
@@ -186,7 +186,7 @@
 	build/ROMID/game/shards.o (section); \
 	build/ROMID/game/options.o (section); \
 	build/ROMID/game/game_152fa0.o (section); \
-	build/ROMID/game/game_1531a0.o (section); \
+	build/ROMID/game/text.o (section); \
 	build/ROMID/game/collisionutils.o (section); \
 	build/ROMID/game/bg.o (section); \
 	build/ROMID/game/bgbss.o (section); \
diff --git a/src/game/activemenu.c b/src/game/activemenu.c
index d50b2ec86..585e64e9a 100644
--- a/src/game/activemenu.c
+++ b/src/game/activemenu.c
@@ -3,12 +3,12 @@
 #include "game/chraction.h"
 #include "game/game_006900.h"
 #include "game/bondgun.h"
-#include "game/game_0b0fd0.h"
+#include "game/gset.h"
 #include "game/tex.h"
 #include "game/savebuffer.h"
 #include "game/menu.h"
 #include "game/inv.h"
-#include "game/game_1531a0.h"
+#include "game/text.h"
 #include "game/file.h"
 #include "game/bot.h"
 #include "game/botcmd.h"
diff --git a/src/game/activemenutick.c b/src/game/activemenutick.c
index fb61a3d54..cf4253065 100644
--- a/src/game/activemenutick.c
+++ b/src/game/activemenutick.c
@@ -3,7 +3,7 @@
 #include "game/activemenu.h"
 #include "game/pdmode.h"
 #include "game/bondgun.h"
-#include "game/game_0b0fd0.h"
+#include "game/gset.h"
 #include "game/inv.h"
 #include "game/playermgr.h"
 #include "game/options.h"
diff --git a/src/game/game_13c510.c b/src/game/artifact.c
similarity index 99%
rename from src/game/game_13c510.c
rename to src/game/artifact.c
index 71120fb70..6fdc5326b 100644
--- a/src/game/game_13c510.c
+++ b/src/game/artifact.c
@@ -7,7 +7,7 @@
 #include "game/game_0b2150.h"
 #include "game/tex.h"
 #include "game/sky.h"
-#include "game/game_13c510.h"
+#include "game/artifact.h"
 #include "game/bg.h"
 #include "game/stagetable.h"
 #include "game/room.h"
diff --git a/src/game/bg.c b/src/game/bg.c
index aa5533c67..aaedb1110 100644
--- a/src/game/bg.c
+++ b/src/game/bg.c
@@ -15,8 +15,8 @@
 #include "game/sky.h"
 #include "game/stars.h"
 #include "game/dyntex.h"
-#include "game/game_13c510.h"
-#include "game/game_1531a0.h"
+#include "game/artifact.h"
+#include "game/text.h"
 #include "game/gfxmemory.h"
 #include "game/gfxreplace.h"
 #include "game/bg.h"
diff --git a/src/game/bodyreset.c b/src/game/bodyreset.c
index 1930ecbc3..a7da9cf2f 100644
--- a/src/game/bodyreset.c
+++ b/src/game/bodyreset.c
@@ -3,7 +3,7 @@
 #include "game/body.h"
 #include "game/cheats.h"
 #include "game/chrai.h"
-#include "game/game_00b820.h"
+#include "game/chraireset.h"
 #include "game/playerreset.h"
 #include "game/setuputils.h"
 #include "bss.h"
diff --git a/src/game/bondgun.c b/src/game/bondgun.c
index b7d3c7686..12cec287a 100644
--- a/src/game/bondgun.c
+++ b/src/game/bondgun.c
@@ -9,14 +9,14 @@
 #include "game/chr.h"
 #include "game/prop.h"
 #include "game/propsnd.h"
-#include "game/game_096360.h"
+#include "game/projectile.h"
 #include "game/acosfasinf.h"
 #include "game/game_096b20.h"
 #include "game/quaternion.h"
 #include "game/game_097aa0.h"
 #include "game/bondgun.h"
 #include "game/gunfx.h"
-#include "game/game_0b0fd0.h"
+#include "game/gset.h"
 #include "game/modeldef.h"
 #include "game/modelmgr.h"
 #include "game/tex.h"
@@ -28,7 +28,7 @@
 #include "game/inv.h"
 #include "game/playermgr.h"
 #include "game/smoke.h"
-#include "game/game_1531a0.h"
+#include "game/text.h"
 #include "game/file.h"
 #include "game/lv.h"
 #include "game/texdecompress.h"
diff --git a/src/game/bondmove.c b/src/game/bondmove.c
index 08cca9e65..4c7e13722 100644
--- a/src/game/bondmove.c
+++ b/src/game/bondmove.c
@@ -14,7 +14,7 @@
 #include "game/atan2f.h"
 #include "game/quaternion.h"
 #include "game/bondgun.h"
-#include "game/game_0b0fd0.h"
+#include "game/gset.h"
 #include "game/tex.h"
 #include "game/camera.h"
 #include "game/player.h"
diff --git a/src/game/bondview.c b/src/game/bondview.c
index 1cce21e47..2d211345b 100644
--- a/src/game/bondview.c
+++ b/src/game/bondview.c
@@ -6,7 +6,7 @@
 #include "game/savebuffer.h"
 #include "game/sky.h"
 #include "game/bondview.h"
-#include "game/game_1531a0.h"
+#include "game/text.h"
 #include "game/gfxmemory.h"
 #include "game/lang.h"
 #include "game/options.h"
diff --git a/src/game/bot.c b/src/game/bot.c
index 78268c9c0..0f02e8543 100644
--- a/src/game/bot.c
+++ b/src/game/bot.c
@@ -7,7 +7,7 @@
 #include "game/propsnd.h"
 #include "game/atan2f.h"
 #include "game/bondgun.h"
-#include "game/game_0b0fd0.h"
+#include "game/gset.h"
 #include "game/player.h"
 #include "game/playermgr.h"
 #include "game/bg.h"
diff --git a/src/game/botact.c b/src/game/botact.c
index 6be057bdb..f483d0ded 100644
--- a/src/game/botact.c
+++ b/src/game/botact.c
@@ -5,7 +5,7 @@
 #include "game/chr.h"
 #include "game/propsnd.h"
 #include "game/bondgun.h"
-#include "game/game_0b0fd0.h"
+#include "game/gset.h"
 #include "game/playermgr.h"
 #include "game/botact.h"
 #include "game/pad.h"
diff --git a/src/game/botcmd.c b/src/game/botcmd.c
index 96ac907b7..ed563b62a 100644
--- a/src/game/botcmd.c
+++ b/src/game/botcmd.c
@@ -5,7 +5,7 @@
 #include "game/debug.h"
 #include "game/chr.h"
 #include "game/ceil.h"
-#include "game/game_0b0fd0.h"
+#include "game/gset.h"
 #include "game/playermgr.h"
 #include "game/mplayer/setup.h"
 #include "game/bot.h"
diff --git a/src/game/botinv.c b/src/game/botinv.c
index ee10ed49a..1e6a7b9ac 100644
--- a/src/game/botinv.c
+++ b/src/game/botinv.c
@@ -4,7 +4,7 @@
 #include "game/debug.h"
 #include "game/chr.h"
 #include "game/ceil.h"
-#include "game/game_0b0fd0.h"
+#include "game/gset.h"
 #include "game/playermgr.h"
 #include "game/mplayer/setup.h"
 #include "game/bot.h"
diff --git a/src/game/chr.c b/src/game/chr.c
index 129ee0549..6b4a5d1de 100644
--- a/src/game/chr.c
+++ b/src/game/chr.c
@@ -10,10 +10,10 @@
 #include "game/prop.h"
 #include "game/propsnd.h"
 #include "game/objectives.h"
-#include "game/game_096360.h"
+#include "game/projectile.h"
 #include "game/bondgun.h"
 #include "game/gunfx.h"
-#include "game/game_0b0fd0.h"
+#include "game/gset.h"
 #include "game/modelmgr.h"
 #include "game/tex.h"
 #include "game/camera.h"
diff --git a/src/game/chraction.c b/src/game/chraction.c
index 518faef3b..b017188af 100644
--- a/src/game/chraction.c
+++ b/src/game/chraction.c
@@ -19,8 +19,8 @@
 #include "game/explosions.h"
 #include "game/footstep.h"
 #include "game/game_006900.h"
-#include "game/game_0b0fd0.h"
-#include "game/game_1531a0.h"
+#include "game/gset.h"
+#include "game/text.h"
 #include "game/gunfx.h"
 #include "game/inv.h"
 #include "game/lv.h"
diff --git a/src/game/chraicommands.c b/src/game/chraicommands.c
index 198ab52a1..894341c80 100644
--- a/src/game/chraicommands.c
+++ b/src/game/chraicommands.c
@@ -17,7 +17,7 @@
 #include "game/objectives.h"
 #include "game/atan2f.h"
 #include "game/bondgun.h"
-#include "game/game_0b0fd0.h"
+#include "game/gset.h"
 #include "game/modelmgr.h"
 #include "game/player.h"
 #include "game/hudmsg.h"
diff --git a/src/game/game_00b820.c b/src/game/chraireset.c
similarity index 95%
rename from src/game/game_00b820.c
rename to src/game/chraireset.c
index 9625eba48..484cd9613 100644
--- a/src/game/game_00b820.c
+++ b/src/game/chraireset.c
@@ -2,7 +2,7 @@
 #include "constants.h"
 #include "game/cheats.h"
 #include "game/chrai.h"
-#include "game/game_00b820.h"
+#include "game/chraireset.h"
 #include "game/playerreset.h"
 #include "game/body.h"
 #include "game/setuputils.h"
@@ -14,7 +14,7 @@
 
 struct prop *g_DangerousProps[12];
 
-void stage_reset(void)
+void chrai_reset(void)
 {
 	s32 i;
 
@@ -32,7 +32,7 @@ void stage_reset(void)
 	g_NumChrsSeenPlayerRecently2 = 0;
 }
 
-void stage_load_bgchrs(void)
+void chrai_load_bgchrs(void)
 {
 	bool modified;
 	struct chrdata tmp;
@@ -127,7 +127,7 @@ void stage_load_bgchrs(void)
 	g_SquadronList = memp_alloc((MAX_CHRSPERSQUADRON + 1) * MAX_SQUADRONS * sizeof(s16), MEMPOOL_STAGE);
 }
 
-void stage_load_ailist_models(void)
+void chrai_load_ailist_models(void)
 {
 	u8 *cmd = g_StageSetup.ailists[0].list;
 	s32 i = 0;
@@ -173,7 +173,7 @@ void stage_load_ailist_models(void)
 	} while (cmd);
 }
 
-void stage_load_projectile_models(void)
+void chrai_load_projectile_models(void)
 {
 	// empty
 }
diff --git a/src/game/chrmgr.c b/src/game/chrmgr.c
index ab18b0d2f..e264f6bb4 100644
--- a/src/game/chrmgr.c
+++ b/src/game/chrmgr.c
@@ -1,6 +1,6 @@
 #include <ultra64.h>
 #include "constants.h"
-#include "game/game_00b820.h"
+#include "game/chraireset.h"
 #include "game/title.h"
 #include "bss.h"
 #include "lib/memp.h"
@@ -37,7 +37,7 @@ void chrmgr_reset(void)
 		var8009ccc0[i] = (void *)ALIGN64(memp_alloc(16 * 16 * sizeof(u16) + 0x40, MEMPOOL_STAGE));
 	}
 
-	stage_reset();
+	chrai_reset();
 }
 
 void chrmgr_configure(s32 numchrs)
diff --git a/src/game/collisionutils.c b/src/game/collisionutils.c
index f2ec4a7c2..e81fd6164 100644
--- a/src/game/collisionutils.c
+++ b/src/game/collisionutils.c
@@ -2,7 +2,7 @@
 #include "constants.h"
 #include "game/game_006900.h"
 #include "game/savebuffer.h"
-#include "game/game_1531a0.h"
+#include "game/text.h"
 #include "game/file.h"
 #include "game/lang.h"
 #include "bss.h"
diff --git a/src/game/credits.c b/src/game/credits.c
index cf0633f38..55d19476f 100644
--- a/src/game/credits.c
+++ b/src/game/credits.c
@@ -9,7 +9,7 @@
 #include "game/menugfx.h"
 #include "game/menu.h"
 #include "game/credits.h"
-#include "game/game_1531a0.h"
+#include "game/text.h"
 #include "game/file.h"
 #include "game/gfxmemory.h"
 #include "game/lv.h"
diff --git a/src/game/endscreen.c b/src/game/endscreen.c
index e58d522fb..68580711f 100644
--- a/src/game/endscreen.c
+++ b/src/game/endscreen.c
@@ -8,7 +8,7 @@
 #include "game/objectives.h"
 #include "game/bondgun.h"
 #include "game/debug.h"
-#include "game/game_0b0fd0.h"
+#include "game/gset.h"
 #include "game/player.h"
 #include "game/savebuffer.h"
 #include "game/menugfx.h"
diff --git a/src/game/filemgr.c b/src/game/filemgr.c
index 9a4ec2b58..50b9692c1 100644
--- a/src/game/filemgr.c
+++ b/src/game/filemgr.c
@@ -6,7 +6,7 @@
 #include "game/menu.h"
 #include "game/filemgr.h"
 #include "game/bossfile.h"
-#include "game/game_1531a0.h"
+#include "game/text.h"
 #include "game/gamefile.h"
 #include "game/lang.h"
 #include "game/mplayer/mplayer.h"
diff --git a/src/game/game_0b0fd0.c b/src/game/gset.c
similarity index 99%
rename from src/game/game_0b0fd0.c
rename to src/game/gset.c
index c09fec9ef..78884d353 100644
--- a/src/game/game_0b0fd0.c
+++ b/src/game/gset.c
@@ -3,7 +3,7 @@
 #include "game/cheats.h"
 #include "game/inv.h"
 #include "game/bondgun.h"
-#include "game/game_0b0fd0.h"
+#include "game/gset.h"
 #include "game/player.h"
 #include "game/hudmsg.h"
 #include "game/playermgr.h"
diff --git a/src/game/gunfx.c b/src/game/gunfx.c
index 79f0426f8..079c9bccb 100644
--- a/src/game/gunfx.c
+++ b/src/game/gunfx.c
@@ -3,7 +3,7 @@
 #include "game/acosfasinf.h"
 #include "game/bondgun.h"
 #include "game/gunfx.h"
-#include "game/game_0b0fd0.h"
+#include "game/gset.h"
 #include "game/tex.h"
 #include "game/camera.h"
 #include "game/mtxf2lbulk.h"
diff --git a/src/game/healthbar.c b/src/game/healthbar.c
index d73e870bb..804508155 100644
--- a/src/game/healthbar.c
+++ b/src/game/healthbar.c
@@ -2,7 +2,7 @@
 #include "constants.h"
 #include "game/player.h"
 #include "game/healthbar.h"
-#include "game/game_1531a0.h"
+#include "game/text.h"
 #include "game/gfxmemory.h"
 #include "game/file.h"
 #include "bss.h"
diff --git a/src/game/hudmsg.c b/src/game/hudmsg.c
index 2487a0fec..7323bb910 100644
--- a/src/game/hudmsg.c
+++ b/src/game/hudmsg.c
@@ -2,13 +2,13 @@
 #include "constants.h"
 #include "constants.h"
 #include "game/propsnd.h"
-#include "game/game_0b0fd0.h"
+#include "game/gset.h"
 #include "game/player.h"
 #include "game/savebuffer.h"
 #include "game/hudmsg.h"
 #include "game/menugfx.h"
 #include "game/playermgr.h"
-#include "game/game_1531a0.h"
+#include "game/text.h"
 #include "game/lv.h"
 #include "game/mplayer/mplayer.h"
 #include "game/options.h"
diff --git a/src/game/inv.c b/src/game/inv.c
index 03cf442c4..c093f7c53 100644
--- a/src/game/inv.c
+++ b/src/game/inv.c
@@ -2,7 +2,7 @@
 #include "constants.h"
 #include "game/cheats.h"
 #include "game/bondgun.h"
-#include "game/game_0b0fd0.h"
+#include "game/gset.h"
 #include "game/inv.h"
 #include "game/training.h"
 #include "game/lang.h"
diff --git a/src/game/lv.c b/src/game/lv.c
index 4cb5c05f0..add3df4cf 100644
--- a/src/game/lv.c
+++ b/src/game/lv.c
@@ -21,15 +21,15 @@
 #include "game/explosions.h"
 #include "game/filemgr.h"
 #include "game/game_006900.h"
-#include "game/game_00b820.h"
+#include "game/chraireset.h"
 #include "game/gunfx.h"
-#include "game/game_0b0fd0.h"
+#include "game/gset.h"
 #include "game/modelmgr.h"
 #include "game/portal.h"
 #include "game/fmb.h"
 #include "game/sky.h"
-#include "game/game_13c510.h"
-#include "game/game_1531a0.h"
+#include "game/artifact.h"
+#include "game/text.h"
 #include "game/zbuf.h"
 #include "game/challenge.h"
 #include "game/chrmgr.h"
@@ -675,8 +675,8 @@ Gfx *lv_render_man_pos_if_enabled(Gfx *gdl)
 	s32 y2;
 
 	if (debug_is_man_pos_enabled()) {
-		f32 xfrac = g_Vars.currentplayer->bond2.unk00.x;
-		f32 zfrac = g_Vars.currentplayer->bond2.unk00.z;
+		f32 xfrac = g_Vars.currentplayer->bond2.theta.x;
+		f32 zfrac = g_Vars.currentplayer->bond2.theta.z;
 
 		char directions[][3] = {
 			{'n', '\0', '\0'},
diff --git a/src/game/mainmenu.c b/src/game/mainmenu.c
index cdfe102cd..86ee3f825 100644
--- a/src/game/mainmenu.c
+++ b/src/game/mainmenu.c
@@ -6,8 +6,8 @@
 #include "game/cheats.h"
 #include "game/debug.h"
 #include "game/filemgr.h"
-#include "game/game_0b0fd0.h"
-#include "game/game_1531a0.h"
+#include "game/gset.h"
+#include "game/text.h"
 #include "game/gamefile.h"
 #include "game/inv.h"
 #include "game/lang.h"
diff --git a/src/game/menu.c b/src/game/menu.c
index 02b5086c3..407fdc16c 100644
--- a/src/game/menu.c
+++ b/src/game/menu.c
@@ -18,7 +18,7 @@
 #include "game/filelist.h"
 #include "game/filemgr.h"
 #include "game/credits.h"
-#include "game/game_1531a0.h"
+#include "game/text.h"
 #include "game/file.h"
 #include "game/lv.h"
 #include "game/mplayer/setup.h"
diff --git a/src/game/menugfx.c b/src/game/menugfx.c
index 47695bd81..6b81307c5 100644
--- a/src/game/menugfx.c
+++ b/src/game/menugfx.c
@@ -6,7 +6,7 @@
 #include "game/savebuffer.h"
 #include "game/menugfx.h"
 #include "game/menu.h"
-#include "game/game_1531a0.h"
+#include "game/text.h"
 #include "game/gfxmemory.h"
 #include "game/file.h"
 #include "game/utils.h"
diff --git a/src/game/menuitem.c b/src/game/menuitem.c
index a7f6317cc..e2b547e51 100644
--- a/src/game/menuitem.c
+++ b/src/game/menuitem.c
@@ -9,7 +9,7 @@
 #include "game/menu.h"
 #include "game/mainmenu.h"
 #include "game/objectives.h"
-#include "game/game_1531a0.h"
+#include "game/text.h"
 #include "game/lv.h"
 #include "game/challenge.h"
 #include "game/training.h"
diff --git a/src/game/modeldef.c b/src/game/modeldef.c
index fd518b1d7..76a11ed64 100644
--- a/src/game/modeldef.c
+++ b/src/game/modeldef.c
@@ -3,13 +3,13 @@
 #include "game/chraction.h"
 #include "game/ceil.h"
 #include "game/bondgun.h"
-#include "game/game_0b0fd0.h"
+#include "game/gset.h"
 #include "game/tex.h"
 #include "game/menugfx.h"
 #include "game/menu.h"
 #include "game/mainmenu.h"
 #include "game/inv.h"
-#include "game/game_1531a0.h"
+#include "game/text.h"
 #include "game/file.h"
 #include "game/texdecompress.h"
 #include "game/tex.h"
diff --git a/src/game/mplayer/ingame.c b/src/game/mplayer/ingame.c
index 2c65b7379..b3c86d138 100644
--- a/src/game/mplayer/ingame.c
+++ b/src/game/mplayer/ingame.c
@@ -2,7 +2,7 @@
 #include "constants.h"
 #include "game/game_006900.h"
 #include "game/title.h"
-#include "game/game_0b0fd0.h"
+#include "game/gset.h"
 #include "game/tex.h"
 #include "game/savebuffer.h"
 #include "game/menu.h"
diff --git a/src/game/mplayer/mplayer.c b/src/game/mplayer/mplayer.c
index 43d9919f3..4e1dabc1f 100644
--- a/src/game/mplayer/mplayer.c
+++ b/src/game/mplayer/mplayer.c
@@ -4,12 +4,12 @@
 #include "game/title.h"
 #include "game/pdmode.h"
 #include "game/bondgun.h"
-#include "game/game_0b0fd0.h"
+#include "game/gset.h"
 #include "game/player.h"
 #include "game/savebuffer.h"
 #include "game/menu.h"
 #include "game/playermgr.h"
-#include "game/game_1531a0.h"
+#include "game/text.h"
 #include "game/lv.h"
 #include "game/music.h"
 #include "game/mplayer/setup.h"
diff --git a/src/game/mplayer/scenarios.c b/src/game/mplayer/scenarios.c
index 9f843da50..5c1c9a822 100644
--- a/src/game/mplayer/scenarios.c
+++ b/src/game/mplayer/scenarios.c
@@ -14,7 +14,7 @@
 #include "game/menu.h"
 #include "game/inv.h"
 #include "game/playermgr.h"
-#include "game/game_1531a0.h"
+#include "game/text.h"
 #include "game/mplayer/setup.h"
 #include "game/mplayer/scenarios.h"
 #include "game/radar.h"
diff --git a/src/game/mplayer/setup.c b/src/game/mplayer/setup.c
index e3adcff3f..5c7c45412 100644
--- a/src/game/mplayer/setup.c
+++ b/src/game/mplayer/setup.c
@@ -6,7 +6,7 @@
 #include "game/menu.h"
 #include "game/mainmenu.h"
 #include "game/filemgr.h"
-#include "game/game_1531a0.h"
+#include "game/text.h"
 #include "game/music.h"
 #include "game/mplayer/ingame.h"
 #include "game/mplayer/setup.h"
diff --git a/src/game/mpstats.c b/src/game/mpstats.c
index ab3bac9b7..86c4e540e 100644
--- a/src/game/mpstats.c
+++ b/src/game/mpstats.c
@@ -3,7 +3,7 @@
 #include "game/cheats.h"
 #include "game/inv.h"
 #include "game/bondgun.h"
-#include "game/game_0b0fd0.h"
+#include "game/gset.h"
 #include "game/player.h"
 #include "game/hudmsg.h"
 #include "game/playermgr.h"
diff --git a/src/game/pdmode.c b/src/game/pdmode.c
index 348fe69b4..a7306e01b 100644
--- a/src/game/pdmode.c
+++ b/src/game/pdmode.c
@@ -2,7 +2,7 @@
 #include "constants.h"
 #include "game/pdmode.h"
 #include "game/bondgun.h"
-#include "game/game_0b0fd0.h"
+#include "game/gset.h"
 #include "game/inv.h"
 #include "game/playermgr.h"
 #include "game/options.h"
diff --git a/src/game/player.c b/src/game/player.c
index 221485d02..ca7c3891c 100644
--- a/src/game/player.c
+++ b/src/game/player.c
@@ -19,7 +19,7 @@
 #include "game/bondgun.h"
 #include "game/env.h"
 #include "game/gunfx.h"
-#include "game/game_0b0fd0.h"
+#include "game/gset.h"
 #include "game/game_0b2150.h"
 #include "game/tex.h"
 #include "game/camera.h"
@@ -35,7 +35,7 @@
 #include "game/playermgr.h"
 #include "game/explosions.h"
 #include "game/bondview.h"
-#include "game/game_1531a0.h"
+#include "game/text.h"
 #include "game/bg.h"
 #include "game/stagetable.h"
 #include "game/room.h"
diff --git a/src/game/portal.c b/src/game/portal.c
index 51ac07fb4..922e6f8be 100644
--- a/src/game/portal.c
+++ b/src/game/portal.c
@@ -16,7 +16,7 @@
 #include "game/quaternion.h"
 #include "game/bondgun.h"
 #include "game/gunfx.h"
-#include "game/game_0b0fd0.h"
+#include "game/gset.h"
 #include "game/game_0b2150.h"
 #include "game/tex.h"
 #include "game/portal.h"
@@ -29,7 +29,7 @@
 #include "game/playermgr.h"
 #include "game/explosions.h"
 #include "game/bondview.h"
-#include "game/game_1531a0.h"
+#include "game/text.h"
 #include "game/bg.h"
 #include "game/stagetable.h"
 #include "game/room.h"
diff --git a/src/game/game_096360.c b/src/game/projectile.c
similarity index 98%
rename from src/game/game_096360.c
rename to src/game/projectile.c
index 1bea46224..8ce659235 100644
--- a/src/game/game_096360.c
+++ b/src/game/projectile.c
@@ -1,7 +1,7 @@
 #include <ultra64.h>
 #include "constants.h"
 #include "game/objectives.h"
-#include "game/game_096360.h"
+#include "game/projectile.h"
 #include "game/tex.h"
 #include "game/training.h"
 #include "game/propobj.h"
diff --git a/src/game/prop.c b/src/game/prop.c
index 6e4479b40..72086e710 100644
--- a/src/game/prop.c
+++ b/src/game/prop.c
@@ -12,7 +12,7 @@
 #include "game/floor.h"
 #include "game/ceil.h"
 #include "game/bondgun.h"
-#include "game/game_0b0fd0.h"
+#include "game/gset.h"
 #include "game/tex.h"
 #include "game/camera.h"
 #include "game/player.h"
diff --git a/src/game/propobj.c b/src/game/propobj.c
index c9552bf67..73625ed25 100644
--- a/src/game/propobj.c
+++ b/src/game/propobj.c
@@ -14,7 +14,7 @@
 #include "game/setuputils.h"
 #include "game/propsnd.h"
 #include "game/objectives.h"
-#include "game/game_096360.h"
+#include "game/projectile.h"
 #include "game/atan2f.h"
 #include "game/acosfasinf.h"
 #include "game/quaternion.h"
@@ -22,7 +22,7 @@
 #include "game/ceil.h"
 #include "game/bondgun.h"
 #include "game/gunfx.h"
-#include "game/game_0b0fd0.h"
+#include "game/gset.h"
 #include "game/modelmgr.h"
 #include "game/tex.h"
 #include "game/camera.h"
@@ -38,7 +38,7 @@
 #include "game/explosions.h"
 #include "game/smoke.h"
 #include "game/sparks.h"
-#include "game/game_1531a0.h"
+#include "game/text.h"
 #include "game/bg.h"
 #include "game/stagetable.h"
 #include "game/env.h"
diff --git a/src/game/proptick.c b/src/game/proptick.c
index a5aafcaef..04ea98b7c 100644
--- a/src/game/proptick.c
+++ b/src/game/proptick.c
@@ -9,10 +9,10 @@
 #include "game/prop.h"
 #include "game/propsnd.h"
 #include "game/objectives.h"
-#include "game/game_096360.h"
+#include "game/projectile.h"
 #include "game/bondgun.h"
 #include "game/gunfx.h"
-#include "game/game_0b0fd0.h"
+#include "game/gset.h"
 #include "game/modelmgr.h"
 #include "game/tex.h"
 #include "game/camera.h"
diff --git a/src/game/radar.c b/src/game/radar.c
index 22291cbe2..56bd407ba 100644
--- a/src/game/radar.c
+++ b/src/game/radar.c
@@ -6,7 +6,7 @@
 #include "game/game_0b2150.h"
 #include "game/tex.h"
 #include "game/game_152fa0.h"
-#include "game/game_1531a0.h"
+#include "game/text.h"
 #include "game/mplayer/scenarios.h"
 #include "game/radar.h"
 #include "game/options.h"
diff --git a/src/game/setup.c b/src/game/setup.c
index 16b6346c5..6a5acc659 100644
--- a/src/game/setup.c
+++ b/src/game/setup.c
@@ -1,7 +1,7 @@
 #include <ultra64.h>
 #include "constants.h"
 #include "game/cheats.h"
-#include "game/game_00b820.h"
+#include "game/chraireset.h"
 #include "game/setup.h"
 #include "game/objectives.h"
 #include "game/playerreset.h"
@@ -2174,5 +2174,5 @@ void setup_create_props(s32 stagenum)
 		chrmgr_configure(0);
 	}
 
-	stage_load_bgchrs();
+	chrai_load_bgchrs();
 }
diff --git a/src/game/sight.c b/src/game/sight.c
index 99ffe260c..7faf66f45 100644
--- a/src/game/sight.c
+++ b/src/game/sight.c
@@ -2,12 +2,12 @@
 #include "constants.h"
 #include "game/chraction.h"
 #include "game/bondgun.h"
-#include "game/game_0b0fd0.h"
+#include "game/gset.h"
 #include "game/game_0b2150.h"
 #include "game/tex.h"
 #include "game/savebuffer.h"
 #include "game/sight.h"
-#include "game/game_1531a0.h"
+#include "game/text.h"
 #include "game/file.h"
 #include "game/gfxmemory.h"
 #include "game/lang.h"
diff --git a/src/game/stars.c b/src/game/stars.c
index 42e8dfb19..f6df78227 100644
--- a/src/game/stars.c
+++ b/src/game/stars.c
@@ -3,7 +3,7 @@
 #include "game/game_006900.h"
 #include "game/tex.h"
 #include "game/stars.h"
-#include "game/game_1531a0.h"
+#include "game/text.h"
 #include "game/camera.h"
 #include "bss.h"
 #include "lib/vi.h"
diff --git a/src/game/game_1531a0.c b/src/game/text.c
similarity index 99%
rename from src/game/game_1531a0.c
rename to src/game/text.c
index 8ff4807fb..b372ca41f 100644
--- a/src/game/game_1531a0.c
+++ b/src/game/text.c
@@ -3,7 +3,7 @@
 #include "game/game_006900.h"
 #include "game/gfxmemory.h"
 #include "game/savebuffer.h"
-#include "game/game_1531a0.h"
+#include "game/text.h"
 #include "game/file.h"
 #include "game/lang.h"
 #include "bss.h"
diff --git a/src/game/title.c b/src/game/title.c
index 567c5bc24..b546314bb 100644
--- a/src/game/title.c
+++ b/src/game/title.c
@@ -10,7 +10,7 @@
 #include "game/gfxmemory.h"
 #include "game/credits.h"
 #include "game/bondview.h"
-#include "game/game_1531a0.h"
+#include "game/text.h"
 #include "game/file.h"
 #include "game/lv.h"
 #include "game/music.h"
diff --git a/src/game/training.c b/src/game/training.c
index 7cb0af02e..74cc7e70d 100644
--- a/src/game/training.c
+++ b/src/game/training.c
@@ -8,8 +8,8 @@
 #include "game/dlights.h"
 #include "game/explosions.h"
 #include "game/filemgr.h"
-#include "game/game_0b0fd0.h"
-#include "game/game_1531a0.h"
+#include "game/gset.h"
+#include "game/text.h"
 #include "game/gamefile.h"
 #include "game/hudmsg.h"
 #include "game/inv.h"
diff --git a/src/game/trainingmenus.c b/src/game/trainingmenus.c
index 5d8b67d5c..4d7ccd8dc 100644
--- a/src/game/trainingmenus.c
+++ b/src/game/trainingmenus.c
@@ -3,13 +3,13 @@
 #include "game/chraction.h"
 #include "game/ceil.h"
 #include "game/bondgun.h"
-#include "game/game_0b0fd0.h"
+#include "game/gset.h"
 #include "game/tex.h"
 #include "game/menugfx.h"
 #include "game/menu.h"
 #include "game/mainmenu.h"
 #include "game/inv.h"
-#include "game/game_1531a0.h"
+#include "game/text.h"
 #include "game/file.h"
 #include "game/texdecompress.h"
 #include "game/trainingmenus.h"
diff --git a/src/game/wallhit.c b/src/game/wallhit.c
index 48e2e62fc..4c0a545c0 100644
--- a/src/game/wallhit.c
+++ b/src/game/wallhit.c
@@ -2,7 +2,7 @@
 #include "constants.h"
 #include "game/dlights.h"
 #include "game/chr.h"
-#include "game/game_0b0fd0.h"
+#include "game/gset.h"
 #include "game/tex.h"
 #include "game/playermgr.h"
 #include "game/room.h"
diff --git a/src/include/game/game_13c510.h b/src/include/game/artifact.h
similarity index 84%
rename from src/include/game/game_13c510.h
rename to src/include/game/artifact.h
index 3861efec5..37b031bd9 100644
--- a/src/include/game/game_13c510.h
+++ b/src/include/game/artifact.h
@@ -1,5 +1,5 @@
-#ifndef _IN_GAME_GAME_13C510_H
-#define _IN_GAME_GAME_13C510_H
+#ifndef _IN_GAME_ARTIFACT_H
+#define _IN_GAME_ARTIFACT_H
 #include <ultra64.h>
 #include "data.h"
 #include "types.h"
diff --git a/src/include/game/chraireset.h b/src/include/game/chraireset.h
new file mode 100644
index 000000000..bc022e485
--- /dev/null
+++ b/src/include/game/chraireset.h
@@ -0,0 +1,10 @@
+#ifndef IN_GAME_CHRAIRESET_H
+#define IN_GAME_CHRAIRESET_H
+#include <ultra64.h>
+#include "data.h"
+#include "types.h"
+
+void chrai_reset(void);
+void chrai_load_bgchrs(void);
+
+#endif
diff --git a/src/include/game/game_00b820.h b/src/include/game/game_00b820.h
deleted file mode 100644
index 944e07917..000000000
--- a/src/include/game/game_00b820.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef IN_GAME_GAME_00B820_H
-#define IN_GAME_GAME_00B820_H
-#include <ultra64.h>
-#include "data.h"
-#include "types.h"
-
-void stage_reset(void);
-void stage_load_bgchrs(void);
-
-#endif
diff --git a/src/include/game/game_0b0fd0.h b/src/include/game/gset.h
similarity index 96%
rename from src/include/game/game_0b0fd0.h
rename to src/include/game/gset.h
index 2b5c14fb0..edc32f104 100644
--- a/src/include/game/game_0b0fd0.h
+++ b/src/include/game/gset.h
@@ -1,5 +1,5 @@
-#ifndef IN_GAME_GAME_0B0FD0_H
-#define IN_GAME_GAME_0B0FD0_H
+#ifndef IN_GAME_GSET_H
+#define IN_GAME_GSET_H
 #include <ultra64.h>
 #include "data.h"
 #include "types.h"
diff --git a/src/include/game/game_096360.h b/src/include/game/projectile.h
similarity index 84%
rename from src/include/game/game_096360.h
rename to src/include/game/projectile.h
index 879c27742..4436a2695 100644
--- a/src/include/game/game_096360.h
+++ b/src/include/game/projectile.h
@@ -1,5 +1,5 @@
-#ifndef _IN_GAME_GAME_096360_H
-#define _IN_GAME_GAME_096360_H
+#ifndef _IN_GAME_PROJECTILE_H
+#define _IN_GAME_PROJECTILE_H
 #include <ultra64.h>
 #include "data.h"
 #include "types.h"
diff --git a/src/include/game/game_1531a0.h b/src/include/game/text.h
similarity index 97%
rename from src/include/game/game_1531a0.h
rename to src/include/game/text.h
index ab4dac154..1c6814bc7 100644
--- a/src/include/game/game_1531a0.h
+++ b/src/include/game/text.h
@@ -1,5 +1,5 @@
-#ifndef _IN_GAME_GAME_1531A0_H
-#define _IN_GAME_GAME_1531A0_H
+#ifndef _IN_GAME_TEXT_H
+#define _IN_GAME_TEXT_H
 #include <ultra64.h>
 #include "data.h"
 #include "types.h"
diff --git a/src/lib/anim.c b/src/lib/anim.c
index e1187be9d..e8debb590 100644
--- a/src/lib/anim.c
+++ b/src/lib/anim.c
@@ -1,7 +1,7 @@
 #include <ultra64.h>
 #include "constants.h"
 #include "game/prop.h"
-#include "game/game_1531a0.h"
+#include "game/text.h"
 #include "game/bg.h"
 #include "bss.h"
 #include "lib/dma.h"
diff --git a/src/lib/collision.c b/src/lib/collision.c
index 62b3bbf35..5a6bbd457 100644
--- a/src/lib/collision.c
+++ b/src/lib/collision.c
@@ -1,7 +1,7 @@
 #include <ultra64.h>
 #include "constants.h"
 #include "game/prop.h"
-#include "game/game_1531a0.h"
+#include "game/text.h"
 #include "game/bg.h"
 #include "bss.h"
 #include "lib/dma.h"
diff --git a/src/lib/main.c b/src/lib/main.c
index 7f252bc1d..4f7b46d4e 100644
--- a/src/lib/main.c
+++ b/src/lib/main.c
@@ -28,7 +28,7 @@
 #include "game/objectives.h"
 #include "game/endscreen.h"
 #include "game/playermgr.h"
-#include "game/game_1531a0.h"
+#include "game/text.h"
 #include "game/gfxmemory.h"
 #include "game/lang.h"
 #include "game/lv.h"