From 470cf27ac167154078f0bf46874428c645391c0a Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Sat, 2 Jan 2021 12:35:50 +1000
Subject: [PATCH] Rename smoke and explosion files

---
 ld/gamefiles.inc                              | 11 ++-
 src/game/chr/chr.c                            |  4 +-
 src/game/chr/chraction.c                      |  2 +-
 src/game/chr/chraicommands.c                  |  4 +-
 src/game/core.c                               | 17 ++--
 src/game/dlights.c                            |  2 +-
 .../{explosion.c => explosions/explosions.c}  |  4 +-
 src/game/{game_015280.c => explosions/free.c} |  2 +-
 src/game/explosions/init.c                    | 93 +++++++++++++++++++
 src/game/game_0601b0.c                        |  4 +-
 src/game/game_097ba0.c                        |  2 +-
 src/game/game_0b63b0.c                        |  2 +-
 src/game/propobj.c                            |  4 +-
 src/game/{game_015330.c => smoke/free.c}      |  2 +-
 src/game/{game_013010.c => smoke/init.c}      | 83 +----------------
 src/game/{ => smoke}/smoke.c                  |  2 +-
 src/game/splat.c                              |  2 +-
 src/game/training.c                           |  2 +-
 .../{explosion.h => explosions/explosions.h}  |  4 +-
 src/include/game/explosions/free.h            |  8 ++
 src/include/game/explosions/init.h            |  8 ++
 src/include/game/game_013010.h                |  9 --
 src/include/game/game_015280.h                |  8 --
 src/include/game/game_015330.h                |  8 --
 src/include/game/smoke/free.h                 |  8 ++
 src/include/game/smoke/init.h                 |  8 ++
 src/include/game/{ => smoke}/smoke.h          |  4 +-
 27 files changed, 164 insertions(+), 143 deletions(-)
 rename src/game/{explosion.c => explosions/explosions.c} (99%)
 rename src/game/{game_015280.c => explosions/free.c} (95%)
 create mode 100644 src/game/explosions/init.c
 rename src/game/{game_015330.c => smoke/free.c} (96%)
 rename src/game/{game_013010.c => smoke/init.c} (53%)
 rename src/game/{ => smoke}/smoke.c (99%)
 rename src/include/game/{explosion.h => explosions/explosions.h} (92%)
 create mode 100644 src/include/game/explosions/free.h
 create mode 100644 src/include/game/explosions/init.h
 delete mode 100644 src/include/game/game_013010.h
 delete mode 100644 src/include/game/game_015280.h
 delete mode 100644 src/include/game/game_015330.h
 create mode 100644 src/include/game/smoke/free.h
 create mode 100644 src/include/game/smoke/init.h
 rename src/include/game/{ => smoke}/smoke.h (91%)

diff --git a/ld/gamefiles.inc b/ld/gamefiles.inc
index cee5304c3..5c6bfae5a 100644
--- a/ld/gamefiles.inc
+++ b/ld/gamefiles.inc
@@ -30,7 +30,8 @@
 	build/ROMID/game/game_012450.o (section); \
 	build/ROMID/game/game_0125a0.o (section); \
 	build/ROMID/game/game_012d50.o (section); \
-	build/ROMID/game/game_013010.o (section); \
+	build/ROMID/game/explosions/init.o (section); \
+	build/ROMID/game/smoke/init.o (section); \
 	build/ROMID/game/sparks/init.o (section); \
 	build/ROMID/game/weather/init.o (section); \
 	build/ROMID/game/game_013540.o (section); \
@@ -45,8 +46,8 @@
 	build/ROMID/game/game_0151f0.o (section); \
 	build/ROMID/game/game_015260.o (section); \
 	build/ROMID/game/game_015270.o (section); \
-	build/ROMID/game/game_015280.o (section); \
-	build/ROMID/game/game_015330.o (section); \
+	build/ROMID/game/explosions/free.o (section); \
+	build/ROMID/game/smoke/free.o (section); \
 	build/ROMID/game/game_0153f0.o (section); \
 	build/ROMID/game/game_015400.o (section); \
 	build/ROMID/game/game_015410.o (section); \
@@ -131,8 +132,8 @@
 	build/ROMID/game/game_127910.o (section); \
 	build/ROMID/game/game_128f30.o (section); \
 	build/ROMID/game/game_129210.o (section); \
