diff --git a/data/const/demoScreen.s b/data/const/demo.s
similarity index 100%
rename from data/const/demoScreen.s
rename to data/const/demo.s
diff --git a/include/enemy.h b/include/enemy.h
index 8e38e557..801eb97d 100644
--- a/include/enemy.h
+++ b/include/enemy.h
@@ -132,107 +132,107 @@ typedef enum {
     /*0x66*/ ENEMY_66
 } Enemy;
 
-extern void Octorok(Entity*);
-extern void Chuchu(Entity*);
-extern void Leever(Entity*);
-extern void Peahat(Entity*);
-extern void Rollobite(Entity*);
-extern void DarkNut(Entity*);
-extern void HangingSeed(Entity*);
-extern void Beetle(Entity*);
-extern void Keese(Entity*);
-extern void DoorMimic(Entity*);
-extern void RockChuchu(Entity*);
-extern void SpinyChuchu(Entity*);
-extern void CuccoChickAggr(Entity*);
-extern void Moldorm(Entity*);
-extern void EnemyE(Entity*);
-extern void Moldworm(Entity*);
-extern void Sluggula(Entity*);
-extern void Pesto(Entity*);
-extern void Puffstool(Entity*);
-extern void ChuchuBoss(Entity*);
-extern void LikeLike(Entity*);
-extern void SpearMoblin(Entity*);
-extern void BusinessScrub(Entity*);
-extern void RupeeLike(Entity*);
-extern void Madderpillar(Entity*);
-extern void WaterDrop(Entity*);
-extern void WallMaster(Entity*);
-extern void BombPeahat(Entity*);
-extern void Spark(Entity*);
-extern void Chaser(Entity*);
-extern void SpikedBeetle(Entity*);
-extern void SensorBladeTrap(Entity*);
-extern void Helmasaur(Entity*);
-extern void FallingBoulder(Entity*);
-extern void Bobomb(Entity*);
-extern void WallMaster2(Entity*);
-extern void Gleerok(Entity*);
-extern void VaatiEyesMacro(Entity*);
-extern void Tektite(Entity*);
-extern void WizzrobeWind(Entity*);
-extern void WizzrobeFire(Entity*);
-extern void WizzrobeIce(Entity*);
-extern void Armos(Entity*);
-extern void Eyegore(Entity*);
-extern void Rope(Entity*);
-extern void SmallPesto(Entity*);
-extern void AcroBandit(Entity*);
-extern void BladeTrap(Entity*);
-extern void Keaton(Entity*);
-extern void Crow(Entity*);
-extern void Mulldozer(Entity*);
-extern void Bombarossa(Entity*);
-extern void Wisp(Entity*);
-extern void SpinyBeetle(Entity*);
-extern void MazaalHead(Entity*);
-extern void MazaalMacro(Entity*);
-extern void MazaalHand(Entity*);
-extern void OctorokBoss(Entity*);
-extern void FlyingPot(Entity*);
-extern void Gibdo(Entity*);
-extern void OctorokGolden(Entity*);
-extern void TektiteGolden(Entity*);
-extern void RopeGolden(Entity*);
-extern void CloudPiranha(Entity*);
-extern void ScissorsBeetle(Entity*);
-extern void CuccoAggr(Entity*);
-extern void Stalfos(Entity*);
-extern void FlyingSkull(Entity*);
-extern void MazaalBracelet(Entity*);
-extern void Takkuri(Entity*);
-extern void BowMoblin(Entity*);
-extern void Lakitu(Entity*);
-extern void LakituCloud(Entity*);
-extern void Enemy49(Entity*);
-extern void VaatiRebornEnemy(Entity*);
-extern void VaatiProjectile(Entity*);
-extern void BallChainSoldier(Entity*);
-extern void Enemy4D(Entity*);
-extern void Ghini(Entity*);
-extern void VaatiTransfigured(Entity*);
-extern void Enemy50(Entity*);
-extern void VaatiWrath(Entity*);
-extern void VaatiArm(Entity*);
-extern void Dust(Entity*);
-extern void VaatiBall(Entity*);
-extern void Slime(Entity*);
-extern void MiniSlime(Entity*);
-extern void FireballGuy(Entity*);
-extern void MiniFireballGuy(Entity*);
-extern void VaatiTransfiguredEye(Entity*);
-extern void BusinessScrubPrologue(Entity*);
-extern void GyorgFemale(Entity*);
-extern void GyorgMale(Entity*);
-extern void Curtain(Entity*);
-extern void VaatiWrathEye(Entity*);
-extern void GyorgChild(Entity*);
-extern void GyorgFemaleEye(Entity*);
-extern void Enemy62(Entity*);
-extern void GyorgFemaleMouth(Entity*);
-extern void Enemy64(Entity*);
-extern void TreeItem(Entity*);
-extern void Enemy66(Entity*);
+void Octorok(Entity*);
+void Chuchu(Entity*);
+void Leever(Entity*);
+void Peahat(Entity*);
+void Rollobite(Entity*);
+void DarkNut(Entity*);
+void HangingSeed(Entity*);
+void Beetle(Entity*);
+void Keese(Entity*);
+void DoorMimic(Entity*);
+void RockChuchu(Entity*);
+void SpinyChuchu(Entity*);
+void CuccoChickAggr(Entity*);
+void Moldorm(Entity*);
+void EnemyE(Entity*);
+void Moldworm(Entity*);
+void Sluggula(Entity*);
+void Pesto(Entity*);
+void Puffstool(Entity*);
+void ChuchuBoss(Entity*);
+void LikeLike(Entity*);
+void SpearMoblin(Entity*);
+void BusinessScrub(Entity*);
+void RupeeLike(Entity*);
+void Madderpillar(Entity*);
+void WaterDrop(Entity*);
+void WallMaster(Entity*);
+void BombPeahat(Entity*);
+void Spark(Entity*);
+void Chaser(Entity*);
+void SpikedBeetle(Entity*);
+void SensorBladeTrap(Entity*);
+void Helmasaur(Entity*);
+void FallingBoulder(Entity*);
+void Bobomb(Entity*);
+void WallMaster2(Entity*);
+void Gleerok(Entity*);
+void VaatiEyesMacro(Entity*);
+void Tektite(Entity*);
+void WizzrobeWind(Entity*);
+void WizzrobeFire(Entity*);
+void WizzrobeIce(Entity*);
+void Armos(Entity*);
+void Eyegore(Entity*);
+void Rope(Entity*);
+void SmallPesto(Entity*);
+void AcroBandit(Entity*);
+void BladeTrap(Entity*);
+void Keaton(Entity*);
+void Crow(Entity*);
+void Mulldozer(Entity*);
+void Bombarossa(Entity*);
+void Wisp(Entity*);
+void SpinyBeetle(Entity*);
+void MazaalHead(Entity*);
+void MazaalMacro(Entity*);
+void MazaalHand(Entity*);
+void OctorokBoss(Entity*);
+void FlyingPot(Entity*);
+void Gibdo(Entity*);
+void OctorokGolden(Entity*);
+void TektiteGolden(Entity*);
+void RopeGolden(Entity*);
+void CloudPiranha(Entity*);
+void ScissorsBeetle(Entity*);
+void CuccoAggr(Entity*);
+void Stalfos(Entity*);
+void FlyingSkull(Entity*);
+void MazaalBracelet(Entity*);
+void Takkuri(Entity*);
+void BowMoblin(Entity*);
+void Lakitu(Entity*);
+void LakituCloud(Entity*);
+void Enemy49(Entity*);
+void VaatiRebornEnemy(Entity*);
+void VaatiProjectile(Entity*);
+void BallChainSoldier(Entity*);
+void Enemy4D(Entity*);
+void Ghini(Entity*);
+void VaatiTransfigured(Entity*);
+void Enemy50(Entity*);
+void VaatiWrath(Entity*);
+void VaatiArm(Entity*);
+void Dust(Entity*);
+void VaatiBall(Entity*);
+void Slime(Entity*);
+void MiniSlime(Entity*);
+void FireballGuy(Entity*);
+void MiniFireballGuy(Entity*);
+void VaatiTransfiguredEye(Entity*);
+void BusinessScrubPrologue(Entity*);
+void GyorgFemale(Entity*);
+void GyorgMale(Entity*);
+void Curtain(Entity*);
+void VaatiWrathEye(Entity*);
+void GyorgChild(Entity*);
+void GyorgFemaleEye(Entity*);
+void Enemy62(Entity*);
+void GyorgFemaleMouth(Entity*);
+void Enemy64(Entity*);
+void TreeItem(Entity*);
+void Enemy66(Entity*);
 
 #endif
diff --git a/include/global.h b/include/global.h
index 512a903d..d9d22943 100644
--- a/include/global.h
+++ b/include/global.h
@@ -1,6 +1,24 @@
 #ifndef GUARD_GLOBAL_H
 #define GUARD_GLOBAL_H
 
+/**
+ * @defgroup Tasks Tasks
+ * @defgroup Subtasks Subtasks
+ */
+
+/** @defgroup Entities Entities */
+///@{
+/**
+ * @defgroup Player Player
+ * @defgroup Enemies Enemies
+ * @defgroup Projectiles Projectiles
+ * @defgroup Objects Objects
+ * @defgroup NPCs NPCs
+ * @defgroup Items Items
+ * @defgroup Managers Managers
+ */
+///@}
+
 #include "gba/gba.h"
 #include <string.h>
 
diff --git a/include/npc.h b/include/npc.h
index 3ad4beff..1b84e617 100644
--- a/include/npc.h
+++ b/include/npc.h
@@ -177,166 +177,166 @@ enum NPC {
     /*0x7f*/ NPC_NONE_39,
 };
 
