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

Add Substitute handler to debug

Browse source
This commit is contained in:
DizzyEggg 2018-08-01 23:14:02 +02:00
parent 4c3de6f58a
commit 5e27cd53a9
2 changed files with 27 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/battle_debug.c
View file

@ -106,6 +106,7 @@ enum
VAL_BITFIELD_32, VAL_BITFIELD_32,
VAR_SIDE_STATUS, VAR_SIDE_STATUS,
VAR_SHOW_HP, VAR_SHOW_HP,
VAR_SUBSTITUTE,
}; };
enum enum
@ -126,6 +127,7 @@ enum
enum enum
{ {
VARIOUS_SHOW_HP, VARIOUS_SHOW_HP,
VARIOUS_SUBSTITUTE_HP,
}; };
// const rom data // const rom data
@ -153,6 +155,7 @@ static const u8 sText_Transformed[] = _("Transformed");
static const u8 sText_Recharge[] = _("Recharge"); static const u8 sText_Recharge[] = _("Recharge");
static const u8 sText_Rage[] = _("Rage"); static const u8 sText_Rage[] = _("Rage");
static const u8 sText_Substitute[] = _("Substitute"); static const u8 sText_Substitute[] = _("Substitute");
static const u8 sText_SubstituteHp[] = _("Substitute HP");
static const u8 sText_DestinyBond[] = _("Destiny Bond"); static const u8 sText_DestinyBond[] = _("Destiny Bond");
static const u8 sText_CantEscape[] = _("Cant Escape"); static const u8 sText_CantEscape[] = _("Cant Escape");
static const u8 sText_Nightmare[] = _("Nightmare"); static const u8 sText_Nightmare[] = _("Nightmare");
@ -300,6 +303,7 @@ static const struct ListMenuItem sMainListItems[] =
static const struct ListMenuItem sVariousListItems[] = static const struct ListMenuItem sVariousListItems[] =
{ {
{sText_ShowHP, VARIOUS_SHOW_HP}, {sText_ShowHP, VARIOUS_SHOW_HP},
{sText_SubstituteHp, VARIOUS_SUBSTITUTE_HP},
}; };
static const struct ListMenuItem sAIListItems[] = static const struct ListMenuItem sAIListItems[] =
@ -1058,6 +1062,19 @@ static void UpdateBattlerValue(struct BattleDebugMenu *data)
case VAR_SHOW_HP: case VAR_SHOW_HP:
(*(struct BattleSpriteInfo*)(data->modifyArrows.modifiedValPtr)).hpNumbersNoBars = data->modifyArrows.currValue; (*(struct BattleSpriteInfo*)(data->modifyArrows.modifiedValPtr)).hpNumbersNoBars = data->modifyArrows.currValue;
break; break;
case VAR_SUBSTITUTE:
*(u8*)(data->modifyArrows.modifiedValPtr) = data->modifyArrows.currValue;
if (*(u8*)(data->modifyArrows.modifiedValPtr) == 0)
{
gBattleMons[data->battlerId].status2 &= ~(STATUS2_SUBSTITUTE);
gBattleSpritesDataPtr->battlerData[data->battlerId].behindSubstitute = 0;
}
else
{
gBattleMons[data->battlerId].status2 |= STATUS2_SUBSTITUTE;
gBattleSpritesDataPtr->battlerData[data->battlerId].behindSubstitute = 1;
}
break;
} }
data->battlerWasChanged[data->battlerId] = TRUE; data->battlerWasChanged[data->battlerId] = TRUE;
} }
@ -1310,6 +1327,15 @@ static void SetUpModifyArrows(struct BattleDebugMenu *data)
data->modifyArrows.typeOfVal = VAR_SHOW_HP; data->modifyArrows.typeOfVal = VAR_SHOW_HP;
data->modifyArrows.currValue = gBattleSpritesDataPtr->battlerData[data->battlerId].hpNumbersNoBars; data->modifyArrows.currValue = gBattleSpritesDataPtr->battlerData[data->battlerId].hpNumbersNoBars;
} }
else if (data->currentSecondaryListItemId == VARIOUS_SUBSTITUTE_HP)
{
data->modifyArrows.minValue = 0;
data->modifyArrows.maxValue = 255;
data->modifyArrows.maxDigits = 3;
data->modifyArrows.modifiedValPtr = &gDisableStructs[data->battlerId].substituteHP;
data->modifyArrows.typeOfVal = VAR_SUBSTITUTE;
data->modifyArrows.currValue = gDisableStructs[data->battlerId].substituteHP;
}
break; break;
case LIST_ITEM_STATUS1: case LIST_ITEM_STATUS1:
data->modifyArrows.modifiedValPtr = &gBattleMons[data->battlerId].status1; data->modifyArrows.modifiedValPtr = &gBattleMons[data->battlerId].status1;

6
src/battle_script_commands.c
View file

@ -7682,11 +7682,7 @@ static void atk9E_metronome(void)
{ {
s32 i; s32 i;
gCurrentMove = (Random() & 0x1FF) + 1; gCurrentMove = (Random() % MOVES_COUNT) + 1;
if (gCurrentMove >= MOVES_COUNT)
continue;
for (i = 0; i < 4; i++); // ?
i = -1; i = -1;
while (1) while (1)