Name the entities for Hellfire fireballs (#1109)

Simple documentation upgrade; these functions should have names and I think these names should do the job.
Xeeynamo · Apr 2, 2024 · 1511a3c · 1511a3c
1 parent c24ab79
commit 1511a3c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/src/dra/7A4D0.c b/src/dra/7A4D0.c
@@ -29,8 +29,8 @@ PfnEntityUpdate g_DraEntityTbl[] = {
     EntityHolyWaterFlame,
     EntityUnkId24,
     EntityHellfireHandler,
-    func_801274DC,
-    func_80127840,
+    EntityHellfireNormalFireball,
+    EntityHellfireBigFireball,
     EntityExpandingCircle,
     func_80127CC8,
     EntityHitByLightning,

diff --git a/src/dra/843B0.c b/src/dra/843B0.c
@@ -825,8 +825,10 @@ void EntityHellfireHandler(Entity* self) {
         if (self->ext.hellfireHandler.unk80 == 0x30) {
             // When you press up during hellfire, you get different fireballs.
             if (g_Player.padPressed & PAD_UP) {
+                // Blueprint 35 makes child 27, the big black fireballs
                 CreateEntFactoryFromEntity(self, FACTORY(0, 35), 0);
             } else {
+                // Blueprint 34 makes child 26, the small, normal fireballs
                 CreateEntFactoryFromEntity(self, FACTORY(0, 34), 0);
             }
         }
@@ -875,7 +877,8 @@ void EntityHellfireHandler(Entity* self) {
     return;
 }
 
-void func_801274DC(Entity* entity) {
+// The fireball produced by Hellfire, when you do NOT press up
+void EntityHellfireNormalFireball(Entity* entity) {
     switch (entity->step) {
     case 0:
         if (entity->params == 0) {
@@ -976,7 +979,8 @@ void EntityBatFireball(Entity* self) {
     return;
 }
 
-void func_80127840(Entity* entity) {
+// Produced in Hellfire when you press UP during the casting
+void EntityHellfireBigFireball(Entity* entity) {
     switch (entity->step) {
     case 0:
         if (entity->params != 0) {

diff --git a/src/dra/dra.h b/src/dra/dra.h
@@ -988,8 +988,8 @@ void EntityHolyWater(Entity* self);
 void EntityHolyWaterFlame(Entity* self);
 void EntityUnkId24(Entity* self);
 void EntityHellfireHandler(Entity* self);
-void func_801274DC(Entity* self);
-void func_80127840(Entity* self);
+void EntityHellfireNormalFireball(Entity* self);
+void EntityHellfireBigFireball(Entity* self);
 void EntityExpandingCircle(Entity* self);
 void func_80127CC8(Entity* self);
 void EntityHitByLightning(Entity* self);