diff options
Diffstat (limited to 'engine/battle')
| -rw-r--r-- | engine/battle/core.asm | 14 | ||||
| -rw-r--r-- | engine/battle/move_effects/spite.asm | 2 |
2 files changed, 10 insertions, 6 deletions
diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 02f80eef..3826a182 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -2304,17 +2304,19 @@ WinTrainerBattle: call BattleWinSlideInEnemyTrainerFrontpic ld c, 40 call DelayFrames + ld a, [wBattleType] cp BATTLETYPE_CANLOSE jr nz, .skip_heal predef HealParty .skip_heal + ld a, [wDebugFlags] bit DEBUG_BATTLE_F, a - jr nz, .GiveMoney + jr nz, .skip_win_loss_text call PrintWinLossText +.skip_win_loss_text -.GiveMoney: ld a, [wAmuletCoin] and a call nz, .DoubleReward @@ -2576,7 +2578,8 @@ UpdateFaintedPlayerMon: ld a, [wWhichMonFaintedFirst] and a ret z - ret ; ?????????? + ; code was probably dummied out here + ret AskUseNextPokemon: call EmptyBattleTextbox @@ -2971,7 +2974,8 @@ EnemySwitch_SetMode: jp ShowSetEnemyMonAndSendOutAnimation CheckWhetherSwitchmonIsPredetermined: -; returns carry if: ??? +; returns the enemy switchmon index in b, or +; returns carry if the index is not yet determined. ld a, [wLinkMode] and a jr z, .not_linked @@ -2993,7 +2997,7 @@ CheckWhetherSwitchmonIsPredetermined: .check_wBattleHasJustStarted ld a, [wBattleHasJustStarted] and a - ld b, $0 + ld b, 0 jr nz, .return_carry and a diff --git a/engine/battle/move_effects/spite.asm b/engine/battle/move_effects/spite.asm index 06627268..3e1c2f9b 100644 --- a/engine/battle/move_effects/spite.asm +++ b/engine/battle/move_effects/spite.asm @@ -4,7 +4,7 @@ BattleCommand_Spite: ld a, [wAttackMissed] and a jp nz, .failed - ld bc, PARTYMON_STRUCT_LENGTH ; ???? + ld bc, PARTYMON_STRUCT_LENGTH ; unused ld hl, wEnemyMonMoves ldh a, [hBattleTurn] and a |