diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-11-06 15:52:58 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-11-06 15:52:58 -0500 |
| commit | d97eb6353d7f21c28983642dc94033e04bfb488b (patch) | |
| tree | 3598f0b0137929cf56956442c4a132495576eb08 /src/battle_script_commands.c | |
| parent | 629cb532d8886ba5874b137cab6f148e29a1e753 (diff) | |
Sync battle script documentation with Emerald, 1
Diffstat (limited to 'src/battle_script_commands.c')
| -rw-r--r-- | src/battle_script_commands.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index d8ea3cdc7..7be47d762 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -2833,7 +2833,7 @@ static void atk19_tryfaintmon(void) gBattlescriptCurrInstr = BS_ptr; if (GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER) { - gHitMarker |= HITMARKER_x400000; + gHitMarker |= HITMARKER_PLAYER_FAINTED; if (gBattleResults.playerFaintCounter < 0xFF) ++gBattleResults.playerFaintCounter; AdjustFriendshipOnBattleFaint(gActiveBattler); @@ -4738,11 +4738,11 @@ static void atk50_openpartyscreen(void) } else { - if (gBattlescriptCurrInstr[1] & 0x80) + if (gBattlescriptCurrInstr[1] & OPEN_PARTY_ALLOW_CANCEL) hitmarkerFaintBits = PARTY_CHOOSE_MON; // Used here as the caseId for the EmitChoose function. else hitmarkerFaintBits = PARTY_MUST_CHOOSE_MON; - battlerId = GetBattlerForBattleScript(gBattlescriptCurrInstr[1] & ~(0x80)); + battlerId = GetBattlerForBattleScript(gBattlescriptCurrInstr[1] & ~(OPEN_PARTY_ALLOW_CANCEL)); if (gSpecialStatuses[battlerId].flag40) { gBattlescriptCurrInstr += 6; @@ -6146,12 +6146,12 @@ static void atk76_various(void) *choicedMove = MOVE_NONE; } break; - case VARIOUS_CASE_7: + case VARIOUS_RESET_PLAYER_FAINTED_FLAG: if (!(gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_DOUBLE)) && gBattleTypeFlags & BATTLE_TYPE_TRAINER && gBattleMons[0].hp != 0 && gBattleMons[1].hp != 0) - gHitMarker &= ~(HITMARKER_x400000); + gHitMarker &= ~(HITMARKER_PLAYER_FAINTED); break; case VARIOUS_CASE_8: i = 0; // redundant |