Merge pull request pret#1253 from surskitty/battle_engine

Increase readability of too-long names
ghoulslash · Jan 12, 2021 · b3a5b70 · b3a5b70
2 parents 1e85a0c + 71142a2
commit b3a5b70
Show file tree

Hide file tree

Showing 26 changed files with 272 additions and 272 deletions.
diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s
@@ -152,7 +152,7 @@ gBattleAnims_Moves::
 	.4byte Move_AMNESIA
 	.4byte Move_KINESIS
 	.4byte Move_SOFT_BOILED
-	.4byte Move_HI_JUMP_KICK
+	.4byte Move_HIGH_JUMP_KICK
 	.4byte Move_GLARE
 	.4byte Move_DREAM_EATER
 	.4byte Move_POISON_GAS
@@ -281,7 +281,7 @@ gBattleAnims_Moves::
 	.4byte Move_MEMENTO
 	.4byte Move_FACADE
 	.4byte Move_FOCUS_PUNCH
-	.4byte Move_SMELLING_SALT
+	.4byte Move_SMELLING_SALTS
 	.4byte Move_FOLLOW_ME
 	.4byte Move_NATURE_POWER
 	.4byte Move_CHARGE
@@ -17167,7 +17167,7 @@ Move_FACADE:
 	loopsewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER, 24, 3
 	end
 
-Move_SMELLING_SALT:
+Move_SMELLING_SALTS:
 	loadspritegfx ANIM_TAG_TAG_HAND
 	loadspritegfx ANIM_TAG_SMELLINGSALT_EFFECT
 	createsprite gSmellingSaltsHandSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 0, 2
@@ -20114,7 +20114,7 @@ Move_JUMP_KICK:
 	blendoff
 	end
 
-Move_HI_JUMP_KICK:
+Move_HIGH_JUMP_KICK:
 	loadspritegfx ANIM_TAG_HANDS_AND_FEET
 	loadspritegfx ANIM_TAG_IMPACT
 	monbg ANIM_DEF_PARTNER

diff --git a/include/constants/moves.h b/include/constants/moves.h
@@ -12,7 +12,7 @@
 #define MOVE_ICE_PUNCH 8
 #define MOVE_THUNDER_PUNCH 9
 #define MOVE_SCRATCH 10
-#define MOVE_VICE_GRIP 11
+#define MOVE_VISE_GRIP 11
 #define MOVE_GUILLOTINE 12
 #define MOVE_RAZOR_WIND 13
 #define MOVE_SWORDS_DANCE 14
@@ -137,7 +137,7 @@
 #define MOVE_AMNESIA 133
 #define MOVE_KINESIS 134
 #define MOVE_SOFT_BOILED 135
-#define MOVE_HI_JUMP_KICK 136
+#define MOVE_HIGH_JUMP_KICK 136
 #define MOVE_GLARE 137
 #define MOVE_DREAM_EATER 138
 #define MOVE_POISON_GAS 139
@@ -186,7 +186,7 @@
 #define MOVE_PROTECT 182
 #define MOVE_MACH_PUNCH 183
 #define MOVE_SCARY_FACE 184
-#define MOVE_FAINT_ATTACK 185
+#define MOVE_FEINT_ATTACK 185
 #define MOVE_SWEET_KISS 186
 #define MOVE_BELLY_DRUM 187
 #define MOVE_SLUDGE_BOMB 188
@@ -266,7 +266,7 @@
 #define MOVE_MEMENTO 262
 #define MOVE_FACADE 263
 #define MOVE_FOCUS_PUNCH 264
-#define MOVE_SMELLING_SALT 265
+#define MOVE_SMELLING_SALTS 265
 #define MOVE_FOLLOW_ME 266
 #define MOVE_NATURE_POWER 267
 #define MOVE_CHARGE 268

diff --git a/src/battle_arena.c b/src/battle_arena.c
@@ -53,7 +53,7 @@ static const s8 sMindRatings[] =
     [MOVE_ICE_PUNCH] = 1,
     [MOVE_THUNDER_PUNCH] = 1,
     [MOVE_SCRATCH] = 1,
-    [MOVE_VICE_GRIP] = 1,
+    [MOVE_VISE_GRIP] = 1,
     [MOVE_GUILLOTINE] = 1,
     [MOVE_RAZOR_WIND] = 1,
     [MOVE_SWORDS_DANCE] = 0,
@@ -178,7 +178,7 @@ static const s8 sMindRatings[] =
     [MOVE_AMNESIA] = 0,
     [MOVE_KINESIS] = 0,
     [MOVE_SOFT_BOILED] = 0,
-    [MOVE_HI_JUMP_KICK] = 1,
+    [MOVE_HIGH_JUMP_KICK] = 1,
     [MOVE_GLARE] = 0,
     [MOVE_DREAM_EATER] = 1,
     [MOVE_POISON_GAS] = 0,
@@ -227,7 +227,7 @@ static const s8 sMindRatings[] =
     [MOVE_PROTECT] = -1,
     [MOVE_MACH_PUNCH] = 1,
     [MOVE_SCARY_FACE] = 0,
