Leahnaya/pokefirered
1
0
Fork 0
mirror of https://github.com/pret/pokefirered.git synced 2026-05-20 11:58:04 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed totem TODOs

Browse Source
This commit is contained in:
cawtds 2024-05-19 14:52:38 +02:00
parent 183c782ac6
commit dbc1eccd93
2 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/battle_message.c
View File

@ -2913,7 +2913,7 @@ u32 BattleStringExpandPlaceholders(const u8 *src, u8 *dst)
case B_TXT_PARTNER_NAME:
// TODO: trainer name
// toCpy = BattleStringGetPlayerName(text, GetBattlerAtPosition(B_POSITION_PLAYER_RIGHT));
toCpy = "TODO";;
toCpy = "TODO";
break;
case B_TXT_COPY_VAR_1:
toCpy = gStringVar1;

15
src/battle_script_commands.c
View File

@ -2330,16 +2330,12 @@ static void Cmd_datahpupdate(void)
gBattleScripting.battler = battler;
if (gBattleStruct->changedSpecies[side][gBattlerPartyIndexes[battler]] == SPECIES_NONE)
gBattleStruct->changedSpecies[side][gBattlerPartyIndexes[battler]] = gBattleMons[battler].species;
// TODO: Totems
// if (gBattleMons[battler].species == SPECIES_MIMIKYU_TOTEM_DISGUISED)
// gBattleMons[battler].species = SPECIES_MIMIKYU_TOTEM_BUSTED;
// else
// gBattleMons[battler].species = SPECIES_MIMIKYU_BUSTED;
gBattleMons[battler].species = SPECIES_MIMIKYU_BUSTED;
if (gBattleMons[battler].species == SPECIES_MIMIKYU_TOTEM_DISGUISED)
gBattleMons[battler].species = SPECIES_MIMIKYU_TOTEM_BUSTED;
else
gBattleMons[battler].species = SPECIES_MIMIKYU_BUSTED;
if (B_DISGUISE_HP_LOSS >= GEN_8)
{
gBattleMoveDamage = GetNonDynamaxMaxHP(battler) / 8;
}
BattleScriptPush(cmd->nextInstr);
gBattlescriptCurrInstr = BattleScript_TargetFormChange;
return;
@ -14705,8 +14701,7 @@ bool32 DoesSubstituteBlockMove(u32 battlerAtk, u32 battlerDef, u32 move)
bool32 DoesDisguiseBlockMove(u32 battler, u32 move)
{
// TODO: Totems
if (!(gBattleMons[battler].species == SPECIES_MIMIKYU_DISGUISED /* || gBattleMons[battler].species == SPECIES_MIMIKYU_TOTEM_DISGUISED */)
if (!(gBattleMons[battler].species == SPECIES_MIMIKYU_DISGUISED || gBattleMons[battler].species == SPECIES_MIMIKYU_TOTEM_DISGUISED)
|| gBattleMons[battler].status2 & STATUS2_TRANSFORMED
|| (!gProtectStructs[battler].confusionSelfDmg && (IS_MOVE_STATUS(move) || gHitMarker & HITMARKER_PASSIVE_DAMAGE))
|| gHitMarker & HITMARKER_IGNORE_DISGUISE