Merge pull request #710 from MokhaLeee/master

fix banim related wrong macros

Author: MokhaLeee

include/ekrbattle.h

@@ -598,7 +598,7 @@ extern const u16 gUnknown_080DAEC8[];
 extern const u16 gUnknown_080DAED2[];
 extern const u16 gUnknown_080DAEDC[];
 extern const u16 gUnknown_080DAEE6[];
-extern const u8 BattleTypeToAnimModeEndOfDodge[5];
+extern const u8 BanimDefaultStandingTypes[5];
 extern const u8 BanimTypesPosLeft[5];
 extern const u8 BanimTypesPosRight[5];
 extern const u16 BanimLeftDefaultPos[5];

src/banim-ekrbattle.c

@@ -555,9 +555,9 @@ void ekrBattleInRoundIdle(struct ProcEkrBattle *proc)
                     struct Anim *anim2 = gAnims[2];
 
                     switch (anim1->currentRoundType) {
-                    case BANIM_MODE_CLOSE_DODGE:
-                    case BANIM_MODE_RANGED_DODGE:
-                    case BANIM_MODE_STANDING:
+                    case ANIM_ROUND_TAKING_HIT_CLOSE:
+                    case ANIM_ROUND_STANDING:
+                    case ANIM_ROUND_TAKING_HIT_FAR:
                         val = 1;
                         break;
 
@@ -566,9 +566,9 @@ void ekrBattleInRoundIdle(struct ProcEkrBattle *proc)
                     } /* switch */
 
                     switch (anim2->currentRoundType) {
-                    case BANIM_MODE_CLOSE_DODGE:
-                    case BANIM_MODE_RANGED_DODGE:
-                    case BANIM_MODE_STANDING:
+                    case ANIM_ROUND_TAKING_HIT_CLOSE:
+                    case ANIM_ROUND_STANDING:
+                    case ANIM_ROUND_TAKING_HIT_FAR:
                         val++;
                         break;
 

src/banim-ekrbattleintro.c

@@ -500,7 +500,7 @@ void UnitKakudaiPrepareAnimScript(struct ProcUnitKakudai * proc)
     register int r0 asm("r0");
     u8 mode2;
 
-    mode2 = BattleTypeToAnimModeEndOfDodge[gEkrDistanceType];
+    mode2 = BanimDefaultStandingTypes[gEkrDistanceType];
     asm("":::"r0", "r1");
     cfg = BanimDefaultModeConfig;
     r0 = mode2 * 4;
@@ -509,7 +509,7 @@ void UnitKakudaiPrepareAnimScript(struct ProcUnitKakudai * proc)
     int mode;
     u8 mode2;
 
-    mode2 = BattleTypeToAnimModeEndOfDodge[gEkrDistanceType];
+    mode2 = BanimDefaultStandingTypes[gEkrDistanceType];
     front_mode = BanimDefaultModeConfig[mode2 * 4 + 0];
 #endif
 

src/banim-ekrmain.c

@@ -68,12 +68,12 @@ const u8 BanimDefaultModeConfig[ANIM_ROUND_MAX * 4] = {
     BANIM_MODE_MISSED_ATK, 0x64, BANIM_MODE_INVALID, 0x28,
 };
 
-const u8 BattleTypeToAnimModeEndOfDodge[5] = {
-    [EKR_DISTANCE_CLOSE]      = BANIM_MODE_CLOSE_DODGE,
-    [EKR_DISTANCE_FAR]        = BANIM_MODE_STANDING,
-    [EKR_DISTANCE_FARFAR]     = BANIM_MODE_STANDING,
-    [EKR_DISTANCE_MONOCOMBAT] = BANIM_MODE_CLOSE_DODGE,
-    [EKR_DISTANCE_PROMOTION]  = BANIM_MODE_CLOSE_DODGE
+const u8 BanimDefaultStandingTypes[5] = {
+    [EKR_DISTANCE_CLOSE]      = ANIM_ROUND_TAKING_HIT_CLOSE,
+    [EKR_DISTANCE_FAR]        = ANIM_ROUND_TAKING_HIT_FAR,
+    [EKR_DISTANCE_FARFAR]     = ANIM_ROUND_TAKING_HIT_FAR,
+    [EKR_DISTANCE_MONOCOMBAT] = ANIM_ROUND_TAKING_HIT_CLOSE,
+    [EKR_DISTANCE_PROMOTION]  = ANIM_ROUND_TAKING_HIT_CLOSE
 };
 
 const u8 BanimTypesPosLeft[5] = {

src/banim-main.c

@@ -285,7 +285,7 @@ void BattleAIS_ExecCommands(void)
                             anim1->state3 |= ANIM_BIT3_C01_BLOCKING_IN_BATTLE;
                             anim2->state3 |= ANIM_BIT3_C01_BLOCKING_IN_BATTLE;
 
-                            type = BattleTypeToAnimModeEndOfDodge[gEkrDistanceType];
+                            type = BanimDefaultStandingTypes[gEkrDistanceType];
                             frame_front = BanimDefaultModeConfig[type * 4 + 0];
 
                             if (GetAnimPosition(anim) == EKR_POS_L)
@@ -332,7 +332,7 @@ void BattleAIS_ExecCommands(void)
 
                     case ANIM_ROUND_TAKING_MISS_CLOSE:
                     case ANIM_ROUND_TAKING_MISS_FAR:
-                        type = BattleTypeToAnimModeEndOfDodge[gEkrDistanceType];
+                        type = BanimDefaultStandingTypes[gEkrDistanceType];
 
                     case ANIM_ROUND_TAKING_HIT_CLOSE:
                     case ANIM_ROUND_STANDING: