Use player step enum in EntityAlucard (#1108)

While attempting to trace the process of an action in the game, I
noticed that the main state machine in EntityAlucard which dispatches
the functions for each player state was still using numerical `case`
statements. I cross-referenced the `PlayerSteps` enum in `dra.h` to the
steps in the function, and swapped in all the enum names. I also gave
proper names to unk24 and unk25, deconflicting this in the Alucard and
Richter player step lists.

Finally, I noticed that EntityAlucard has routines for steps 48-50,
which did not have enum members, so I added those. We'll have to examine
what they do.

src/dra/692E8.c

@@ -691,102 +691,102 @@ void EntityAlucard(void) {
     g_Player.unk52 = PLAYER.step_s;
     D_800ACDF8 = (s32)g_Player.D_80072F00[11];
     switch (PLAYER.step) {
-    case 0:
+    case Player_Stand:
         func_801120B4();
         break;
-    case 1:
+    case Player_Walk:
         func_80112B64();
         break;
-    case 2:
+    case Player_Crouch:
         func_801131C4();
         break;
-    case 3:
+    case Player_Fall:
         func_80113148();
         break;
-    case 4:
+    case Player_Jump:
         func_80112BB0();
         break;
-    case 5:
+    case Player_MorphBat:
         ControlBatForm();
         break;
-    case 9:
+    case Player_UnmorphBat:
         func_801177A0();
         break;
-    case 7:
+    case Player_MorphMist:
         ControlMistForm();
         break;
-    case 14:
+    case Player_UnmorphMist:
         func_801182F8();
         break;
-    case 24:
+    case Player_MorphWolf:
         func_8012EF2C();
         break;
-    case 25:
+    case Player_UnmorphWolf:
         func_8012EAD0();
         break;
-    case 8:
+    case Player_HighJump:
         func_80113AAC();
         break;
-    case 15:
+    case Player_SwordWarp:
         func_801186EC();
         break;
-    case 10:
+    case Player_Hit:
         AlucardHandleDamage(&damage, (s16)var_s6, (s16)var_s7);
         break;
-    case 11:
+    case Player_StatusStone:
         func_80114DF4(var_fp);
         break;
-    case 12:
+    case Player_BossGrab:
         func_80116208();
         break;
-    case 16:
+    case Player_Kill:
         func_80115394(&damage, (s16)var_s6, (s16)var_s7);
         break;
-    case 17:
+    case Player_Unk17:
         func_80115BB0();
         break;
-    case 18:
+    case Player_Teleport:
         func_80115DA0();
         break;
-    case 32:
+    case Player_SpellDarkMetamorphosis:
         func_80118614();
         break;
-    case 34:
+    case Player_SpellHellfire:
         PlayerStepHellfire();
         break;
-    case 37:
+    case Player_SpellSoulSteal:
         func_80118670();
         break;
-    case 33:
-    case 35:
-    case 39:
+    case Player_SpellSummonSpirit:
+    case Player_SpellTetraSpirit:
+    case Player_SpellSwordBrothers:
         func_80118640();
         break;
-    case 48:
+    case Player_Unk48:
         func_801166A4();
         break;
-    case 49:
+    case Player_Unk49:
         func_8011678C();
         break;
-    case 50:
+    case Player_Unk50:
         func_801167D0();
         break;
-    case 13:
+    case Player_KillWater:
         func_80115F54();
         break;
-    case 6:
+    case Player_AlucardStuck:
         func_80117AC0();
         break;
-    case 40:
+    case Player_AxearmorStand:
         weapon_func = D_8017A000.func_ptr_80170004;
         goto runweapon;
-    case 41:
+    case Player_AxearmorWalk:
         weapon_func = D_8017A000.func_ptr_80170008;
         goto runweapon;
-    case 42:
+    case Player_AxearmorJump:
         weapon_func = D_8017A000.func_ptr_8017000C;
         goto runweapon;
-    case 43:
+    case Player_AxearmorHit:
         weapon_func = D_8017A000.func_ptr_80170010;
     runweapon:
         weapon_func();

src/dra/843B0.c

@@ -2271,12 +2271,13 @@ bool WolfFormFinished(void) {
     if (D_80097448[1] != 0 && !IsRelicActive(RELIC_HOLY_SYMBOL) ||
         g_Player.padTapped & PAD_R2 ||
         HandleTransformationMP(FORM_WOLF, REDUCE) < 0) {
-        SetPlayerStep(Player_Unk25);
+        SetPlayerStep(Player_UnmorphWolf);
         func_8010DA48(0xCA);
         D_800AFDA6[0] = 1;
         PLAYER.palette = 0x810D;
         g_Player.unk66 = 0;
         g_Player.unk68 = 0;
+        // Create factory for EntityPlayerBlinkWhite
         CreateEntFactoryFromEntity(g_CurrentEntity, FACTORY(0x2400, 44), 0);
         PLAYER.velocityY >>= 1;
         return true;

src/dra/dra.h

@@ -212,8 +212,8 @@ typedef enum {
     Player_ThousandBlades,
     Player_RichterFourHolyBeasts,
     Player_Slide,
-    Player_Unk24, // MorphWolf and Richter's Tackle
-    Player_Unk25, // UnMorphWolf and Sprint
+    Player_MorphWolf,
+    Player_UnmorphWolf,
     Player_SlideKick,
     Player_Unk27, // other item crashes
     Player_SpellDarkMetamorphosis = 32,
@@ -228,6 +228,9 @@ typedef enum {
     Player_AxearmorWalk,
     Player_AxearmorJump,
     Player_AxearmorHit,
+    Player_Unk48 = 48,
+    Player_Unk49,
+    Player_Unk50
 } PlayerSteps;
 
 typedef enum {

src/ric/20920.c

@@ -227,7 +227,7 @@ void func_8015D020(void) {
     }
     if (func_8015C9CC() != 0 || PLAYER.step == Player_Slide) {
         func_8015C920(&D_8015550C);
-        if (PLAYER.step == Player_Unk25) {
+        if (PLAYER.step == Player_RichterSprint) {
             SetSpeedX(FIX(2.25));
             g_Player.unk44 = 0x10;
         } else {

src/ric/21250.c

@@ -102,7 +102,7 @@ bool func_8015D3CC(void) {
             func_8015C920(D_80155588);
             g_CurrentEntity->velocityX = 0;
             break;
-        case Player_Unk25:
+        case Player_RichterSprint:
             PLAYER.step = 0;
             func_8015C920(D_80155588);
             CreateEntFactoryFromEntity(g_CurrentEntity, FACTORY(0, 0), 0);

src/ric/ric.h

@@ -33,8 +33,8 @@ typedef enum {
     Player_ThousandBlades,
     Player_RichterFourHolyBeasts,
     Player_Slide,
-    Player_Unk24, // MorphWolf and Richter's Tackle
-    Player_Unk25, // UnMorphWolf and Sprint
+    Player_RichterTackle,
+    Player_RichterSprint,
     Player_SlideKick,
     Player_Unk27, // other item crashes
     Player_SpellDarkMetamorphosis = 32,