-	build/ROMID/game/explosion.o (section); \
-	build/ROMID/game/smoke.o (section); \
+	build/ROMID/game/explosions/explosions.o (section); \
+	build/ROMID/game/smoke/smoke.o (section); \
 	build/ROMID/game/sparks/sparks.o (section); \
 	build/ROMID/game/weather/weather.o (section); \
 	build/ROMID/game/game_135c70.o (section); \
diff --git a/src/game/chr/chr.c b/src/game/chr/chr.c
index 68a64637a..76aba5fe9 100644
--- a/src/game/chr/chr.c
+++ b/src/game/chr/chr.c
@@ -27,8 +27,8 @@
 #include "game/game_127910.h"
 #include "game/game_128f30.h"
 #include "game/game_129210.h"
-#include "game/explosion.h"
-#include "game/smoke.h"
+#include "game/explosions/explosions.h"
+#include "game/smoke/smoke.h"
 #include "game/sparks/sparks.h"
 #include "game/game_157db0.h"
 #include "game/game_165670.h"
diff --git a/src/game/chr/chraction.c b/src/game/chr/chraction.c
index 3cb1ea68d..9cbba26c1 100644
--- a/src/game/chr/chraction.c
+++ b/src/game/chr/chraction.c
@@ -28,7 +28,7 @@
 #include "game/game_0b63b0.h"
 #include "game/game_111600.h"
 #include "game/game_127910.h"
-#include "game/explosion.h"
+#include "game/explosions/explosions.h"
 #include "game/sparks/sparks.h"
 #include "game/game_157db0.h"
 #include "game/game_1655c0.h"
diff --git a/src/game/chr/chraicommands.c b/src/game/chr/chraicommands.c
index a0a29dd38..038cf66f4 100644
--- a/src/game/chr/chraicommands.c
+++ b/src/game/chr/chraicommands.c
@@ -31,8 +31,8 @@
 #include "game/game_0dcdb0.h"
 #include "game/game_111600.h"
 #include "game/game_127910.h"
-#include "game/explosion.h"
-#include "game/smoke.h"
+#include "game/explosions/explosions.h"
+#include "game/smoke/smoke.h"
 #include "game/weather/weather.h"
 #include "game/game_157db0.h"
 #include "game/game_1655c0.h"
diff --git a/src/game/core.c b/src/game/core.c
index f9ee12e33..75c23e83f 100644
--- a/src/game/core.c
+++ b/src/game/core.c
@@ -28,7 +28,8 @@
 #include "game/game_011110.h"
 #include "game/game_012450.h"
 #include "game/game_0125a0.h"
-#include "game/game_013010.h"
+#include "game/explosions/init.h"
+#include "game/smoke/init.h"
 #include "game/sparks/init.h"
 #include "game/weather/init.h"
 #include "game/game_013540.h"
@@ -42,8 +43,8 @@
 #include "game/game_0151f0.h"
 #include "game/game_015260.h"
 #include "game/game_015270.h"
-#include "game/game_015280.h"
-#include "game/game_015330.h"
+#include "game/explosions/free.h"
+#include "game/smoke/free.h"
 #include "game/game_0153f0.h"
 #include "game/game_015400.h"
 #include "game/game_015410.h"
@@ -73,7 +74,7 @@
 #include "game/game_11f000.h"
 #include "game/game_127910.h"
 #include "game/game_129210.h"
-#include "game/explosion.h"
+#include "game/explosions/explosions.h"
 #include "game/sparks/sparks.h"
 #include "game/weather/weather.h"
 #include "game/game_135c70.h"
@@ -366,8 +367,8 @@ void coreLoadStage(s32 stagenum)
 	stageChooseActiveHeads(stagenum);
 	setupParseObjects(stagenum);
 	tagsAllocatePtrs();
-	func0f013010();
-	func0f013130();
+	explosionsInit();
+	smokeInit();
 	sparksInit();
 	weatherInit();
 	coreStopAllMiscSfx();
@@ -2763,8 +2764,8 @@ void coreUnloadStage(void)
 	}
 
 	func0f014f10();
-	explosionsClearAll();
-	smokeClearAll();
+	explosionsFree();
+	smokeFree();
 	func0f015400();
 	func0f015410();
 	func0f015420();
diff --git a/src/game/dlights.c b/src/game/dlights.c
index 1276545eb..50bcc7ffe 100644
--- a/src/game/dlights.c
+++ b/src/game/dlights.c
@@ -12,7 +12,7 @@
 #include "game/game_092610.h"
 #include "game/game_0b3350.h"
 #include "game/game_0b63b0.h"
-#include "game/smoke.h"
+#include "game/smoke/smoke.h"
 #include "game/sparks/sparks.h"
 #include "game/game_157db0.h"
 #include "game/game_166e40.h"
diff --git a/src/game/explosion.c b/src/game/explosions/explosions.c
similarity index 99%
rename from src/game/explosion.c
rename to src/game/explosions/explosions.c
index ca42f771f..849966f41 100644
--- a/src/game/explosion.c
+++ b/src/game/explosions/explosions.c
@@ -14,8 +14,8 @@
 #include "game/game_091e10.h"
 #include "game/game_092610.h"
 #include "game/game_0b3350.h"
-#include "game/explosion.h"
-#include "game/smoke.h"
+#include "game/explosions/explosions.h"
+#include "game/smoke/smoke.h"
 #include "game/game_157db0.h"
 #include "game/game_1668e0.h"
 #include "game/game_166e40.h"
diff --git a/src/game/game_015280.c b/src/game/explosions/free.c
similarity index 95%
rename from src/game/game_015280.c
rename to src/game/explosions/free.c
index aebe666e8..09b2ee877 100644
--- a/src/game/game_015280.c
+++ b/src/game/explosions/free.c
@@ -12,7 +12,7 @@
 #include "lib/lib_09660.h"
 #include "types.h"
 
