dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

one more battle label change

Browse Source
This commit is contained in:
DizzyEggg
2017-11-12 17:11:06 +01:00
parent 9febe24d9f
commit 716590c165
5 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/battle.h
+2 -2
View File
@@ -373,8 +373,8 @@ struct DisableStruct
/*0x0D*/ u8 unkD; /*0x0D*/ u8 unkD;
/*0x0E*/ u8 encoreTimer1 : 4; /*0x0E*/ u8 encoreTimer1 : 4;
/*0x0E*/ u8 encoreTimer2 : 4; /*0x0E*/ u8 encoreTimer2 : 4;
/*0x0F*/ u8 perishSong1 : 4; /*0x0F*/ u8 perishSongTimer1 : 4;
/*0x0F*/ u8 perishSong2 : 4; /*0x0F*/ u8 perishSongTimer2 : 4;
/*0x10*/ u8 furyCutterCounter; /*0x10*/ u8 furyCutterCounter;
/*0x11*/ u8 rolloutCounter1 : 4; /*0x11*/ u8 rolloutCounter1 : 4;
/*0x11*/ u8 rolloutCounter2 : 4; /*0x11*/ u8 rolloutCounter2 : 4;
src/battle_2.c
+2 -2
View File
@@ -2935,8 +2935,8 @@ void SwitchInClearSetData(void)
{ {
gDisableStructs[gActiveBank].substituteHP = disableStructCopy.substituteHP; gDisableStructs[gActiveBank].substituteHP = disableStructCopy.substituteHP;
gDisableStructs[gActiveBank].bankWithSureHit = disableStructCopy.bankWithSureHit; gDisableStructs[gActiveBank].bankWithSureHit = disableStructCopy.bankWithSureHit;
gDisableStructs[gActiveBank].perishSong1 = disableStructCopy.perishSong1; gDisableStructs[gActiveBank].perishSongTimer1 = disableStructCopy.perishSongTimer1;
gDisableStructs[gActiveBank].perishSong2 = disableStructCopy.perishSong2; gDisableStructs[gActiveBank].perishSongTimer2 = disableStructCopy.perishSongTimer2;
gDisableStructs[gActiveBank].bankPreventingEscape = disableStructCopy.bankPreventingEscape; gDisableStructs[gActiveBank].bankPreventingEscape = disableStructCopy.bankPreventingEscape;
} }
src/battle_ai_switch_items.c
+1 -1
View File
@@ -36,7 +36,7 @@ static bool8 ShouldUseItem(void);
static bool8 ShouldSwitchIfPerishSong(void) static bool8 ShouldSwitchIfPerishSong(void)
{ {
if (gStatuses3[gActiveBank] & STATUS3_PERISH_SONG if (gStatuses3[gActiveBank] & STATUS3_PERISH_SONG
&& gDisableStructs[gActiveBank].perishSong1 == 0) && gDisableStructs[gActiveBank].perishSongTimer1 == 0)
{ {
*(gBattleStruct->AI_monToSwitchIntoId + gActiveBank) = 6; *(gBattleStruct->AI_monToSwitchIntoId + gActiveBank) = 6;
EmitTwoReturnValues(1, ACTION_SWITCH, 0); EmitTwoReturnValues(1, ACTION_SWITCH, 0);
src/battle_script_commands.c
+2 -4
View File
@@ -120,8 +120,6 @@ struct TrainerMoney
extern const struct BattleMove gBattleMoves[]; extern const struct BattleMove gBattleMoves[];
extern const struct BaseStats gBaseStats[]; extern const struct BaseStats gBaseStats[];
extern const u8 gTypeEffectiveness[336]; extern const u8 gTypeEffectiveness[336];
extern const u16 gMissStringIds[];
extern const u16 gTrappingMoves[];
extern const struct TrainerMoney gTrainerMoneyTable[]; extern const struct TrainerMoney gTrainerMoneyTable[];
extern const u8* const gBattleScriptsForMoveEffects[]; extern const u8* const gBattleScriptsForMoveEffects[];
@@ -9180,8 +9178,8 @@ static void atkB2_setperishsong(void)
else else
{ {
gStatuses3[i] |= STATUS3_PERISH_SONG; gStatuses3[i] |= STATUS3_PERISH_SONG;
gDisableStructs[i].perishSong1 = 3; gDisableStructs[i].perishSongTimer1 = 3;
gDisableStructs[i].perishSong2 = 3; gDisableStructs[i].perishSongTimer2 = 3;
} }
} }
src/battle_util.c
+3 -3
View File
@@ -1292,9 +1292,9 @@ bool8 sub_8041364(void)
gBattleTextBuff1[1] = 1; gBattleTextBuff1[1] = 1;
gBattleTextBuff1[2] = 1; gBattleTextBuff1[2] = 1;
gBattleTextBuff1[3] = 1; gBattleTextBuff1[3] = 1;
gBattleTextBuff1[4] = gDisableStructs[gActiveBank].perishSong1; gBattleTextBuff1[4] = gDisableStructs[gActiveBank].perishSongTimer1;
gBattleTextBuff1[5] = EOS; gBattleTextBuff1[5] = EOS;
if (gDisableStructs[gActiveBank].perishSong1 == 0) if (gDisableStructs[gActiveBank].perishSongTimer1 == 0)
{ {
gStatuses3[gActiveBank] &= ~STATUS3_PERISH_SONG; gStatuses3[gActiveBank] &= ~STATUS3_PERISH_SONG;
gBattleMoveDamage = gBattleMons[gActiveBank].hp; gBattleMoveDamage = gBattleMons[gActiveBank].hp;
@@ -1302,7 +1302,7 @@ bool8 sub_8041364(void)
} }
else else
{ {
gDisableStructs[gActiveBank].perishSong1--; gDisableStructs[gActiveBank].perishSongTimer1--;
gBattlescriptCurrInstr = gUnknown_082DAF20; gBattlescriptCurrInstr = gUnknown_082DAF20;
} }
BattleScriptExecute(gBattlescriptCurrInstr); BattleScriptExecute(gBattlescriptCurrInstr);