-    [MOVE_FAINT_ATTACK] = 1,
+    [MOVE_FEINT_ATTACK] = 1,
     [MOVE_SWEET_KISS] = 0,
     [MOVE_BELLY_DRUM] = 0,
     [MOVE_SLUDGE_BOMB] = 1,
@@ -307,7 +307,7 @@ static const s8 sMindRatings[] =
     [MOVE_MEMENTO] = 0,
     [MOVE_FACADE] = 1,
     [MOVE_FOCUS_PUNCH] = 1,
-    [MOVE_SMELLING_SALT] = 1,
+    [MOVE_SMELLING_SALTS] = 1,
     [MOVE_FOLLOW_ME] = 0,
     [MOVE_NATURE_POWER] = 0,
     [MOVE_CHARGE] = 0,

diff --git a/src/battle_dome.c b/src/battle_dome.c
@@ -152,7 +152,7 @@ static const u8 sBattleStyleMovePoints[MOVES_COUNT][NUM_MOVE_POINT_TYPES] =
     [MOVE_ICE_PUNCH]     = {[MOVE_POINTS_DMG] = 1, [MOVE_POINTS_ACCURATE] = 1, [MOVE_POINTS_EFFECT] = 1},
     [MOVE_THUNDER_PUNCH] = {[MOVE_POINTS_DMG] = 1, [MOVE_POINTS_ACCURATE] = 1, [MOVE_POINTS_EFFECT] = 1},
     [MOVE_SCRATCH]       = {[MOVE_POINTS_DMG] = 1, [MOVE_POINTS_ACCURATE] = 1},
-    [MOVE_VICE_GRIP]     = {[MOVE_POINTS_DMG] = 1, [MOVE_POINTS_ACCURATE] = 1},
+    [MOVE_VISE_GRIP]     = {[MOVE_POINTS_DMG] = 1, [MOVE_POINTS_ACCURATE] = 1},
     [MOVE_GUILLOTINE]    = {[MOVE_POINTS_DMG] = 1, [MOVE_POINTS_LOW_PP] = 1},
     [MOVE_RAZOR_WIND]    = {[MOVE_POINTS_DMG] = 1, [MOVE_POINTS_ACCURATE] = 1},
     [MOVE_SWORDS_DANCE]  = {[MOVE_POINTS_COMBO] = 1, [MOVE_POINTS_STAT_RAISE] = 1, [MOVE_POINTS_POPULAR] = 1},
@@ -277,7 +277,7 @@ static const u8 sBattleStyleMovePoints[MOVES_COUNT][NUM_MOVE_POINT_TYPES] =
     [MOVE_AMNESIA]       = {[MOVE_POINTS_STAT_RAISE] = 1, [MOVE_POINTS_DEF] = 1},
     [MOVE_KINESIS]       = {[MOVE_POINTS_STAT_LOWER] = 1},
     [MOVE_SOFT_BOILED]   = {[MOVE_POINTS_HEAL] = 1, [MOVE_POINTS_ACCURATE] = 1},
-    [MOVE_HI_JUMP_KICK]  = {[MOVE_POINTS_DMG] = 1},
+    [MOVE_HIGH_JUMP_KICK]  = {[MOVE_POINTS_DMG] = 1},
     [MOVE_GLARE]         = {[MOVE_POINTS_STAT_LOWER] = 1},
     [MOVE_DREAM_EATER]   = {[MOVE_POINTS_COMBO] = 1, [MOVE_POINTS_RARE] = 1, [MOVE_POINTS_HEAL] = 1, [MOVE_POINTS_ACCURATE] = 1, [MOVE_POINTS_STRONG] = 1},
     [MOVE_POISON_GAS]    = {[MOVE_POINTS_STATUS] = 1},
@@ -326,7 +326,7 @@ static const u8 sBattleStyleMovePoints[MOVES_COUNT][NUM_MOVE_POINT_TYPES] =
     [MOVE_PROTECT]       = {[MOVE_POINTS_DEF] = 1, [MOVE_POINTS_POPULAR] = 1},
     [MOVE_MACH_PUNCH]    = {[MOVE_POINTS_DMG] = 1, [MOVE_POINTS_ACCURATE] = 1},
     [MOVE_SCARY_FACE]    = {0},
-    [MOVE_FAINT_ATTACK]  = {[MOVE_POINTS_DMG] = 1},
+    [MOVE_FEINT_ATTACK]  = {[MOVE_POINTS_DMG] = 1},
     [MOVE_SWEET_KISS]    = {0},
     [MOVE_BELLY_DRUM]    = {[MOVE_POINTS_COMBO] = 1, [MOVE_POINTS_STAT_RAISE] = 1},
     [MOVE_SLUDGE_BOMB]   = {[MOVE_POINTS_DMG] = 1, [MOVE_POINTS_ACCURATE] = 1, [MOVE_POINTS_STRONG] = 1, [MOVE_POINTS_EFFECT] = 1},