-extern void Gentari(Entity*);
-extern void Gentari_Fusion(Entity*);
-extern void Festari(Entity*);
-extern void Festari_Fusion(Entity*);
-extern void ForestMinish(Entity*);
-extern void ForestMinish_Head(Entity*);
-extern void ForestMinish_Fusion(Entity*);
-extern void Postman(Entity*);
-extern void Postman_Fusion(Entity*);
-extern void NPC5(Entity*);
-extern void Townsperson(Entity*);
-extern void Townsperson_Head(Entity*);
-extern void Townsperson_Fusion(Entity*);
-extern void Kid(Entity*);
-extern void Kid_Head(Entity*);
-extern void Kid_Fusion(Entity*);
-extern void Guard(Entity*);
-extern void Guard_Head(Entity*);
-extern void NPC9(Entity*);
-extern void Stamp(Entity*);
-extern void Maid(Entity*);
-extern void Maid_Head(Entity*);
-extern void Marcy(Entity*);
-extern void Wheaton(Entity*);
-extern void Pita(Entity*);
-extern void MinishEzlo(Entity*);
-extern void MinishEzlo_Head(Entity*);
-extern void Mailbox(Entity*);
-extern void Beedle(Entity*);
-extern void Beedle_Head(Entity*);
-extern void Brocco(Entity*);
-extern void Brocco_Fusion(Entity*);
-extern void SittingPerson(Entity*);
-extern void SittingPerson_Head(Entity*);
-extern void SittingPerson_Fusion(Entity*);
-extern void Pina(Entity*);
-extern void Pina_Fusion(Entity*);
-extern void Din(Entity*);
-extern void Din_Fusion(Entity*);
-extern void Nayru(Entity*);
-extern void Nayru_Fusion(Entity*);
-extern void Farore(Entity*);
-extern void Farore_Fusion(Entity*);
-extern void Sturgeon(Entity*);
-extern void Sturgeon_Head(Entity*);
-extern void Sturgeon_Fusion(Entity*);
-extern void TingleSiblings(Entity*);
-extern void TingleSiblings_Fusion(Entity*);
-extern void Stockwell(Entity*);
-extern void Talon(Entity*);
-extern void Talon_Head(Entity*);
-extern void Talon_Fusion(Entity*);
-extern void Malon(Entity*);
-extern void Malon_Fusion(Entity*);
-extern void Epona(Entity*);
-extern void Epona_Fusion(Entity*);
-extern void MilkCart(Entity*);
-extern void GhostBrothers(Entity*);
-extern void GhostBrothers_Fusion(Entity*);
-extern void Smith(Entity*);
-extern void Smith_Head(Entity*);
-extern void Smith_Fusion(Entity*);
-extern void NPC23(Entity*);
-extern void KingDaltus(Entity*);
-extern void KingDaltus_Fusion(Entity*);
-extern void MinisterPotho(Entity*);
-extern void MinisterPotho_Fusion(Entity*);
-extern void NPC26(Entity*);
-extern void Vaati(Entity*);
-extern void Zelda(Entity*);
-extern void Mutoh(Entity*);
-extern void Mutoh_Head(Entity*);
-extern void Mutoh_Fusion(Entity*);
-extern void Carpenter(Entity*);
-extern void Carpenter_Head(Entity*);
-extern void Carpenter_Fusion(Entity*);
-extern void CastorWildsStatue(Entity*);
-extern void CastorWildsStatue_Fusion(Entity*);
-extern void Cat(Entity*);
-extern void Cat_Fusion(Entity*);
-extern void MountainMinish(Entity*);
-extern void MountainMinish_Head(Entity*);
-extern void MountainMinish_Fusion(Entity*);
-extern void ZeldaFollower(Entity*);
-extern void Melari(Entity*);
-extern void Melari_Head(Entity*);
-extern void Melari_Fusion(Entity*);
-extern void BladeBrothers(Entity*);
-extern void BladeBrothers_Fusion(Entity*);
-extern void Cow(Entity*);
-extern void Cow_Fusion(Entity*);
-extern void Goron(Entity*);
-extern void Goron_Fusion(Entity*);
-extern void GoronMerchant(Entity*);
-extern void Gorman(Entity*);
-extern void Gorman_Head(Entity*);
-extern void Dog(Entity*);
-extern void Dog_Head(Entity*);
-extern void Dog_Fusion(Entity*);
-extern void Syrup(Entity*);
-extern void Syrup_Head(Entity*);
-extern void Rem(Entity*);
-extern void TownMinish(Entity*);
-extern void TownMinish_Head(Entity*);
-extern void TownMinish_Fusion(Entity*);
-extern void Librari(Entity*);
-extern void Librari_Fusion(Entity*);
-extern void Percy(Entity*);
-extern void Percy_Head(Entity*);
-extern void Percy_Fusion(Entity*);
-extern void VaatiReborn(Entity*);
-extern void MoblinLady(Entity*);
-extern void Librarians(Entity*);
-extern void Farmers(Entity*);
-extern void Farmers_Head(Entity*);
-extern void Farmers_Fusion(Entity*);
-extern void Carlov(Entity*);
-extern void Dampe(Entity*);
-extern void Dampe_Fusion(Entity*);
-extern void DrLeft(Entity*);
-extern void KingGustaf(Entity*);
-extern void Gina(Entity*);
-extern void Gina_Fusion(Entity*);
-extern void Simon(Entity*);
-extern void Anju(Entity*);
-extern void Anju_Fusion(Entity*);
-extern void Mama(Entity*);
-extern void Mama_Head(Entity*);
-extern void Mama_Fusion(Entity*);
-extern void Emma(Entity*);
-extern void Teachers(Entity*);
-extern void Teachers_Head(Entity*);
-extern void Teachers_Fusion(Entity*);
-extern void WindTribespeople(Entity*);
-extern void WindTribespeople_Head(Entity*);
-extern void WindTribespeople_Fusion(Entity*);
-extern void Gregal(Entity*);
-extern void Gregal_Fusion(Entity*);
-extern void MayorHagen(Entity*);
-extern void MayorHagen_Fusion(Entity*);
-extern void BigGoron(Entity*);
-extern void Ezlo(Entity*);
-extern void NPC4E(Entity*);
-extern void NPC4E_Fusion(Entity*);
-extern void NPC4F(Entity*);
-extern void ClothesRack(Entity*);
-extern void PicolyteBottle(Entity*);
-extern void SmallTownMinish(Entity*);
-extern void HurdyGurdyMan(Entity*);
-extern void HurdyGurdyMan_Head(Entity*);
-extern void HurdyGurdyMan_Fusion(Entity*);
-extern void Cucco(Entity*);
-extern void Cucco_Fusion(Entity*);
-extern void CuccoChick(Entity*);
-extern void CuccoChick_Fusion(Entity*);
-extern void FusionMenuNPC(Entity*);
-extern void FusionMenuNPC_Head(Entity*);
-extern void Phonograph(Entity*);
-extern void NPC58(Entity*);
-extern void NPC58_Head(Entity*);
+void Gentari(Entity*);
+void Gentari_Fusion(Entity*);
+void Festari(Entity*);
+void Festari_Fusion(Entity*);
+void ForestMinish(Entity*);
+void ForestMinish_Head(Entity*);
+void ForestMinish_Fusion(Entity*);
+void Postman(Entity*);
+void Postman_Fusion(Entity*);
+void NPC5(Entity*);
+void Townsperson(Entity*);
+void Townsperson_Head(Entity*);
+void Townsperson_Fusion(Entity*);
+void Kid(Entity*);
+void Kid_Head(Entity*);
+void Kid_Fusion(Entity*);
+void Guard(Entity*);
+void Guard_Head(Entity*);
+void NPC9(Entity*);
+void Stamp(Entity*);
+void Maid(Entity*);
+void Maid_Head(Entity*);
+void Marcy(Entity*);
+void Wheaton(Entity*);
+void Pita(Entity*);
+void MinishEzlo(Entity*);
+void MinishEzlo_Head(Entity*);
+void Mailbox(Entity*);
+void Beedle(Entity*);
+void Beedle_Head(Entity*);
+void Brocco(Entity*);
+void Brocco_Fusion(Entity*);
+void SittingPerson(Entity*);
+void SittingPerson_Head(Entity*);
+void SittingPerson_Fusion(Entity*);
+void Pina(Entity*);
+void Pina_Fusion(Entity*);
+void Din(Entity*);
+void Din_Fusion(Entity*);
+void Nayru(Entity*);
+void Nayru_Fusion(Entity*);
+void Farore(Entity*);
+void Farore_Fusion(Entity*);
+void Sturgeon(Entity*);
+void Sturgeon_Head(Entity*);
+void Sturgeon_Fusion(Entity*);
+void TingleSiblings(Entity*);
+void TingleSiblings_Fusion(Entity*);
+void Stockwell(Entity*);
+void Talon(Entity*);
+void Talon_Head(Entity*);
+void Talon_Fusion(Entity*);
+void Malon(Entity*);
+void Malon_Fusion(Entity*);
+void Epona(Entity*);
+void Epona_Fusion(Entity*);
+void MilkCart(Entity*);
+void GhostBrothers(Entity*);
+void GhostBrothers_Fusion(Entity*);
+void Smith(Entity*);
+void Smith_Head(Entity*);
+void Smith_Fusion(Entity*);
+void NPC23(Entity*);
+void KingDaltus(Entity*);
+void KingDaltus_Fusion(Entity*);
+void MinisterPotho(Entity*);
+void MinisterPotho_Fusion(Entity*);
+void NPC26(Entity*);
+void Vaati(Entity*);
+void Zelda(Entity*);
+void Mutoh(Entity*);
+void Mutoh_Head(Entity*);
+void Mutoh_Fusion(Entity*);
+void Carpenter(Entity*);
+void Carpenter_Head(Entity*);
+void Carpenter_Fusion(Entity*);
+void CastorWildsStatue(Entity*);
+void CastorWildsStatue_Fusion(Entity*);
+void Cat(Entity*);
+void Cat_Fusion(Entity*);
+void MountainMinish(Entity*);
+void MountainMinish_Head(Entity*);
+void MountainMinish_Fusion(Entity*);
+void ZeldaFollower(Entity*);
+void Melari(Entity*);
+void Melari_Head(Entity*);
+void Melari_Fusion(Entity*);
+void BladeBrothers(Entity*);
+void BladeBrothers_Fusion(Entity*);
+void Cow(Entity*);
+void Cow_Fusion(Entity*);
+void Goron(Entity*);
+void Goron_Fusion(Entity*);
+void GoronMerchant(Entity*);
+void Gorman(Entity*);
+void Gorman_Head(Entity*);
+void Dog(Entity*);
+void Dog_Head(Entity*);
+void Dog_Fusion(Entity*);
+void Syrup(Entity*);
+void Syrup_Head(Entity*);
+void Rem(Entity*);
+void TownMinish(Entity*);
+void TownMinish_Head(Entity*);
+void TownMinish_Fusion(Entity*);
+void Librari(Entity*);
+void Librari_Fusion(Entity*);
+void Percy(Entity*);
+void Percy_Head(Entity*);
+void Percy_Fusion(Entity*);
+void VaatiReborn(Entity*);
+void MoblinLady(Entity*);
+void Librarians(Entity*);
+void Farmers(Entity*);
+void Farmers_Head(Entity*);
+void Farmers_Fusion(Entity*);
+void Carlov(Entity*);
+void Dampe(Entity*);
+void Dampe_Fusion(Entity*);
+void DrLeft(Entity*);
+void KingGustaf(Entity*);
+void Gina(Entity*);
+void Gina_Fusion(Entity*);
+void Simon(Entity*);
+void Anju(Entity*);
+void Anju_Fusion(Entity*);
+void Mama(Entity*);
+void Mama_Head(Entity*);
+void Mama_Fusion(Entity*);
+void Emma(Entity*);
+void Teachers(Entity*);
+void Teachers_Head(Entity*);
+void Teachers_Fusion(Entity*);
+void WindTribespeople(Entity*);
+void WindTribespeople_Head(Entity*);
+void WindTribespeople_Fusion(Entity*);
+void Gregal(Entity*);
+void Gregal_Fusion(Entity*);
+void MayorHagen(Entity*);
+void MayorHagen_Fusion(Entity*);
+void BigGoron(Entity*);
+void Ezlo(Entity*);
+void NPC4E(Entity*);
+void NPC4E_Fusion(Entity*);
+void NPC4F(Entity*);
+void ClothesRack(Entity*);
+void PicolyteBottle(Entity*);
+void SmallTownMinish(Entity*);
+void HurdyGurdyMan(Entity*);
+void HurdyGurdyMan_Head(Entity*);
+void HurdyGurdyMan_Fusion(Entity*);
+void Cucco(Entity*);
+void Cucco_Fusion(Entity*);
+void CuccoChick(Entity*);
+void CuccoChick_Fusion(Entity*);
+void FusionMenuNPC(Entity*);
+void FusionMenuNPC_Head(Entity*);
+void Phonograph(Entity*);
+void NPC58(Entity*);
+void NPC58_Head(Entity*);
 
 extern void (*const gNPCFunctions[128][3])(Entity*);
 