-void explosionsClearAll(void)
+void explosionsFree(void)
 {
 	s32 i;
 
diff --git a/src/game/explosions/init.c b/src/game/explosions/init.c
new file mode 100644
index 000000000..4cde35af6
--- /dev/null
+++ b/src/game/explosions/init.c
@@ -0,0 +1,93 @@
+#include <ultra64.h>
+#include "constants.h"
+#include "game/data/data_000000.h"
+#include "game/data/data_0083d0.h"
+#include "game/data/data_00e460.h"
+#include "game/data/data_0160b0.h"
+#include "game/data/data_01a3a0.h"
+#include "game/data/data_020df0.h"
+#include "game/data/data_02da90.h"
+#include "gvars/gvars.h"
+#include "lib/lib_121e0.h"
+#include "types.h"
+
+GLOBAL_ASM(
+glabel explosionsInit
+/*  f013010:	3c018008 */ 	lui	$at,%hi(var8007e4a0)
+/*  f013014:	ac20e4a0 */ 	sw	$zero,%lo(var8007e4a0)($at)
+/*  f013018:	3c018008 */ 	lui	$at,%hi(var8007e4a4)
+/*  f01301c:	ac20e4a4 */ 	sw	$zero,%lo(var8007e4a4)($at)
+/*  f013020:	3c013f80 */ 	lui	$at,0x3f80
+/*  f013024:	44812000 */ 	mtc1	$at,$f4
+/*  f013028:	3c08800a */ 	lui	$t0,%hi(g_NumExplosions)
+/*  f01302c:	3c018008 */ 	lui	$at,%hi(var8007e4a8)
+/*  f013030:	25083434 */ 	addiu	$t0,$t0,%lo(g_NumExplosions)
+/*  f013034:	240e0006 */ 	addiu	$t6,$zero,0x6
+/*  f013038:	e424e4a8 */ 	swc1	$f4,%lo(var8007e4a8)($at)
+/*  f01303c:	ad0e0000 */ 	sw	$t6,0x0($t0)
+/*  f013040:	3c0f800a */ 	lui	$t7,%hi(g_Vars+0x4b4)
+/*  f013044:	8defa474 */ 	lw	$t7,%lo(g_Vars+0x4b4)($t7)
+/*  f013048:	27bdffe8 */ 	addiu	$sp,$sp,-24
+/*  f01304c:	afbf0014 */ 	sw	$ra,0x14($sp)
+/*  f013050:	29e1005a */ 	slti	$at,$t7,0x5a
+/*  f013054:	14200002 */ 	bnez	$at,.L0f013060
+/*  f013058:	3c05800a */ 	lui	$a1,%hi(g_Explosions)
+/*  f01305c:	ad000000 */ 	sw	$zero,0x0($t0)
+.L0f013060:
+/*  f013060:	8d020000 */ 	lw	$v0,0x0($t0)
+/*  f013064:	24a53430 */ 	addiu	$a1,$a1,%lo(g_Explosions)
+/*  f013068:	54400004 */ 	bnezl	$v0,.L0f01307c
+/*  f01306c:	000220c0 */ 	sll	$a0,$v0,0x3
+/*  f013070:	1000002b */ 	b	.L0f013120
+/*  f013074:	aca00000 */ 	sw	$zero,0x0($a1)
+/*  f013078:	000220c0 */ 	sll	$a0,$v0,0x3
+.L0f01307c:
+/*  f01307c:	00822021 */ 	addu	$a0,$a0,$v0
+/*  f013080:	00042100 */ 	sll	$a0,$a0,0x4
+/*  f013084:	00822023 */ 	subu	$a0,$a0,$v0
+/*  f013088:	000420c0 */ 	sll	$a0,$a0,0x3
+/*  f01308c:	2484000f */ 	addiu	$a0,$a0,0xf
+/*  f013090:	2401fff0 */ 	addiu	$at,$zero,-16
+/*  f013094:	0081c024 */ 	and	$t8,$a0,$at
+/*  f013098:	03002025 */ 	or	$a0,$t8,$zero
+/*  f01309c:	0c0048f2 */ 	jal	malloc
+/*  f0130a0:	24050004 */ 	addiu	$a1,$zero,0x4
+/*  f0130a4:	3c08800a */ 	lui	$t0,%hi(g_NumExplosions)
+/*  f0130a8:	25083434 */ 	addiu	$t0,$t0,%lo(g_NumExplosions)
+/*  f0130ac:	8d190000 */ 	lw	$t9,0x0($t0)
+/*  f0130b0:	3c05800a */ 	lui	$a1,%hi(g_Explosions)
+/*  f0130b4:	24a53430 */ 	addiu	$a1,$a1,%lo(g_Explosions)
+/*  f0130b8:	aca20000 */ 	sw	$v0,0x0($a1)
+/*  f0130bc:	1b200018 */ 	blez	$t9,.L0f013120
+/*  f0130c0:	00002025 */ 	or	$a0,$zero,$zero
+/*  f0130c4:	00003025 */ 	or	$a2,$zero,$zero
+/*  f0130c8:	240303c0 */ 	addiu	$v1,$zero,0x3c0
+/*  f0130cc:	8ca90000 */ 	lw	$t1,0x0($a1)
+.L0f0130d0:
+/*  f0130d0:	00001025 */ 	or	$v0,$zero,$zero
+/*  f0130d4:	01265021 */ 	addu	$t2,$t1,$a2
+/*  f0130d8:	ad400000 */ 	sw	$zero,0x0($t2)
+.L0f0130dc:
+/*  f0130dc:	000460c0 */ 	sll	$t4,$a0,0x3
+/*  f0130e0:	01846021 */ 	addu	$t4,$t4,$a0
+/*  f0130e4:	8cab0000 */ 	lw	$t3,0x0($a1)
+/*  f0130e8:	000c6100 */ 	sll	$t4,$t4,0x4
+/*  f0130ec:	01846023 */ 	subu	$t4,$t4,$a0
+/*  f0130f0:	000c60c0 */ 	sll	$t4,$t4,0x3
+/*  f0130f4:	016c6821 */ 	addu	$t5,$t3,$t4
+/*  f0130f8:	01a27021 */ 	addu	$t6,$t5,$v0
+/*  f0130fc:	24420018 */ 	addiu	$v0,$v0,0x18
+/*  f013100:	1443fff6 */ 	bne	$v0,$v1,.L0f0130dc
+/*  f013104:	a5c0001c */ 	sh	$zero,0x1c($t6)
+/*  f013108:	8d0f0000 */ 	lw	$t7,0x0($t0)
+/*  f01310c:	24840001 */ 	addiu	$a0,$a0,0x1
+/*  f013110:	24c60478 */ 	addiu	$a2,$a2,0x478
+/*  f013114:	008f082a */ 	slt	$at,$a0,$t7
+/*  f013118:	5420ffed */ 	bnezl	$at,.L0f0130d0
+/*  f01311c:	8ca90000 */ 	lw	$t1,0x0($a1)
+.L0f013120:
+/*  f013120:	8fbf0014 */ 	lw	$ra,0x14($sp)
+/*  f013124:	27bd0018 */ 	addiu	$sp,$sp,0x18
+/*  f013128:	03e00008 */ 	jr	$ra
+/*  f01312c:	00000000 */ 	nop
+);
diff --git a/src/game/game_0601b0.c b/src/game/game_0601b0.c
index d9f9638a1..8fda25218 100644
--- a/src/game/game_0601b0.c
+++ b/src/game/game_0601b0.c
@@ -22,8 +22,8 @@
 #include "game/game_0b3350.h"
 #include "game/game_0b63b0.h"
 #include "game/game_127910.h"
-#include "game/explosion.h"
-#include "game/smoke.h"
+#include "game/explosions/explosions.h"
+#include "game/smoke/smoke.h"
 #include "game/sparks/sparks.h"
 #include "game/game_157db0.h"
 #include "game/game_190260.h"
diff --git a/src/game/game_097ba0.c b/src/game/game_097ba0.c
index d4aafe0fe..9a7131d15 100644
--- a/src/game/game_097ba0.c
+++ b/src/game/game_097ba0.c
@@ -30,7 +30,7 @@
 #include "game/game_0d7070.h"
 #include "game/game_111600.h"
 #include "game/game_127910.h"
-#include "game/smoke.h"
+#include "game/smoke/smoke.h"
 #include "game/game_1531a0.h"
 #include "game/game_166e40.h"
 #include "game/core.h"
diff --git a/src/game/game_0b63b0.c b/src/game/game_0b63b0.c
index 9f8c86e5d..8579b4310 100644
--- a/src/game/game_0b63b0.c
+++ b/src/game/game_0b63b0.c
@@ -34,7 +34,7 @@
 #include "game/game_107fb0.h"
 #include "game/game_111600.h"
 #include "game/game_127910.h"
-#include "game/explosion.h"
+#include "game/explosions/explosions.h"
 #include "game/bondview.h"
 #include "game/game_1531a0.h"
 #include "game/game_157db0.h"
diff --git a/src/game/propobj.c b/src/game/propobj.c
index ea4f9fe12..7683dc864 100644
--- a/src/game/propobj.c
+++ b/src/game/propobj.c
@@ -42,8 +42,8 @@
 #include "game/game_127910.h"
 #include "game/game_128f30.h"
 #include "game/game_129210.h"
-#include "game/explosion.h"
-#include "game/smoke.h"
+#include "game/explosions/explosions.h"
+#include "game/smoke/smoke.h"
 #include "game/sparks/sparks.h"
 #include "game/game_150820.h"
 #include "game/game_1531a0.h"
diff --git a/src/game/game_015330.c b/src/game/smoke/free.c
similarity index 96%
rename from src/game/game_015330.c
rename to src/game/smoke/free.c
index 6580fc283..02b5cb458 100644
--- a/src/game/game_015330.c
+++ b/src/game/smoke/free.c
@@ -11,7 +11,7 @@
 #include "gvars/gvars.h"
 #include "types.h"
 
-void smokeClearAll(void)
+void smokeFree(void)
 {
 	s32 i;
 
diff --git a/src/game/game_013010.c b/src/game/smoke/init.c
similarity index 53%
rename from src/game/game_013010.c
rename to src/game/smoke/init.c
index 1608d727c..8c4c61c0d 100644
--- a/src/game/game_013010.c
+++ b/src/game/smoke/init.c
@@ -12,88 +12,7 @@
 #include "types.h"
 
 GLOBAL_ASM(
-glabel func0f013010
-/*  f013010:	3c018008 */ 	lui	$at,%hi(var8007e4a0)
-/*  f013014:	ac20e4a0 */ 	sw	$zero,%lo(var8007e4a0)($at)
-/*  f013018:	3c018008 */ 	lui	$at,%hi(var8007e4a4)
-/*  f01301c:	ac20e4a4 */ 	sw	$zero,%lo(var8007e4a4)($at)
-/*  f013020:	3c013f80 */ 	lui	$at,0x3f80
-/*  f013024:	44812000 */ 	mtc1	$at,$f4
-/*  f013028:	3c08800a */ 	lui	$t0,%hi(g_NumExplosions)
-/*  f01302c:	3c018008 */ 	lui	$at,%hi(var8007e4a8)
-/*  f013030:	25083434 */ 	addiu	$t0,$t0,%lo(g_NumExplosions)
-/*  f013034:	240e0006 */ 	addiu	$t6,$zero,0x6
-/*  f013038:	e424e4a8 */ 	swc1	$f4,%lo(var8007e4a8)($at)
-/*  f01303c:	ad0e0000 */ 	sw	$t6,0x0($t0)
-/*  f013040:	3c0f800a */ 	lui	$t7,%hi(g_Vars+0x4b4)
-/*  f013044:	8defa474 */ 	lw	$t7,%lo(g_Vars+0x4b4)($t7)
-/*  f013048:	27bdffe8 */ 	addiu	$sp,$sp,-24
-/*  f01304c:	afbf0014 */ 	sw	$ra,0x14($sp)
-/*  f013050:	29e1005a */ 	slti	$at,$t7,0x5a
-/*  f013054:	14200002 */ 	bnez	$at,.L0f013060
-/*  f013058:	3c05800a */ 	lui	$a1,%hi(g_Explosions)
-/*  f01305c:	ad000000 */ 	sw	$zero,0x0($t0)
-.L0f013060:
-/*  f013060:	8d020000 */ 	lw	$v0,0x0($t0)
-/*  f013064:	24a53430 */ 	addiu	$a1,$a1,%lo(g_Explosions)
-/*  f013068:	54400004 */ 	bnezl	$v0,.L0f01307c
-/*  f01306c:	000220c0 */ 	sll	$a0,$v0,0x3
-/*  f013070:	1000002b */ 	b	.L0f013120
-/*  f013074:	aca00000 */ 	sw	$zero,0x0($a1)
-/*  f013078:	000220c0 */ 	sll	$a0,$v0,0x3
-.L0f01307c:
-/*  f01307c:	00822021 */ 	addu	$a0,$a0,$v0
-/*  f013080:	00042100 */ 	sll	$a0,$a0,0x4
-/*  f013084:	00822023 */ 	subu	$a0,$a0,$v0
-/*  f013088:	000420c0 */ 	sll	$a0,$a0,0x3
-/*  f01308c:	2484000f */ 	addiu	$a0,$a0,0xf
-/*  f013090:	2401fff0 */ 	addiu	$at,$zero,-16
-/*  f013094:	0081c024 */ 	and	$t8,$a0,$at
-/*  f013098:	03002025 */ 	or	$a0,$t8,$zero
-/*  f01309c:	0c0048f2 */ 	jal	malloc
-/*  f0130a0:	24050004 */ 	addiu	$a1,$zero,0x4
-/*  f0130a4:	3c08800a */ 	lui	$t0,%hi(g_NumExplosions)
-/*  f0130a8:	25083434 */ 	addiu	$t0,$t0,%lo(g_NumExplosions)
-/*  f0130ac:	8d190000 */ 	lw	$t9,0x0($t0)
-/*  f0130b0:	3c05800a */ 	lui	$a1,%hi(g_Explosions)
-/*  f0130b4:	24a53430 */ 	addiu	$a1,$a1,%lo(g_Explosions)
-/*  f0130b8:	aca20000 */ 	sw	$v0,0x0($a1)
-/*  f0130bc:	1b200018 */ 	blez	$t9,.L0f013120
-/*  f0130c0:	00002025 */ 	or	$a0,$zero,$zero
-/*  f0130c4:	00003025 */ 	or	$a2,$zero,$zero
-/*  f0130c8:	240303c0 */ 	addiu	$v1,$zero,0x3c0
-/*  f0130cc:	8ca90000 */ 	lw	$t1,0x0($a1)
-.L0f0130d0:
-/*  f0130d0:	00001025 */ 	or	$v0,$zero,$zero
-/*  f0130d4:	01265021 */ 	addu	$t2,$t1,$a2
-/*  f0130d8:	ad400000 */ 	sw	$zero,0x0($t2)
-.L0f0130dc:
-/*  f0130dc:	000460c0 */ 	sll	$t4,$a0,0x3
-/*  f0130e0:	01846021 */ 	addu	$t4,$t4,$a0
-/*  f0130e4:	8cab0000 */ 	lw	$t3,0x0($a1)
-/*  f0130e8:	000c6100 */ 	sll	$t4,$t4,0x4
-/*  f0130ec:	01846023 */ 	subu	$t4,$t4,$a0
-/*  f0130f0:	000c60c0 */ 	sll	$t4,$t4,0x3
-/*  f0130f4:	016c6821 */ 	addu	$t5,$t3,$t4
-/*  f0130f8:	01a27021 */ 	addu	$t6,$t5,$v0
-/*  f0130fc:	24420018 */ 	addiu	$v0,$v0,0x18
-/*  f013100:	1443fff6 */ 	bne	$v0,$v1,.L0f0130dc
-/*  f013104:	a5c0001c */ 	sh	$zero,0x1c($t6)
-/*  f013108:	8d0f0000 */ 	lw	$t7,0x0($t0)
-/*  f01310c:	24840001 */ 	addiu	$a0,$a0,0x1
-/*  f013110:	24c60478 */ 	addiu	$a2,$a2,0x478
-/*  f013114:	008f082a */ 	slt	$at,$a0,$t7
-/*  f013118:	5420ffed */ 	bnezl	$at,.L0f0130d0
-/*  f01311c:	8ca90000 */ 	lw	$t1,0x0($a1)
-.L0f013120:
-/*  f013120:	8fbf0014 */ 	lw	$ra,0x14($sp)
-/*  f013124:	27bd0018 */ 	addiu	$sp,$sp,0x18
-/*  f013128:	03e00008 */ 	jr	$ra
-/*  f01312c:	00000000 */ 	nop
-);
-
-GLOBAL_ASM(
-glabel func0f013130
+glabel smokeInit
 /*  f013130:	3c0e8009 */ 	lui	$t6,%hi(g_Is4Mb)
 /*  f013134:	91ce0af0 */ 	lbu	$t6,%lo(g_Is4Mb)($t6)
 /*  f013138:	27bdffe8 */ 	addiu	$sp,$sp,-24
diff --git a/src/game/smoke.c b/src/game/smoke/smoke.c
similarity index 99%
rename from src/game/smoke.c
rename to src/game/smoke/smoke.c
index 635fb578e..541a23fea 100644
--- a/src/game/smoke.c
+++ b/src/game/smoke/smoke.c
@@ -10,7 +10,7 @@
 #include "game/dlights.h"
 #include "game/game_0601b0.h"
 #include "game/game_0b3350.h"
-#include "game/smoke.h"
+#include "game/smoke/smoke.h"
 #include "game/game_157db0.h"
 #include "game/game_1668e0.h"
 #include "game/game_166e40.h"
diff --git a/src/game/splat.c b/src/game/splat.c
index 36bd18cc4..e9550d430 100644
--- a/src/game/splat.c
+++ b/src/game/splat.c
@@ -7,7 +7,7 @@
 #include "game/data/data_01a3a0.h"
 #include "game/data/data_020df0.h"
 #include "game/data/data_02da90.h"
-#include "game/smoke.h"
+#include "game/smoke/smoke.h"
 #include "game/game_157db0.h"
 #include "game/propobj.h"
 #include "game/splat.h"
diff --git a/src/game/training.c b/src/game/training.c
index 210e6308a..5c30e75e7 100644
--- a/src/game/training.c
+++ b/src/game/training.c
@@ -21,7 +21,7 @@
 #include "game/game_0f09f0.h"
 #include "game/game_107fb0.h"
 #include "game/game_111600.h"
-#include "game/explosion.h"
+#include "game/explosions/explosions.h"
 #include "game/game_150820.h"
 #include "game/game_1531a0.h"
 #include "game/game_157db0.h"
diff --git a/src/include/game/explosion.h b/src/include/game/explosions/explosions.h
similarity index 92%
rename from src/include/game/explosion.h
rename to src/include/game/explosions/explosions.h
index 1986631b8..61abac4ee 100644
--- a/src/include/game/explosion.h
+++ b/src/include/game/explosions/explosions.h
@@ -1,5 +1,5 @@
-#ifndef IN_GAME_EXPLOSION_H
-#define IN_GAME_EXPLOSION_H
+#ifndef IN_GAME_EXPLOSIONS_EXPLOSIONS_H
+#define IN_GAME_EXPLOSIONS_EXPLOSIONS_H
 #include <ultra64.h>
 #include "types.h"
 
diff --git a/src/include/game/explosions/free.h b/src/include/game/explosions/free.h
new file mode 100644
index 000000000..330c1d3dd
--- /dev/null
+++ b/src/include/game/explosions/free.h
@@ -0,0 +1,8 @@
+#ifndef IN_GAME_EXPLOSIONS_FREE_H
+#define IN_GAME_EXPLOSIONS_FREE_H
+#include <ultra64.h>
+#include "types.h"
+
+void explosionsFree(void);
+
+#endif
diff --git a/src/include/game/explosions/init.h b/src/include/game/explosions/init.h
new file mode 100644
index 000000000..77d1698b7
--- /dev/null
+++ b/src/include/game/explosions/init.h
@@ -0,0 +1,8 @@
+#ifndef _IN_GAME_EXPLOSIONS_INIT_H
+#define _IN_GAME_EXPLOSIONS_INIT_H
+#include <ultra64.h>
+#include "types.h"
+
+void explosionsInit(void);
+
+#endif
diff --git a/src/include/game/game_013010.h b/src/include/game/game_013010.h
deleted file mode 100644
index 23183ce46..000000000
--- a/src/include/game/game_013010.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef _IN_GAME_GAME_013010_H
-#define _IN_GAME_GAME_013010_H
-#include <ultra64.h>
-#include "types.h"
-
-void func0f013010(void);
-void func0f013130(void);
-
-#endif
diff --git a/src/include/game/game_015280.h b/src/include/game/game_015280.h
deleted file mode 100644
index 2c6440210..000000000
--- a/src/include/game/game_015280.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef IN_GAME_GAME_015280_H
-#define IN_GAME_GAME_015280_H
-#include <ultra64.h>
-#include "types.h"
-
-u32 explosionsClearAll(void);
-
-#endif
diff --git a/src/include/game/game_015330.h b/src/include/game/game_015330.h
deleted file mode 100644
index f0f5d3d98..000000000
--- a/src/include/game/game_015330.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef _IN_GAME_GAME_015330_H
-#define _IN_GAME_GAME_015330_H
-#include <ultra64.h>
-#include "types.h"
-
-void smokeClearAll(void);
-
-#endif
diff --git a/src/include/game/smoke/free.h b/src/include/game/smoke/free.h
new file mode 100644
index 000000000..2a46c3085
--- /dev/null
+++ b/src/include/game/smoke/free.h
@@ -0,0 +1,8 @@
+#ifndef _IN_GAME_SMOKE_FREE_H
+#define _IN_GAME_SMOKE_FREE_H
+#include <ultra64.h>
+#include "types.h"
+
+void smokeFree(void);
+
+#endif
diff --git a/src/include/game/smoke/init.h b/src/include/game/smoke/init.h
new file mode 100644
index 000000000..74afdd7bf
--- /dev/null
+++ b/src/include/game/smoke/init.h
@@ -0,0 +1,8 @@
+#ifndef _IN_GAME_SMOKE_INIT_H
+#define _IN_GAME_SMOKE_INIT_H
+#include <ultra64.h>
+#include "types.h"
+
+void smokeInit(void);
+
+#endif
diff --git a/src/include/game/smoke.h b/src/include/game/smoke/smoke.h
similarity index 91%
rename from src/include/game/smoke.h
rename to src/include/game/smoke/smoke.h
index c31a98106..6d121a1c8 100644
--- a/src/include/game/smoke.h
+++ b/src/include/game/smoke/smoke.h
@@ -1,5 +1,5 @@
-#ifndef _IN_GAME_SMOKE_H
-#define _IN_GAME_SMOKE_H
+#ifndef _IN_GAME_SMOKE_SMOKE_H
+#define _IN_GAME_SMOKE_SMOKE_H
 #include <ultra64.h>
 #include "types.h"