@@ -406,7 +406,7 @@ static const u8 sBattleStyleMovePoints[MOVES_COUNT][NUM_MOVE_POINT_TYPES] =
     [MOVE_MEMENTO]       = {[MOVE_POINTS_RARE] = 1, [MOVE_POINTS_ACCURATE] = 1},
     [MOVE_FACADE]        = {[MOVE_POINTS_DMG] = 1, [MOVE_POINTS_ACCURATE] = 1},
     [MOVE_FOCUS_PUNCH]   = {[MOVE_POINTS_DMG] = 1, [MOVE_POINTS_ACCURATE] = 1, [MOVE_POINTS_STRONG] = 1},
-    [MOVE_SMELLING_SALT] = {[MOVE_POINTS_DMG] = 1, [MOVE_POINTS_ACCURATE] = 1},
+    [MOVE_SMELLING_SALTS] = {[MOVE_POINTS_DMG] = 1, [MOVE_POINTS_ACCURATE] = 1},
     [MOVE_FOLLOW_ME]     = {[MOVE_POINTS_RARE] = 1, [MOVE_POINTS_ACCURATE] = 1},
     [MOVE_NATURE_POWER]  = {[MOVE_POINTS_DMG] = 1},
     [MOVE_CHARGE]        = {[MOVE_POINTS_COMBO] = 1, [MOVE_POINTS_ACCURATE] = 1},

diff --git a/src/battle_message.c b/src/battle_message.c
@@ -1787,7 +1787,7 @@ static const u16 sGrammarMoveUsedTable[] =
     MOVE_FEATHER_DANCE, MOVE_TEETER_DANCE, MOVE_MUD_SPORT,
     MOVE_FAKE_TEARS, MOVE_WATER_SPORT, MOVE_CALM_MIND, 0,
 
-    MOVE_POUND, MOVE_SCRATCH, MOVE_VICE_GRIP,
+    MOVE_POUND, MOVE_SCRATCH, MOVE_VISE_GRIP,
     MOVE_WING_ATTACK, MOVE_FLY, MOVE_BIND, MOVE_SLAM,
     MOVE_HORN_ATTACK, MOVE_WRAP, MOVE_THRASH, MOVE_TAIL_WHIP,
     MOVE_LEER, MOVE_BITE, MOVE_GROWL, MOVE_ROAR,

diff --git a/src/battle_util.c b/src/battle_util.c
@@ -1318,7 +1318,7 @@ static bool32 IsGravityPreventingMove(u32 move)
     case MOVE_BOUNCE:
     case MOVE_FLY:
     case MOVE_FLYING_PRESS:
-    case MOVE_HI_JUMP_KICK:
+    case MOVE_HIGH_JUMP_KICK:
     case MOVE_JUMP_KICK:
     case MOVE_MAGNET_RISE:
     case MOVE_SKY_DROP:

diff --git a/src/data/battle_frontier/apprentice.h b/src/data/battle_frontier/apprentice.h
@@ -583,7 +583,7 @@ static const bool8 sValidApprenticeMoves[MOVES_COUNT] =
     [MOVE_ICE_PUNCH] = TRUE,
     [MOVE_THUNDER_PUNCH] = TRUE,
     [MOVE_SCRATCH] = FALSE,
-    [MOVE_VICE_GRIP] = FALSE,
+    [MOVE_VISE_GRIP] = FALSE,
     [MOVE_GUILLOTINE] = TRUE,
     [MOVE_RAZOR_WIND] = FALSE,
     [MOVE_SWORDS_DANCE] = TRUE,
@@ -708,7 +708,7 @@ static const bool8 sValidApprenticeMoves[MOVES_COUNT] =
     [MOVE_AMNESIA] = TRUE,
     [MOVE_KINESIS] = TRUE,
     [MOVE_SOFT_BOILED] = TRUE,
-    [MOVE_HI_JUMP_KICK] = TRUE,
+    [MOVE_HIGH_JUMP_KICK] = TRUE,
     [MOVE_GLARE] = TRUE,
     [MOVE_DREAM_EATER] = TRUE,
     [MOVE_POISON_GAS] = FALSE,
@@ -757,7 +757,7 @@ static const bool8 sValidApprenticeMoves[MOVES_COUNT] =
     [MOVE_PROTECT] = TRUE,
     [MOVE_MACH_PUNCH] = TRUE,
     [MOVE_SCARY_FACE] = TRUE,
-    [MOVE_FAINT_ATTACK] = TRUE,
+    [MOVE_FEINT_ATTACK] = TRUE,
     [MOVE_SWEET_KISS] = TRUE,
     [MOVE_BELLY_DRUM] = TRUE,
     [MOVE_SLUDGE_BOMB] = TRUE,
@@ -837,7 +837,7 @@ static const bool8 sValidApprenticeMoves[MOVES_COUNT] =
     [MOVE_MEMENTO] = TRUE,
     [MOVE_FACADE] = TRUE,
     [MOVE_FOCUS_PUNCH] = TRUE,
-    [MOVE_SMELLING_SALT] = TRUE,
+    [MOVE_SMELLING_SALTS] = TRUE,
     [MOVE_FOLLOW_ME] = TRUE,
     [MOVE_NATURE_POWER] = TRUE,
     [MOVE_CHARGE] = TRUE,