diff --git a/include/object.h b/include/object.h
index 20688709..ded574e3 100644
--- a/include/object.h
+++ b/include/object.h
@@ -226,200 +226,200 @@ typedef enum {
     OBJECT_C1,
 } Object;
 
-extern void ItemOnGround(Entity*);
-extern void DeathFx(Entity*);
-extern void ItemForSale(Entity*);
-extern void Button(Entity*);
-extern void MinishEmoticon(Entity*);
-extern void Pot(Entity*);
-extern void EzloCap(Entity*);
-extern void BlockPushed(Entity*);
-extern void LockedDoor(Entity*);
-extern void Object9(Entity*);
-extern void ObjectA(Entity*);
-extern void ObjectB(Entity*);
-extern void ChestSpawner(Entity*);
-extern void ObjectD(Entity*);
-extern void ObjectE(Entity*);
-extern void SpecialFx(Entity*);
-extern void Object10(Entity*);
-extern void Object11(Entity*);
-extern void Object12(Entity*);
-extern void Railtrack(Entity*);
-extern void LilypadLarge(Entity*);
-extern void Object15(Entity*);
-extern void FloatingPlatform(Entity*);
-extern void Object17(Entity*);
-extern void EvilSpirit(Entity*);
-extern void HouseDoorExterior(Entity*);
-extern void Object1A(Entity*);
-extern void GreatFairy(Entity*);
-extern void Object1C(Entity*);
-extern void Object1D(Entity*);
-extern void Object1E(Entity*);
-extern void Object1F(Entity*);
-extern void Object20(Entity*);
-extern void Object21(Entity*);
-extern void FigurineDevice(Entity*);
-extern void EyeSwitch(Entity*);
-extern void PressurePlate(Entity*);
-extern void BigBarrel(Entity*);
-extern void BarrelInside(Entity*);
-extern void PushableStatue(Entity*);
-extern void Object28(Entity*);
-extern void AmbientClouds(Entity*);
-extern void Object2A(Entity*);
-extern void Object2B(Entity*);
-extern void Beanstalk(Entity*);
-extern void Smoke(Entity*);
-extern void PushableRock(Entity*);
-extern void HittableLever(Entity*);
-extern void Object30(Entity*);
-extern void FrozenFlower(Entity*);
-extern void PullableMushroom(Entity*);
-extern void Bollard(Entity*);
-extern void WarpPoint(Entity*);
-extern void Object35(Entity*);
-extern void Object36(Entity*);
-extern void Object37(Entity*);
-extern void JarPortal(Entity*);
-extern void BossDoor(Entity*);
-extern void Object3A(Entity*);
-extern void MacroMushromStalks(Entity*);
-extern void MacroPlayer(Entity*);
-extern void Object3D(Entity*);
-extern void Object3E(Entity*);
-extern void GiantLeaf(Entity*);
-extern void Fairy(Entity*);
-extern void LadderUp(Entity*);
-extern void Object42(Entity*);
-extern void Object43(Entity*);
-extern void Object44(Entity*);
-extern void Object45(Entity*);
-extern void GiantBookLadder(Entity*);
-extern void HeartContainer(Entity*);
-extern void FileScreenObjects(Entity*);
-extern void Object49(Entity*);
-extern void BackgroundCloud(Entity*);
-extern void Object4B(Entity*);
-extern void PushableFurniture(Entity*);
-extern void Furniture(Entity*);
-extern void MinishSizedEntrance(Entity*);
-extern void Archway(Entity*);
-extern void GiantRock(Entity*);
-extern void GiantRock2(Entity*);
-extern void Object52(Entity*);
-extern void Object53(Entity*);
-extern void PullableLever(Entity*);
-extern void Minecart(Entity*);
-extern void ThoughtBubble(Entity*);
-extern void HiddenLadderDown(Entity*);
-extern void GentariCurtain(Entity*);
-extern void LavaPlatform(Entity*);
-extern void Paper(Entity*);
-extern void Object5B(Entity*);
-extern void Mask(Entity*);
-extern void HouseDoorInterior(Entity*);
-extern void Whirlwind(Entity*);
-extern void ObjectBlockingStairs(Entity*);
-extern void SwordsmanNewsletter(Entity*);
-extern void Object61(Entity*);
-extern void GiantTwig(Entity*);
-extern void Object63(Entity*);
-extern void Object64(Entity*);
-extern void LadderHoleInBookshelf(Entity*);
-extern void Object66(Entity*);
-extern void Object67(Entity*);
-extern void Object68(Entity*);
-extern void Object69(Entity*);
-extern void Object6A(Entity*);
-extern void CrenalBeanSprout(Entity*);
-extern void MinecartDoor(Entity*);
-extern void ObjectOnPillar(Entity*);
-extern void MineralWaterSource(Entity*);
-extern void MinishSizedArchway(Entity*);
-extern void Object70(Entity*);
-extern void PushableGrave(Entity*);
-extern void StoneTablet(Entity*);
-extern void LilypadSmall(Entity*);
-extern void Object74(Entity*);
-extern void Object75(Entity*);
-extern void Object76(Entity*);
-extern void Bell(Entity*);
-extern void MacroDecoration(Entity*);
-extern void Object79(Entity*);
-extern void Steam(Entity*);
-extern void PushableLever(Entity*);
-extern void MacroShoes(Entity*);
-extern void ObjectOnSpinyBeetle(Entity*);
-extern void Object7E(Entity*);
-extern void PicoBloom(Entity*);
-extern void Board(Entity*);
-extern void Object81(Entity*);
-extern void BigVortex(Entity*);
-extern void BigPushableLever(Entity*);
-extern void SmallIceBlock(Entity*);
-extern void BigIceBlock(Entity*);
-extern void Object86(Entity*);
-extern void OctorokBossObject(Entity*);
-extern void MacroBook(Entity*);
-extern void MazaalBossObject(Entity*);
-extern void CabinFurniture(Entity*);
-extern void DoubleBookshelf(Entity*);
-extern void Book(Entity*);
-extern void Fireplace(Entity*);
-extern void Object8E(Entity*);
-extern void FrozenWaterElement(Entity*);
-extern void Object90(Entity*);
-extern void Object91(Entity*);
-extern void BakerOven(Entity*);
-extern void Lamp(Entity*);
-extern void WindTribeFlag(Entity*);
-extern void Bird(Entity*);
-extern void Object96(Entity*);
-extern void Object97(Entity*);
-extern void Object98(Entity*);
-extern void Object99(Entity*);
-extern void MacroAcorn(Entity*);
-extern void Object9B(Entity*);
-extern void TreeHidingPortal(Entity*);
-extern void LightableSwitch(Entity*);
-extern void TreeThorns(Entity*);
-extern void Fan(Entity*);
-extern void AngryStatue(Entity*);
-extern void PalaceArchway(Entity*);
-extern void ObjectA2(Entity*);
-extern void Cloud(Entity*);
-extern void MinishLight(Entity*);
-extern void FireballChain(Entity*);
-extern void ObjectA6(Entity*);
-extern void ObjectA7(Entity*);
-extern void ObjectA8(Entity*);
-extern void ObjectA9(Entity*);
-extern void WaterfallOpening(Entity*);
-extern void ObjectAB(Entity*);
-extern void FourElements(Entity*);
-extern void ObjectAD(Entity*);
-extern void FloatingBlock(Entity*);
-extern void ObjectAF(Entity*);
-extern void MetalDoor(Entity*);
-extern void JailBars(Entity*);
-extern void ObjectB2(Entity*);
-extern void ObjectB3(Entity*);
-extern void ObjectB4(Entity*);
-extern void ObjectB5(Entity*);
-extern void ObjectB6(Entity*);
-extern void Well(Entity*);
-extern void WindTribeTeleporter(Entity*);
-extern void ObjectB9(Entity*);
-extern void GyorgBossObject(Entity*);
-extern void Windcrest(Entity*);
-extern void LitArea(Entity*);
-extern void ObjectBD(Entity*);
-extern void Pinwheel(Entity*);
-extern void ObjectBF(Entity*);
-extern void EnemyItem(Entity*);
-extern void ObjectC1(Entity*);
+void ItemOnGround(Entity*);
+void DeathFx(Entity*);
+void ItemForSale(Entity*);
+void Button(Entity*);
+void MinishEmoticon(Entity*);
+void Pot(Entity*);
+void EzloCap(Entity*);
+void BlockPushed(Entity*);
+void LockedDoor(Entity*);
+void Object9(Entity*);
+void ObjectA(Entity*);
+void ObjectB(Entity*);
+void ChestSpawner(Entity*);
+void ObjectD(Entity*);
+void ObjectE(Entity*);
+void SpecialFx(Entity*);
+void Object10(Entity*);
+void Object11(Entity*);
+void Object12(Entity*);
+void Railtrack(Entity*);
+void LilypadLarge(Entity*);
+void Object15(Entity*);
+void FloatingPlatform(Entity*);
+void Object17(Entity*);
+void EvilSpirit(Entity*);
+void HouseDoorExterior(Entity*);
+void Object1A(Entity*);
+void GreatFairy(Entity*);
+void Object1C(Entity*);
+void Object1D(Entity*);
+void Object1E(Entity*);
+void Object1F(Entity*);
+void Object20(Entity*);
+void Object21(Entity*);
+void FigurineDevice(Entity*);
+void EyeSwitch(Entity*);
+void PressurePlate(Entity*);
+void BigBarrel(Entity*);
+void BarrelInside(Entity*);
+void PushableStatue(Entity*);
+void Object28(Entity*);
+void AmbientClouds(Entity*);
+void Object2A(Entity*);
+void Object2B(Entity*);
+void Beanstalk(Entity*);
+void Smoke(Entity*);
+void PushableRock(Entity*);
+void HittableLever(Entity*);
+void Object30(Entity*);
+void FrozenFlower(Entity*);
+void PullableMushroom(Entity*);
+void Bollard(Entity*);
+void WarpPoint(Entity*);
+void Object35(Entity*);
+void Object36(Entity*);
+void Object37(Entity*);
+void JarPortal(Entity*);
+void BossDoor(Entity*);
+void Object3A(Entity*);
+void MacroMushromStalks(Entity*);
+void MacroPlayer(Entity*);
+void Object3D(Entity*);
+void Object3E(Entity*);
+void GiantLeaf(Entity*);
+void Fairy(Entity*);
+void LadderUp(Entity*);
+void Object42(Entity*);
+void Object43(Entity*);
+void Object44(Entity*);
+void Object45(Entity*);
+void GiantBookLadder(Entity*);
+void HeartContainer(Entity*);
+void FileScreenObjects(Entity*);
+void Object49(Entity*);
+void BackgroundCloud(Entity*);
+void Object4B(Entity*);
+void PushableFurniture(Entity*);
+void Furniture(Entity*);
+void MinishSizedEntrance(Entity*);
+void Archway(Entity*);
+void GiantRock(Entity*);
+void GiantRock2(Entity*);
+void Object52(Entity*);
+void Object53(Entity*);
+void PullableLever(Entity*);
+void Minecart(Entity*);
+void ThoughtBubble(Entity*);
+void HiddenLadderDown(Entity*);
+void GentariCurtain(Entity*);
+void LavaPlatform(Entity*);
+void Paper(Entity*);
+void Object5B(Entity*);
+void Mask(Entity*);
+void HouseDoorInterior(Entity*);
+void Whirlwind(Entity*);
+void ObjectBlockingStairs(Entity*);
+void SwordsmanNewsletter(Entity*);
+void Object61(Entity*);
+void GiantTwig(Entity*);
+void Object63(Entity*);
+void Object64(Entity*);
+void LadderHoleInBookshelf(Entity*);
+void Object66(Entity*);
+void Object67(Entity*);
+void Object68(Entity*);
+void Object69(Entity*);
+void Object6A(Entity*);
+void CrenalBeanSprout(Entity*);
+void MinecartDoor(Entity*);
+void ObjectOnPillar(Entity*);
+void MineralWaterSource(Entity*);
+void MinishSizedArchway(Entity*);
+void Object70(Entity*);
+void PushableGrave(Entity*);
+void StoneTablet(Entity*);
+void LilypadSmall(Entity*);
+void Object74(Entity*);
+void Object75(Entity*);
+void Object76(Entity*);
+void Bell(Entity*);
+void MacroDecoration(Entity*);
+void Object79(Entity*);
+void Steam(Entity*);
+void PushableLever(Entity*);
+void MacroShoes(Entity*);
+void ObjectOnSpinyBeetle(Entity*);
+void Object7E(Entity*);
+void PicoBloom(Entity*);
+void Board(Entity*);
+void Object81(Entity*);
+void BigVortex(Entity*);
+void BigPushableLever(Entity*);
+void SmallIceBlock(Entity*);
+void BigIceBlock(Entity*);
+void Object86(Entity*);
+void OctorokBossObject(Entity*);
+void MacroBook(Entity*);
+void MazaalBossObject(Entity*);
+void CabinFurniture(Entity*);
+void DoubleBookshelf(Entity*);
+void Book(Entity*);
+void Fireplace(Entity*);
+void Object8E(Entity*);
+void FrozenWaterElement(Entity*);
+void Object90(Entity*);
+void Object91(Entity*);
+void BakerOven(Entity*);
+void Lamp(Entity*);
+void WindTribeFlag(Entity*);
+void Bird(Entity*);
+void Object96(Entity*);
+void Object97(Entity*);
+void Object98(Entity*);
+void Object99(Entity*);
+void MacroAcorn(Entity*);
+void Object9B(Entity*);
+void TreeHidingPortal(Entity*);
+void LightableSwitch(Entity*);
+void TreeThorns(Entity*);
+void Fan(Entity*);
+void AngryStatue(Entity*);
+void PalaceArchway(Entity*);
+void ObjectA2(Entity*);
+void Cloud(Entity*);
+void MinishLight(Entity*);
+void FireballChain(Entity*);
+void ObjectA6(Entity*);
+void ObjectA7(Entity*);
+void ObjectA8(Entity*);
+void ObjectA9(Entity*);
+void WaterfallOpening(Entity*);
+void ObjectAB(Entity*);
+void FourElements(Entity*);
+void ObjectAD(Entity*);
+void FloatingBlock(Entity*);
+void ObjectAF(Entity*);
+void MetalDoor(Entity*);
+void JailBars(Entity*);
+void ObjectB2(Entity*);
+void ObjectB3(Entity*);
+void ObjectB4(Entity*);
+void ObjectB5(Entity*);
+void ObjectB6(Entity*);
+void Well(Entity*);
+void WindTribeTeleporter(Entity*);
+void ObjectB9(Entity*);
+void GyorgBossObject(Entity*);
+void Windcrest(Entity*);
+void LitArea(Entity*);
+void ObjectBD(Entity*);
+void Pinwheel(Entity*);
+void ObjectBF(Entity*);
+void EnemyItem(Entity*);
+void ObjectC1(Entity*);
 
 extern void (*const gObjectFunctions[194])(Entity*);
 
