atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Renamed some X Defend labels to reflect its new name in the IE

Browse source
This commit is contained in:
LOuroboros 2021-01-10 01:58:02 -03:00
parent a481233304
commit 3ffa7f993a
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/constants/item_effects.h
View file

@ -20,7 +20,7 @@
#else #else
// new field 1 masks // new field 1 masks
#define ITEM1_X_ATTACK 0x1 #define ITEM1_X_ATTACK 0x1
#define ITEM1_X_DEFEND 0x2 #define ITEM1_X_DEFENSE 0x2
#define ITEM1_X_SPEED 0x4 #define ITEM1_X_SPEED 0x4
#define ITEM1_X_SPATK 0x8 #define ITEM1_X_SPATK 0x8
#define ITEM1_X_SPDEF 0x10 #define ITEM1_X_SPDEF 0x10

2
src/battle_ai_switch_items.c
View file

@ -903,7 +903,7 @@ static bool8 ShouldUseItem(void)
#else #else
if (itemEffects[1] & ITEM1_X_ATTACK) if (itemEffects[1] & ITEM1_X_ATTACK)
*(gBattleStruct->AI_itemFlags + gActiveBattler / 2) |= 0x1; *(gBattleStruct->AI_itemFlags + gActiveBattler / 2) |= 0x1;
if (itemEffects[1] & ITEM1_X_DEFEND) if (itemEffects[1] & ITEM1_X_DEFENSE)
*(gBattleStruct->AI_itemFlags + gActiveBattler / 2) |= 0x2; *(gBattleStruct->AI_itemFlags + gActiveBattler / 2) |= 0x2;
if (itemEffects[1] & ITEM1_X_SPEED) if (itemEffects[1] & ITEM1_X_SPEED)
*(gBattleStruct->AI_itemFlags + gActiveBattler / 2) |= 0x4; *(gBattleStruct->AI_itemFlags + gActiveBattler / 2) |= 0x4;

4
src/pokemon.c
View file

@ -4513,7 +4513,7 @@ bool8 PokemonUseItemEffects(struct Pokemon *mon, u16 item, u8 partyIndex, u8 mov
gBattleMons[gActiveBattler].statStages[STAT_ATK] = MAX_STAT_STAGE; gBattleMons[gActiveBattler].statStages[STAT_ATK] = MAX_STAT_STAGE;
retVal = FALSE; retVal = FALSE;
} }
if ((itemEffect[cmdIndex] & ITEM1_X_DEFEND) if ((itemEffect[cmdIndex] & ITEM1_X_DEFENSE)
&& gBattleMons[gActiveBattler].statStages[STAT_DEF] < MAX_STAT_STAGE) && gBattleMons[gActiveBattler].statStages[STAT_DEF] < MAX_STAT_STAGE)
{ {
if (B_X_ITEMS_BUFF == GEN_7) if (B_X_ITEMS_BUFF == GEN_7)
@ -5188,7 +5188,7 @@ u8 *UseStatIncreaseItem(u16 itemId)
case ITEM1_X_ATTACK: case ITEM1_X_ATTACK:
BufferStatRoseMessage(STAT_ATK); BufferStatRoseMessage(STAT_ATK);
break; break;
case ITEM1_X_DEFEND: case ITEM1_X_DEFENSE:
BufferStatRoseMessage(STAT_DEF); BufferStatRoseMessage(STAT_DEF);
break; break;
case ITEM1_X_SPEED: case ITEM1_X_SPEED: