ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 19:54:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'RHH/master' into RHH/upcoming

Browse Source
This commit is contained in:
Eduardo Quezada 2023-07-06 15:28:41 -04:00
commit 404b18564f
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/battle_interface.c
View File

@ -2880,10 +2880,10 @@ static void PrintOnAbilityPopUp(const u8 *str, u8 *spriteTileData1, u8 *spriteTi
} }
} }
static const u8 sText_Space16[]= _(" "); static const u8 sText_Spaces20[]= _(" ");
static void ClearAbilityName(u8 spriteId1, u8 spriteId2) static void ClearAbilityName(u8 spriteId1, u8 spriteId2)
{ {
PrintOnAbilityPopUp(sText_Space16, PrintOnAbilityPopUp(sText_Spaces20,
(void*)(OBJ_VRAM0) + (gSprites[spriteId1].oam.tileNum * 32) + 256, (void*)(OBJ_VRAM0) + (gSprites[spriteId1].oam.tileNum * 32) + 256,
(void*)(OBJ_VRAM0) + (gSprites[spriteId2].oam.tileNum * 32) + 256, (void*)(OBJ_VRAM0) + (gSprites[spriteId2].oam.tileNum * 32) + 256,
5, 12, 5, 12,

12
src/battle_z_move.c
View File

@ -628,6 +628,10 @@ void SetZEffect(void)
BattleScriptPush(gBattlescriptCurrInstr + Z_EFFECT_BS_LENGTH); BattleScriptPush(gBattlescriptCurrInstr + Z_EFFECT_BS_LENGTH);
gBattlescriptCurrInstr = BattleScript_ZEffectPrintString; gBattlescriptCurrInstr = BattleScript_ZEffectPrintString;
} }
else
{
gBattlescriptCurrInstr += Z_EFFECT_BS_LENGTH;
}
break; break;
case Z_EFFECT_BOOST_CRITS: case Z_EFFECT_BOOST_CRITS:
if (!(gBattleMons[gBattlerAttacker].status2 & STATUS2_FOCUS_ENERGY)) if (!(gBattleMons[gBattlerAttacker].status2 & STATUS2_FOCUS_ENERGY))
@ -637,6 +641,10 @@ void SetZEffect(void)
BattleScriptPush(gBattlescriptCurrInstr + Z_EFFECT_BS_LENGTH); BattleScriptPush(gBattlescriptCurrInstr + Z_EFFECT_BS_LENGTH);
gBattlescriptCurrInstr = BattleScript_ZEffectPrintString; gBattlescriptCurrInstr = BattleScript_ZEffectPrintString;
} }
else
{
gBattlescriptCurrInstr += Z_EFFECT_BS_LENGTH;
}
break; break;
case Z_EFFECT_FOLLOW_ME: case Z_EFFECT_FOLLOW_ME:
gSideTimers[GetBattlerSide(gBattlerAttacker)].followmeTimer = 1; gSideTimers[GetBattlerSide(gBattlerAttacker)].followmeTimer = 1;
@ -653,6 +661,10 @@ void SetZEffect(void)
BattleScriptPush(gBattlescriptCurrInstr + Z_EFFECT_BS_LENGTH); BattleScriptPush(gBattlescriptCurrInstr + Z_EFFECT_BS_LENGTH);
gBattlescriptCurrInstr = BattleScript_RecoverHPZMove; gBattlescriptCurrInstr = BattleScript_RecoverHPZMove;
} }
else
{
gBattlescriptCurrInstr += Z_EFFECT_BS_LENGTH;
}
break; break;
case Z_EFFECT_RESTORE_REPLACEMENT_HP: case Z_EFFECT_RESTORE_REPLACEMENT_HP:
gBattleStruct->zmove.healReplacement = TRUE; gBattleStruct->zmove.healReplacement = TRUE;