diff --git a/include/projectile.h b/include/projectile.h
index 4eaf6a44..74b3580a 100644
--- a/include/projectile.h
+++ b/include/projectile.h
@@ -3,6 +3,44 @@
 
 extern Entity* CreateProjectile(u32);
 
+void DarkNutSwordSlash(Entity*);
+void RockProjectile(Entity*);
+void BoneProjectile(Entity*);
+void MoblinSpear(Entity*);
+void DekuSeedProjectile(Entity*);
+void Projectile5(Entity*);
+void DirtBallProjectile(Entity*);
+void WindProjectile(Entity*);
+void FireProjectile(Entity*);
+void IceProjectile(Entity*);
+void GleerokProjectile(Entity*);
+void KeatonDagger(Entity*);
+void GuardLineOfSight(Entity*);
+void ArrowProjectile(Entity*);
+void MazaalEnergyBeam(Entity*);
+void OctorokBossProjectile(Entity*);
+void StalfosProjectile(Entity*);
+void LakituCloudProjectile(Entity*);
+void LakituLightning(Entity*);
+void MandiblesProjectile(Entity*);
+void RemovableDust(Entity*);
+void SpiderWeb(Entity*);
+void TorchTrapProjectile(Entity*);
+void GuruguruBarProjectile(Entity*);
+void V1DarkMagicProjectile(Entity*);
+void BallAndChain(Entity*);
+void V1FireProjectile(Entity*);
+void CannonballProjectile(Entity*);
+void V1EyeLaser(Entity*);
+void Winder(Entity*);
+void SpikedRollers(Entity*);
+void V2Projectile(Entity*);
+void V3HandProjectile(Entity*);
+void V3ElectricProjectile(Entity*);
+void GyorgTail(Entity*);
+void GyorgMaleEnergyProjectile(Entity*);
+void V3TennisBallProjectile(Entity*);
+
 typedef enum {
     /*00*/ DARK_NUT_SWORD_SLASH,
     /*01*/ ROCK_PROJECTILE,
diff --git a/include/save.h b/include/save.h
index bd4f09a5..62d3a87e 100644
--- a/include/save.h
+++ b/include/save.h
@@ -20,27 +20,37 @@ typedef enum {
     SAVE_DONE,
 } SaveState;
 
-extern SaveResult HandleSave(u32 arg0);
+/**
+ * Attempt to save the game.
+ *
+ * @param idx The save slot.
+ * @return #SaveResult result.
+ */
+extern SaveResult HandleSave(u32 idx);
 
+/**
+ * Contains all information about a save file.
+ * The contents of this structure are read from and written to EEPROM.
+ */
 typedef struct {
-    /*0x000*/ u8 invalid;
-    /*0x000*/ u8 initialized;
-    /*0x002*/ u8 msg_speed;
-    /*0x003*/ u8 brightness;
+    /*0x000*/ u8 invalid;     /**< File is invalid. */
+    /*0x000*/ u8 initialized; /**< File is initialized. */
+    /*0x002*/ u8 msg_speed;   /**< Message speed. */
+    /*0x003*/ u8 brightness;  /**< Brightness. */
     /*0x004*/ u8 filler4[0x2];
     /*0x006*/ u8 unk6;
     /*0x007*/ u8 unk7;
-    /*0x008*/ u8 global_progress;
+    /*0x008*/ u8 global_progress; /**< @see UpdateGlobalProgress */
     /*0x009*/ u8 field_0x9[0x34];
-    /*0x040*/ u32 windcrests;
+    /*0x040*/ u32 windcrests; /**< Windcrest flags. */
     /*0x044*/ u8 filler44[0xC];
     /*0x050*/ u32 unk50;
     /*0x054*/ u8 filler54[0xC];
-    /*0x060*/ u32 areaVisitFlags[8];
-    /*0x080*/ char name[FILENAME_LENGTH];
+    /*0x060*/ u32 areaVisitFlags[8];      /**< Area visit flags. */
+    /*0x080*/ char name[FILENAME_LENGTH]; /**< Save file name. */
     /*0x086*/ u8 filler86[0x2];
-    /*0x088*/ PlayerRoomStatus saved_status;
-    /*0x0A8*/ Stats stats;
+    /*0x088*/ PlayerRoomStatus saved_status; /**< Player room status. */
+    /*0x0A8*/ Stats stats;                   /**< Player stats. */
     /*0x0D0*/ u8 fillerD0[0x48];
     /*0x118*/ u8 unk118[0x13];
     /*0x12B*/ u8 unk12B[0x16];
@@ -48,25 +58,69 @@ typedef struct {
     /*0x1C1*/ u8 unk1C1[128];
     /*0x241*/ u8 unk241[13];
     /*0x24E*/ u8 unk24E[14];
-    /*0x25C*/ u8 flags[0x200];
+    /*0x25C*/ u8 flags[0x200]; /**< Flags. */
     /*0x45C*/ u8 unk45C[0x10];
     /*0x46C*/ u8 unk46C[0x20];
     /*0x48C*/ u32 timers[7];
-    /*0x4A8*/ u32 demo_timer;
+    /*0x4A8*/ u32 demo_timer; /**< Demo timer. */
     /*0x4AC*/ u8 filler4ac[0x8];
 } SaveFile;
 
+/**
+ * The current save file.
+ */
 extern SaveFile gSave;
 
+/**
+ * Initialize the save system.
+ *
+ * @return Success
+ */
 u32 InitSaveData(void);
 
-u32 Write_02000000(SaveHeader*);
-s32 ReadSaveFile(u32, SaveFile*);
+/**
+ * Read save header.
+ *
+ * @return Success.
+ */
 u32 Read_02000000(SaveHeader*);
+
+/**
+ * Write save header.
+ *
+ * @return Success.
+ */
+u32 Write_02000000(SaveHeader*);
+
+/**
+ * Read save file.
+ *
+ * @return Success.
+ */
+s32 ReadSaveFile(u32, SaveFile*);
+
+/**
+ * Mark a save file as deleted.
+ *
+ * @param index The save file index.
+ */
 void SetFileStatusDeleted(u32 index);
 
 extern const char gUnk_0811E470[];
 
+/**
+ * Update the global progress (0 - 10).
+ * There are 10 different indicators of game completion:
+    9 : Flag SEIIKI_STAINED_GLASS
+    8 : Flag LV5_CLEAR
+    7 : Flag OUBO_KAKERA
+    6 : Flag LV4_CLEAR
+    5 : Flag LV3_CLEAR
+    4 : Flag SOUGEN_08_TORITSUKI
+    2 : Flag LV1_CLEAR
+    1 : Default
+    }
+ */
 void UpdateGlobalProgress(void);
 
 #ifdef DEMO_USA
diff --git a/linker.ld b/linker.ld
index bd9ec0de..a649da8f 100644
--- a/linker.ld
+++ b/linker.ld
@@ -510,7 +510,7 @@ SECTIONS {
         asm/code_0805EC04.o(.text); /* objaffine? */
         asm/text.o(.text);
         src/text.o(.text);
-        src/debugScreen.o(.text);
+        src/debug.o(.text);
         src/playerItem/playerItem14.o(.text);
         /* npcs */
         src/npc/gentari.o(.text);
@@ -850,7 +850,7 @@ SECTIONS {
         src/playerItem/playerItemShield.o(.text);
         src/playerItem/playerItem15.o(.text);
 #ifdef DEMO_USA
-        src/demoScreen.o(.text);
+        src/demo.o(.text);
 #endif
         src/sound.o(.text);
         asm/staffroll.o(.text);
@@ -1597,7 +1597,7 @@ SECTIONS {
         data/const/playerItem/playerItemShield.o(.rodata);
         data/const/playerItem/playerItem15.o(.rodata);
 #ifdef DEMO_USA
-        data/const/demoScreen.o(.rodata);
+        data/const/demo.o(.rodata);
 #endif
         data/data_08127280.o(.rodata);
         data/gfx/figurines.o(.rodata);
diff --git a/src/debugScreen.c b/src/debug.c
similarity index 97%
rename from src/debugScreen.c
rename to src/debug.c
index a4772841..19b3ae04 100644
--- a/src/debugScreen.c
+++ b/src/debug.c
@@ -1,3 +1,10 @@
+/**
+ * @file debug.c
+ * @ingroup Tasks
+ *
+ * @brief Debug task
+ */
+
 #include "global.h"
 #include "sound.h"
 #include "common.h"
diff --git a/src/demoScreen.c b/src/demo.c
similarity index 98%
rename from src/demoScreen.c
rename to src/demo.c
index dd8e29b4..6364397c 100644
--- a/src/demoScreen.c
+++ b/src/demo.c
@@ -1,3 +1,10 @@
+/**
+ * @file demo.c
+ * @ingroup Tasks
+ *
+ * @brief Demo task
+ */
+
 #include "global.h"
 #include "functions.h"
 #include "main.h"
diff --git a/src/enemy/acroBandits.c b/src/enemy/acroBandits.c
index 2fe6e41b..b73c8104 100644
--- a/src/enemy/acroBandits.c
+++ b/src/enemy/acroBandits.c
@@ -1,3 +1,10 @@
+/**
+ * @file acroBandits.c
+ * @ingroup Enemies
+ *
+ * @brief Acro Bandits enemy
+ */
+
 #include "enemy.h"
 #include "functions.h"
 
diff --git a/src/enemy/beetle.c b/src/enemy/beetle.c
index bba26d7a..c03ff919 100644
--- a/src/enemy/beetle.c
+++ b/src/enemy/beetle.c
@@ -1,3 +1,10 @@
+/**
+ * @file beetle.c
+ * @ingroup Enemies
+ *
+ * @brief Beetle enemy
+ */
+
 #include "enemy.h"
 #include "functions.h"
 
diff --git a/src/enemy/bladeTrap.c b/src/enemy/bladeTrap.c
index eeee9ffe..815b0dcd 100644
--- a/src/enemy/bladeTrap.c
+++ b/src/enemy/bladeTrap.c
@@ -1,3 +1,10 @@
+/**
+ * @file bladeTrap.c
+ * @ingroup Enemies
+ *
+ * @brief Blade Trap enemy
+ */
+
 #include "sound.h"
 #include "entity.h"
 #include "room.h"
diff --git a/src/enemy/bobomb.c b/src/enemy/bobomb.c
index 94ba6b9d..ebc47375 100644
--- a/src/enemy/bobomb.c
+++ b/src/enemy/bobomb.c
@@ -1,3 +1,10 @@
+/**
+ * @file bobomb.c
+ * @ingroup Enemies
+ *
+ * @brief Bobomb enemy
+ */
+
 #include "asm.h"
 #include "sound.h"
 #include "enemy.h"
diff --git a/src/enemy/bombPeahat.c b/src/enemy/bombPeahat.c
index 3a3eddc7..dbdda527 100644
--- a/src/enemy/bombPeahat.c
+++ b/src/enemy/bombPeahat.c
@@ -1,3 +1,10 @@
+/**
+ * @file bombPeahat.c
+ * @ingroup Enemies
+ *
+ * @brief Bomb Peahat enemy
+ */
+
 #include "asm.h"
 #include "entity.h"
 #include "enemy.h"
diff --git a/src/enemy/bowMoblin.c b/src/enemy/bowMoblin.c
index 29fdd6bc..2889b8ac 100644
--- a/src/enemy/bowMoblin.c
+++ b/src/enemy/bowMoblin.c
@@ -1,3 +1,10 @@
+/**
+ * @file bowMoblin.c
+ * @ingroup Enemies
+ *
+ * @brief Bow Moblin enemy
+ */
+
 #define NENT_DEPRECATED
 #include "global.h"
 #include "entity.h"
diff --git a/src/enemy/businessScrub.c b/src/enemy/businessScrub.c
index b2b20f06..5f2d6535 100644
--- a/src/enemy/businessScrub.c
+++ b/src/enemy/businessScrub.c
@@ -1,3 +1,10 @@
+/**
+ * @file businessScrub.c
+ * @ingroup Enemies
+ *
+ * @brief Business Scrub enemy
+ */
+
 #include "asm.h"
 #include "enemy.h"
 #include "message.h"
diff --git a/src/enemy/chaser.c b/src/enemy/chaser.c
index af6f4b86..2efbe92b 100644
--- a/src/enemy/chaser.c
+++ b/src/enemy/chaser.c
@@ -1,3 +1,10 @@
+/**
+ * @file chaser.c
+ * @ingroup Enemies
+ *
+ * @brief Chaser enemy
+ */
+
 #include "enemy.h"
 #include "functions.h"
 
diff --git a/src/enemy/chuchu.c b/src/enemy/chuchu.c
index 308fb47f..9d8d4ff3 100644
--- a/src/enemy/chuchu.c
+++ b/src/enemy/chuchu.c
@@ -1,3 +1,10 @@
+/**
+ * @file chuchu.c
+ * @ingroup Enemies
+ *
+ * @brief Chuchu enemy
+ */
+
 #include "asm.h"
 #include "enemy.h"
 #include "functions.h"
diff --git a/src/enemy/chuchuBoss.c b/src/enemy/chuchuBoss.c
index 29c1611c..4204609f 100644
--- a/src/enemy/chuchuBoss.c
+++ b/src/enemy/chuchuBoss.c
@@ -1,3 +1,10 @@
+/**
+ * @file chuchuBoss.c
+ * @ingroup Enemies
+ *
+ * @brief Chuchu Boss enemy
+ */
+
 #include "enemy.h"
 
 void sub_08027870(Entity*);
diff --git a/src/enemy/cuccoChickAggr.c b/src/enemy/cuccoChickAggr.c
index 46b7c58b..e4946da6 100644
--- a/src/enemy/cuccoChickAggr.c
+++ b/src/enemy/cuccoChickAggr.c
@@ -1,3 +1,10 @@
+/**
+ * @file cuccoChickAggr.c
+ * @ingroup Enemies
+ *
+ * @brief Cucco Chick Aggr enemy
+ */
+
 #include "enemy.h"
 #include "functions.h"
 
diff --git a/src/enemy/darkNut.c b/src/enemy/darkNut.c
index 7e200a8a..7084ae0c 100644
--- a/src/enemy/darkNut.c
+++ b/src/enemy/darkNut.c
@@ -1,3 +1,10 @@
+/**
+ * @file darkNut.c
+ * @ingroup Enemies
+ *
+ * @brief Dark Nut enemy
+ */
+
 #include "enemy.h"
 #include "functions.h"
 
diff --git a/src/enemy/doorMimic.c b/src/enemy/doorMimic.c
index 413046c9..bcb1e1af 100644
--- a/src/enemy/doorMimic.c
+++ b/src/enemy/doorMimic.c
@@ -1,3 +1,10 @@
+/**
+ * @file doorMimic.c
+ * @ingroup Enemies
+ *
+ * @brief Door Mimic enemy
+ */
+
 #include "sound.h"
 #include "enemy.h"
 #include "functions.h"
diff --git a/src/enemy/enemy4D.c b/src/enemy/enemy4D.c
index 3e6508ad..b44585da 100644
--- a/src/enemy/enemy4D.c
+++ b/src/enemy/enemy4D.c
@@ -1,3 +1,10 @@
+/**
+ * @file enemy4D.c
+ * @ingroup Enemies
+ *
+ * @brief enemy 4D
+ */
+
 #include "global.h"
 #include "entity.h"
 #include "enemy.h"
diff --git a/src/enemy/enemyE.c b/src/enemy/enemyE.c
index 5f712d7d..d19d110b 100644
--- a/src/enemy/enemyE.c
+++ b/src/enemy/enemyE.c
@@ -1,3 +1,10 @@
+/**
+ * @file enemyE.c
+ * @ingroup Enemies
+ *
+ * @brief enemy E
+ */
+
 #include "enemy.h"
 #include "functions.h"
 
diff --git a/src/enemy/fallingBoulder.c b/src/enemy/fallingBoulder.c
index bac04237..d414ce52 100644
--- a/src/enemy/fallingBoulder.c
+++ b/src/enemy/fallingBoulder.c
@@ -1,3 +1,10 @@
+/**
+ * @file fallingBoulder.c
+ * @ingroup Enemies
+ *
+ * @brief Falling Boulder enemy
+ */
+
 #include "enemy.h"
 #include "functions.h"
 
diff --git a/src/enemy/fireballGuy.c b/src/enemy/fireballGuy.c
index 8b2fc55a..5e81c1d6 100644
--- a/src/enemy/fireballGuy.c
+++ b/src/enemy/fireballGuy.c
@@ -1,3 +1,10 @@
+/**
+ * @file fireballGuy.c
+ * @ingroup Enemies
+ *
+ * @brief Fireball Guy enemy
+ */
+
 #include "enemy.h"
 #include "functions.h"
 
diff --git a/src/enemy/gibdo.c b/src/enemy/gibdo.c
index 71dfe53f..9a4929fe 100644
--- a/src/enemy/gibdo.c
+++ b/src/enemy/gibdo.c
@@ -1,3 +1,10 @@
+/**
+ * @file gibdo.c
+ * @ingroup Enemies
+ *
+ * @brief Gibdo enemy
+ */
+
 #include "global.h"
 #include "enemy.h"
 #include "object.h"
diff --git a/src/enemy/gyorgMale.c b/src/enemy/gyorgMale.c
index dc99d749..95df10fe 100644
--- a/src/enemy/gyorgMale.c
+++ b/src/enemy/gyorgMale.c
@@ -1,3 +1,10 @@
+/**
+ * @file gyorgMale.c
+ * @ingroup Enemies
+ *
+ * @brief Gyorg Male enemy
+ */
+
 #include "global.h"
 #include "enemy.h"
 #include "player.h"
diff --git a/src/enemy/hangingSeed.c b/src/enemy/hangingSeed.c
index d63e3650..4839642f 100644
--- a/src/enemy/hangingSeed.c
+++ b/src/enemy/hangingSeed.c
@@ -1,3 +1,10 @@
+/**
+ * @file hangingSeed.c
+ * @ingroup Enemies
+ *
+ * @brief Hanging Seed enemy
+ */
+
 #include "entity.h"
 #include "enemy.h"
 #include "functions.h"
diff --git a/src/enemy/helmasaur.c b/src/enemy/helmasaur.c
index 9539b36d..3187c340 100644
--- a/src/enemy/helmasaur.c
+++ b/src/enemy/helmasaur.c
@@ -1,3 +1,10 @@
+/**
+ * @file helmasaur.c
+ * @ingroup Enemies
+ *
+ * @brief Helmasaur enemy
+ */
+
 #include "enemy.h"
 #include "object.h"
 #include "functions.h"
diff --git a/src/enemy/keaton.c b/src/enemy/keaton.c
index 6c551e9c..3e1a0679 100644
--- a/src/enemy/keaton.c
+++ b/src/enemy/keaton.c
@@ -1,3 +1,10 @@
+/**
+ * @file keaton.c
+ * @ingroup Enemies
+ *
+ * @brief keaton enemy
+ */
+
 #include "enemy.h"
 #include "functions.h"
 
diff --git a/src/enemy/keese.c b/src/enemy/keese.c
index 1b3c4e11..9eb4ecbb 100644
--- a/src/enemy/keese.c
+++ b/src/enemy/keese.c
@@ -1,3 +1,10 @@
+/**
+ * @file keese.c
+ * @ingroup Enemies
+ *
+ * @brief Keese enemy
+ */
+
 #include "enemy.h"
 #include "functions.h"
 
diff --git a/src/enemy/lakitu.c b/src/enemy/lakitu.c
index 9179a7a5..25dd93ea 100644
--- a/src/enemy/lakitu.c
+++ b/src/enemy/lakitu.c
@@ -1,3 +1,10 @@
+/**
+ * @file lakitu.c
+ * @ingroup Enemies
+ *
+ * @brief Lakitu enemy
+ */
+
 #include "global.h"
 #include "enemy.h"
 #include "functions.h"
diff --git a/src/enemy/lakituCloud.c b/src/enemy/lakituCloud.c
index 502e4ab8..3caf7608 100644
--- a/src/enemy/lakituCloud.c
+++ b/src/enemy/lakituCloud.c
@@ -1,3 +1,10 @@
+/**
+ * @file lakituCloud.c
+ * @ingroup Enemies
+ *
+ * @brief Lakitu Cloud enemy
+ */
+
 #include "global.h"
 #include "asm.h"
 #include "entity.h"
diff --git a/src/enemy/leever.c b/src/enemy/leever.c
index e7624432..3f33914b 100644
--- a/src/enemy/leever.c
+++ b/src/enemy/leever.c
@@ -1,3 +1,10 @@
+/**
+ * @file leever.c
+ * @ingroup Enemies
+ *
+ * @brief Leever enemy
+ */
+
 #include "enemy.h"
 #include "functions.h"
 
diff --git a/src/enemy/likeLike.c b/src/enemy/likeLike.c
index 7d764c07..df692772 100644
--- a/src/enemy/likeLike.c
+++ b/src/enemy/likeLike.c
@@ -1,3 +1,10 @@
+/**
+ * @file likeLike.c
+ * @ingroup Enemies
+ *
+ * @brief Like Like enemy
+ */
+
 #include "enemy.h"
 #include "message.h"
 #include "save.h"
diff --git a/src/enemy/madderpillar.c b/src/enemy/madderpillar.c
index 5750e102..a804035b 100644
--- a/src/enemy/madderpillar.c
+++ b/src/enemy/madderpillar.c
@@ -1,3 +1,10 @@
+/**
+ * @file madderpillar.c
+ * @ingroup Enemies
+ *
+ * @brief Madderpillar enemy
+ */
+
 #include "enemy.h"
 #include "functions.h"
 
diff --git a/src/enemy/mazaalBracelet.c b/src/enemy/mazaalBracelet.c
index 9f40f40c..f976a2e7 100644
--- a/src/enemy/mazaalBracelet.c
+++ b/src/enemy/mazaalBracelet.c
@@ -1,3 +1,10 @@
+/**
+ * @file mazaalBracelet.c
+ * @ingroup Enemies
+ *
+ * @brief Mazaal Bracelet enemy
+ */
+
 #include "enemy.h"
 #include "object.h"
 #include "functions.h"
diff --git a/src/enemy/mazaalHand.c b/src/enemy/mazaalHand.c
index 2a64cd24..b8f0eaf3 100644
--- a/src/enemy/mazaalHand.c
+++ b/src/enemy/mazaalHand.c
@@ -1,3 +1,10 @@
+/**
+ * @file mazaalHand.c
+ * @ingroup Enemies
+ *
+ * @brief Mazaal Hand enemy
+ */
+
 #include "entity.h"
 
 void sub_08035194(Entity*);
diff --git a/src/enemy/mazaalHead.c b/src/enemy/mazaalHead.c
index 3a065362..6ca1ca83 100644
--- a/src/enemy/mazaalHead.c
+++ b/src/enemy/mazaalHead.c
@@ -1,3 +1,10 @@
+/**
+ * @file mazaalHead.c
+ * @ingroup Enemies
+ *
+ * @brief Mazaal Head enemy
+ */
+
 #include "enemy.h"
 #include "object.h"
 #include "functions.h"
diff --git a/src/enemy/mazaalMacro.c b/src/enemy/mazaalMacro.c
index c13bea87..aa47e78b 100644
--- a/src/enemy/mazaalMacro.c
+++ b/src/enemy/mazaalMacro.c
@@ -1,3 +1,10 @@
+/**
+ * @file mazaalMacro.c
+ * @ingroup Enemies
+ *
+ * @brief Mazaal Macro enemy
+ */
+
 #include "enemy.h"
 #include "script.h"
 #include "structures.h"
diff --git a/src/enemy/miniFireballGuy.c b/src/enemy/miniFireballGuy.c
index 0cde6285..b9a64caf 100644
--- a/src/enemy/miniFireballGuy.c
+++ b/src/enemy/miniFireballGuy.c
@@ -1,3 +1,10 @@
+/**
+ * @file miniFireballGuy.c
+ * @ingroup Enemies
+ *
+ * @brief Mini Fireball Guy enemy
+ */
+
 #include "enemy.h"
 #include "functions.h"
 
diff --git a/src/enemy/miniSlime.c b/src/enemy/miniSlime.c
index 1bfc3fc6..8de89a28 100644
--- a/src/enemy/miniSlime.c
+++ b/src/enemy/miniSlime.c
@@ -1,3 +1,10 @@
+/**
+ * @file miniSlime.c
+ * @ingroup Enemies
+ *
+ * @brief Mini Slime enemy
+ */
+
 #include "enemy.h"
 #include "functions.h"
 
diff --git a/src/enemy/moldorm.c b/src/enemy/moldorm.c
index 33a1fa8b..e53f2856 100644
--- a/src/enemy/moldorm.c
+++ b/src/enemy/moldorm.c
@@ -1,3 +1,10 @@
+/**
+ * @file moldorm.c
+ * @ingroup Enemies
+ *
+ * @brief Moldorm enemy
+ */
+
 #include "enemy.h"
 #include "functions.h"
 
diff --git a/src/enemy/moldworm.c b/src/enemy/moldworm.c
index 3eb92c55..cb055f0b 100644
--- a/src/enemy/moldworm.c
+++ b/src/enemy/moldworm.c
@@ -1,3 +1,10 @@
+/**
+ * @file moldworm.c
+ * @ingroup Enemies
+ *
+ * @brief Moldworm enemy
+ */
+
 #include "enemy.h"
 #include "functions.h"
 
diff --git a/src/enemy/octorok.c b/src/enemy/octorok.c
index 47d4c486..b1aedfc6 100644
--- a/src/enemy/octorok.c
+++ b/src/enemy/octorok.c
@@ -1,3 +1,10 @@
+/**
+ * @file octorok.c
+ * @ingroup Enemies
+ *
+ * @brief Octorok enemy
+ */
+
 #include "enemy.h"
 #include "functions.h"
 
diff --git a/src/enemy/octorokBoss.c b/src/enemy/octorokBoss.c
index d368dc5b..8514214a 100644
--- a/src/enemy/octorokBoss.c
+++ b/src/enemy/octorokBoss.c
@@ -1,3 +1,10 @@
+/**
+ * @file octorokBoss.c
+ * @ingroup Enemies
+ *
+ * @brief Octorok boss enemy
+ */
+
 #include "enemy.h"
 #include "functions.h"
 #include "object.h"
diff --git a/src/enemy/peahat.c b/src/enemy/peahat.c
index e8353ae5..2f08e47a 100644
--- a/src/enemy/peahat.c
+++ b/src/enemy/peahat.c
@@ -1,3 +1,10 @@
+/**
+ * @file peahat.c
+ * @ingroup Enemies
+ *
+ * @brief Peahat enemy
+ */
+
 #include "enemy.h"
 #include "functions.h"
 
diff --git a/src/enemy/pesto.c b/src/enemy/pesto.c
index 2770f4fa..e0dc9ad1 100644
--- a/src/enemy/pesto.c
+++ b/src/enemy/pesto.c
@@ -1,3 +1,10 @@
+/**
+ * @file pesto.c
+ * @ingroup Enemies
+ *
+ * @brief Pesto enemy
+ */
+
 #include "enemy.h"
 #include "object.h"
 #include "game.h"
diff --git a/src/enemy/puffstool.c b/src/enemy/puffstool.c
index be5b30d0..6c08d954 100644
--- a/src/enemy/puffstool.c
+++ b/src/enemy/puffstool.c
@@ -1,3 +1,10 @@
+/**
+ * @file puffstool.c
+ * @ingroup Enemies
+ *
+ * @brief Puffstool enemy
+ */
+
 #include "enemy.h"
 #include "object.h"
 #include "functions.h"
diff --git a/src/enemy/rockChuchu.c b/src/enemy/rockChuchu.c
index dd3987cd..8f86eebb 100644
--- a/src/enemy/rockChuchu.c
+++ b/src/enemy/rockChuchu.c
@@ -1,3 +1,10 @@
+/**
+ * @file rockChuchu.c
+ * @ingroup Enemies
+ *
+ * @brief Rock Chuchu enemy
+ */
+
 #include "enemy.h"
 #include "functions.h"
 
diff --git a/src/enemy/rollobite.c b/src/enemy/rollobite.c
index bf367eef..9a86c115 100644
--- a/src/enemy/rollobite.c
+++ b/src/enemy/rollobite.c
@@ -1,3 +1,10 @@
+/**
+ * @file rollobite.c
+ * @ingroup Enemies
+ *
+ * @brief Rollobite enemy
+ */
+
 #include "enemy.h"
 #include "functions.h"
 
diff --git a/src/enemy/rope.c b/src/enemy/rope.c
index bf0a7ecb..d2ca5b18 100644
--- a/src/enemy/rope.c
+++ b/src/enemy/rope.c
@@ -1,3 +1,10 @@
+/**
+ * @file rope.c
+ * @ingroup Enemies
+ *
+ * @brief Rope enemy
+ */
+
 #include "enemy.h"
 #include "functions.h"
 
diff --git a/src/enemy/ropeGolden.c b/src/enemy/ropeGolden.c
index 136d14c3..581c92d3 100644
--- a/src/enemy/ropeGolden.c
+++ b/src/enemy/ropeGolden.c
@@ -1,3 +1,10 @@
+/**
+ * @file ropeGolden.c
+ * @ingroup Enemies
+ *
+ * @brief Golden Rope enemy
+ */
+
 #include "global.h"
 #include "entity.h"
 #include "functions.h"
diff --git a/src/enemy/rupeeLike.c b/src/enemy/rupeeLike.c
index cd068b96..d2393187 100644
--- a/src/enemy/rupeeLike.c
+++ b/src/enemy/rupeeLike.c
@@ -1,3 +1,10 @@
+/**
+ * @file rupeeLike.c
+ * @ingroup Enemies
+ *
+ * @brief Rupee Like enemy
+ */
+
 #include "global.h"
 #include "asm.h"
 #include "sound.h"
diff --git a/src/enemy/sensorBladeTrap.c b/src/enemy/sensorBladeTrap.c
index 2e99de0e..0db62349 100644
--- a/src/enemy/sensorBladeTrap.c
+++ b/src/enemy/sensorBladeTrap.c
@@ -1,3 +1,10 @@
+/**
+ * @file sensorBladeTrap.c
+ * @ingroup Enemies
+ *
+ * @brief Sensor Blade Trap enemy
+ */
+
 #include "enemy.h"
 
 extern u32 sub_0804A024(Entity*, u32, u32);
diff --git a/src/enemy/slime.c b/src/enemy/slime.c
index e6faf992..e95bc8c7 100644
--- a/src/enemy/slime.c
+++ b/src/enemy/slime.c
@@ -1,3 +1,10 @@
+/**
+ * @file slime.c
+ * @ingroup Enemies
+ *
+ * @brief Slime enemy
+ */
+
 #include "enemy.h"
 #include "functions.h"
 
diff --git a/src/enemy/sluggula.c b/src/enemy/sluggula.c
index 57a6b416..308d914f 100644
--- a/src/enemy/sluggula.c
+++ b/src/enemy/sluggula.c
@@ -1,3 +1,10 @@
+/**
+ * @file sluggula.c
+ * @ingroup Enemies
+ *
+ * @brief Sluggula enemy
+ */
+
 #include "enemy.h"
 #include "functions.h"
 
diff --git a/src/enemy/smallPesto.c b/src/enemy/smallPesto.c
index 7e26ab7d..6d444f71 100644
--- a/src/enemy/smallPesto.c
+++ b/src/enemy/smallPesto.c
@@ -1,3 +1,10 @@
+/**
+ * @file smallPesto.c
+ * @ingroup Enemies
+ *
+ * @brief Small Pesto enemy
+ */
+
 #include "enemy.h"
 #include "functions.h"
 
diff --git a/src/enemy/spark.c b/src/enemy/spark.c
index d96bdfaa..30940109 100644
--- a/src/enemy/spark.c
+++ b/src/enemy/spark.c
@@ -1,3 +1,10 @@
+/**
+ * @file spark.c
+ * @ingroup Enemies
+ *
+ * @brief Spark enemy
+ */
+
 #include "enemy.h"
 #include "object.h"
 #include "functions.h"
diff --git a/src/enemy/spearMoblin.c b/src/enemy/spearMoblin.c
index 6e35d52a..91475342 100644
--- a/src/enemy/spearMoblin.c
+++ b/src/enemy/spearMoblin.c
@@ -1,3 +1,10 @@
+/**
+ * @file spearMoblin.c
+ * @ingroup Enemies
+ *
+ * @brief Spear Moblin enemy
+ */
+
 #include "enemy.h"
 #include "functions.h"
 
diff --git a/src/enemy/spikedBeetle.c b/src/enemy/spikedBeetle.c
index ec281989..a6fa4ae6 100644
--- a/src/enemy/spikedBeetle.c
+++ b/src/enemy/spikedBeetle.c
@@ -1,3 +1,10 @@
+/**
+ * @file spikedBeetle.c
+ * @ingroup Enemies
+ *
+ * @brief Spiked Beetle enemy
+ */
+
 #include "enemy.h"
 #include "functions.h"
 
diff --git a/src/enemy/spinyChuchu.c b/src/enemy/spinyChuchu.c
index 7d5ea60b..a51c8ac4 100644
--- a/src/enemy/spinyChuchu.c
+++ b/src/enemy/spinyChuchu.c
@@ -1,3 +1,10 @@
+/**
+ * @file spinyChuchu.c
+ * @ingroup Enemies
+ *
+ * @brief Spiny Chuchu enemy
+ */
+
 #include "enemy.h"
 #include "functions.h"
 
diff --git a/src/enemy/tektite.c b/src/enemy/tektite.c
index e029da29..168f69b6 100644
--- a/src/enemy/tektite.c
+++ b/src/enemy/tektite.c
@@ -1,3 +1,10 @@
+/**
+ * @file tektite.c
+ * @ingroup Enemies
+ *
+ * @brief Tektite enemy
+ */
+
 #include "enemy.h"
 #include "functions.h"
 
diff --git a/src/enemy/tektiteGolden.c b/src/enemy/tektiteGolden.c
index 2fc3bfb0..4c63076d 100644
--- a/src/enemy/tektiteGolden.c
+++ b/src/enemy/tektiteGolden.c
@@ -1,3 +1,10 @@
+/**
+ * @file tektiteGolden.c
+ * @ingroup Enemies
+ *
+ * @brief Golden Tektite enemy
+ */
+
 #include "enemy.h"
 #include "functions.h"
 
diff --git a/src/enemy/treeItem.c b/src/enemy/treeItem.c
index c1383be0..188476a4 100644
--- a/src/enemy/treeItem.c
+++ b/src/enemy/treeItem.c
@@ -1,3 +1,10 @@
+/**
+ * @file treeItem.c
+ * @ingroup Enemies
+ *
+ * @brief Tree Item enemy
+ */
+
 #include "global.h"
 #include "enemy.h"
 #include "object.h"
diff --git a/src/enemy/vaatiArm.c b/src/enemy/vaatiArm.c
index cb01f671..be058d3c 100644
--- a/src/enemy/vaatiArm.c
+++ b/src/enemy/vaatiArm.c
@@ -1,3 +1,10 @@
+/**
+ * @file vaatiArm.c
+ * @ingroup Enemies
+ *
+ * @brief Vaati Arm enemy
+ */
+
 #include "enemy.h"
 #include "object.h"
 #include "functions.h"
diff --git a/src/enemy/vaatiBall.c b/src/enemy/vaatiBall.c
index f02eedd3..760bcb5d 100644
--- a/src/enemy/vaatiBall.c
+++ b/src/enemy/vaatiBall.c
@@ -1,3 +1,10 @@
+/**
+ * @file vaatiBall.c
+ * @ingroup Enemies
+ *
+ * @brief Vaati Ball enemy
+ */
+
 #include "entity.h"
 #include "enemy.h"
 #include "player.h"
diff --git a/src/enemy/vaatiEyesMacro.c b/src/enemy/vaatiEyesMacro.c
index 6d187547..d268a30e 100644
--- a/src/enemy/vaatiEyesMacro.c
+++ b/src/enemy/vaatiEyesMacro.c
@@ -1,3 +1,10 @@
+/**
+ * @file vaatiEyesMacro.c
+ * @ingroup Enemies
+ *
+ * @brief Vaati Eyes Macro enemy
+ */
+
 #include "enemy.h"
 #include "functions.h"
 
diff --git a/src/enemy/vaatiProjectile.c b/src/enemy/vaatiProjectile.c
index b770e2e6..d4194d4d 100644
--- a/src/enemy/vaatiProjectile.c
+++ b/src/enemy/vaatiProjectile.c
@@ -1,3 +1,10 @@
+/**
+ * @file vaatiProjectile.c
+ * @ingroup Enemies
+ *
+ * @brief Vaati Projectile enemy
+ */
+
 #include "enemy.h"
 #include "functions.h"
 
diff --git a/src/enemy/vaatiRebornEnemy.c b/src/enemy/vaatiRebornEnemy.c
index f4732e17..e76ef4f8 100644
--- a/src/enemy/vaatiRebornEnemy.c
+++ b/src/enemy/vaatiRebornEnemy.c
@@ -1,3 +1,10 @@
+/**
+ * @file vaatiRebornEnemy.c
+ * @ingroup Enemies
+ *
+ * @brief Vaati Reborn enemy
+ */
+
 #include "enemy.h"
 #include "area.h"
 #include "functions.h"
diff --git a/src/enemy/vaatiTransfigured.c b/src/enemy/vaatiTransfigured.c
index 29191e73..62ac8918 100644
--- a/src/enemy/vaatiTransfigured.c
+++ b/src/enemy/vaatiTransfigured.c
@@ -1,3 +1,10 @@
+/**
+ * @file vaatiTransfigured.c
+ * @ingroup Enemies
+ *
+ * @brief Vaati Transfigured enemy
+ */
+
 #include "enemy.h"
 #include "object.h"
 #include "functions.h"
diff --git a/src/enemy/vaatiTransfiguredEye.c b/src/enemy/vaatiTransfiguredEye.c
index 67e795ac..80fbb07f 100644
--- a/src/enemy/vaatiTransfiguredEye.c
+++ b/src/enemy/vaatiTransfiguredEye.c
@@ -1,3 +1,10 @@
+/**
+ * @file vaatiTransfiguredEye.c
+ * @ingroup Enemies
+ *
+ * @brief Vaati Transfigured Eye enemy
+ */
+
 #include "entity.h"
 #include "enemy.h"
 #include "message.h"
diff --git a/src/enemy/vaatiWrath.c b/src/enemy/vaatiWrath.c
index 6898a7c9..e77a11cd 100644
--- a/src/enemy/vaatiWrath.c
+++ b/src/enemy/vaatiWrath.c
@@ -1,3 +1,10 @@
+/**
+ * @file vaatiWrath.c
+ * @ingroup Enemies
+ *
+ * @brief Vaati Wrath enemy
+ */
+
 #include "enemy.h"
 #include "object.h"
 #include "message.h"
diff --git a/src/enemy/vaatiWrathEye.c b/src/enemy/vaatiWrathEye.c
index 126e9912..3a076bb6 100644
--- a/src/enemy/vaatiWrathEye.c
+++ b/src/enemy/vaatiWrathEye.c
@@ -1,3 +1,10 @@
+/**
+ * @file vaatiWrathEye.c
+ * @ingroup Enemies
+ *
+ * @brief Vaati Wrath Eye enemy
+ */
+
 #include "enemy.h"
 #include "functions.h"
 
diff --git a/src/enemy/wallMaster.c b/src/enemy/wallMaster.c
index 05848590..554ca1c5 100644
--- a/src/enemy/wallMaster.c
+++ b/src/enemy/wallMaster.c
@@ -1,3 +1,10 @@
+/**
+ * @file wallMaster.c
+ * @ingroup Enemies
+ *
+ * @brief Wall Master enemy
+ */
+
 #include "enemy.h"
 #include "area.h"
 #include "functions.h"
diff --git a/src/enemy/wallMaster2.c b/src/enemy/wallMaster2.c
index c034989b..1e4538dc 100644
--- a/src/enemy/wallMaster2.c
+++ b/src/enemy/wallMaster2.c
@@ -1,3 +1,10 @@
+/**
+ * @file wallMaster2.c
+ * @ingroup Enemies
+ *
+ * @brief Wall Master 2 enemy
+ */
+
 #include "enemy.h"
 #include "area.h"
 #include "functions.h"
diff --git a/src/enemy/waterDrop.c b/src/enemy/waterDrop.c
index f3b936df..3ce0985c 100644
--- a/src/enemy/waterDrop.c
+++ b/src/enemy/waterDrop.c
@@ -1,3 +1,10 @@
+/**
+ * @file waterDrop.c
+ * @ingroup Enemies
+ *
+ * @brief Water Drop enemy
+ */
+
 #include "enemy.h"
 #include "screen.h"
 #include "object.h"
diff --git a/src/enemy/wisp.c b/src/enemy/wisp.c
index 190167e5..1d2f7a98 100644
--- a/src/enemy/wisp.c
+++ b/src/enemy/wisp.c
@@ -1,3 +1,10 @@
+/**
+ * @file wisp.c
+ * @ingroup Enemies
+ *
+ * @brief Wisp enemy
+ */
+
 #include "enemy.h"
 #include "save.h"
 #include "object.h"
diff --git a/src/fileselect.c b/src/fileselect.c
index 3e3d25a9..71ed5e76 100644
--- a/src/fileselect.c
+++ b/src/fileselect.c
@@ -1,3 +1,10 @@
+/**
+ * @file fileselect.c
+ * @ingroup Tasks
+ *
+ * @brief File select task
+ */
+
 #include "fileselect.h"
 #include "main.h"
 #include "common.h"
diff --git a/src/game.c b/src/game.c
index 523c4e1b..b2aefb17 100644
--- a/src/game.c
+++ b/src/game.c
@@ -1,3 +1,10 @@
+/**
+ * @file game.c
+ * @ingroup Tasks
+ *
+ * @brief Game task
+ */
+
 #include "global.h"
 #include "asm.h"
 #include "sound.h"
diff --git a/src/player.c b/src/player.c
index cac85584..0efaaf66 100644
--- a/src/player.c
+++ b/src/player.c
@@ -1,3 +1,10 @@
+/**
+ * @file player.c
+ * @ingroup Player
+ *
+ * @brief Player entity
+ */
+
 #include "global.h"
 #include "asm.h"
 #include "sound.h"
diff --git a/src/title.c b/src/title.c
index 6eebfbb4..d01e6bef 100644
--- a/src/title.c
+++ b/src/title.c
@@ -1,3 +1,10 @@
+/**
+ * @file title.c
+ * @ingroup Tasks
+ *
+ * @brief Title task
+ */
+
 #include "sound.h"
 #include "main.h"
 #include "entity.h"