diff options
Diffstat (limited to 'engine/battle/core.asm')
| -rw-r--r-- | engine/battle/core.asm | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/engine/battle/core.asm b/engine/battle/core.asm index fc3114a5d..5bd9fe8cc 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -2366,18 +2366,20 @@ 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, .skip_win_loss_text call PrintWinLossText - .skip_win_loss_text - jp .GiveMoney + + jp .give_money .mobile call BattleWinSlideInEnemyTrainerFrontpic @@ -2405,7 +2407,7 @@ WinTrainerBattle: call ClearBGPalettes ret -.GiveMoney: +.give_money ld a, [wAmuletCoin] and a call nz, .DoubleReward @@ -2678,7 +2680,8 @@ UpdateFaintedPlayerMon: ld a, [wWhichMonFaintedFirst] and a ret z - ret ; ?????????? + ; code was probably dummied out here + ret AskUseNextPokemon: call EmptyBattleTextbox @@ -3160,7 +3163,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 @@ -3182,7 +3186,7 @@ CheckWhetherSwitchmonIsPredetermined: .check_wBattleHasJustStarted ld a, [wBattleHasJustStarted] and a - ld b, $0 + ld b, 0 jr nz, .return_carry and a |