diff options
Diffstat (limited to 'engine/battle')
| -rw-r--r-- | engine/battle/battle_transition.asm | 2 | ||||
| -rw-r--r-- | engine/battle/core.asm | 15 | ||||
| -rw-r--r-- | engine/battle/effect_commands.asm | 2 | ||||
| -rw-r--r-- | engine/battle/move_effects/present.asm | 2 |
4 files changed, 13 insertions, 8 deletions
diff --git a/engine/battle/battle_transition.asm b/engine/battle/battle_transition.asm index 499c21adb..654bc6da8 100644 --- a/engine/battle/battle_transition.asm +++ b/engine/battle/battle_transition.asm @@ -138,7 +138,7 @@ ConvertTrainerBattlePokeballTilesTo2bpp: pop hl ld de, wDecompressScratch - ld b, BANK(ConvertTrainerBattlePokeballTilesTo2bpp) ; BANK(@) + ld b, BANK(@) ld c, $28 call Request2bpp pop af diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 56d42974f..3241e5022 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -3551,17 +3551,20 @@ Function_SetEnemyMonAndSendOutAnimation: call BattleCheckEnemyShininess jr nc, .not_shiny + ld a, 1 ; shiny anim ld [wBattleAnimParam], a ld de, ANIM_SEND_OUT_MON call Call_PlayBattleAnim -.not_shiny +.not_shiny ld bc, wTempMonSpecies farcall CheckFaintedFrzSlp jr c, .skip_cry + farcall CheckBattleScene jr c, .cry_no_anim + hlcoord 12, 0 ld d, $0 ld e, ANIM_MON_SLOW @@ -4154,7 +4157,7 @@ PursuitSwitch: ld a, [wLastPlayerMon] ld [wCurBattleMon], a .do_turn - ld a, BANK(DoPlayerTurn) ; and BANK(DoEnemyTurn) + ld a, BANK(DoPlayerTurn) ; aka BANK(DoEnemyTurn) rst FarCall ld a, BATTLE_VARS_MOVE @@ -4404,7 +4407,7 @@ UseHeldStatusHealingItem: .got_pointer call SwitchTurnCore - ld a, BANK(CalcPlayerStats) ; and BANK(CalcEnemyStats) + ld a, BANK(CalcPlayerStats) ; aka BANK(CalcEnemyStats) rst FarCall call SwitchTurnCore call ItemRecoveryAnim @@ -5376,14 +5379,14 @@ MoveSelectionScreen: .skip_inc ld [wMenuCursorY], a - ld a, $1 + ld a, 1 ld [wMenuCursorX], a ld a, [wNumMoves] inc a ld [w2DMenuNumRows], a - ld a, $1 + ld a, 1 ld [w2DMenuNumCols], a - ld c, $2c + ld c, STATICMENU_ENABLE_LEFT_RIGHT | STATICMENU_ENABLE_START | STATICMENU_WRAP ld a, [wMoveSelectionMenuType] dec a ld b, D_DOWN | D_UP | A_BUTTON diff --git a/engine/battle/effect_commands.asm b/engine/battle/effect_commands.asm index 76d6ee375..69171740b 100644 --- a/engine/battle/effect_commands.asm +++ b/engine/battle/effect_commands.asm @@ -1877,6 +1877,8 @@ BattleCommand_EffectChance: ld hl, wEnemyMoveStruct + MOVE_CHANCE .got_move_chance + ; BUG: 1/256 chance to fail even for a 100% effect chance, + ; since carry is not set if BattleRandom == [hl] == 255 call BattleRandom cp [hl] pop hl diff --git a/engine/battle/move_effects/present.asm b/engine/battle/move_effects/present.asm index 058bbad90..bfc334cc7 100644 --- a/engine/battle/move_effects/present.asm +++ b/engine/battle/move_effects/present.asm @@ -59,7 +59,7 @@ BattleCommand_Present: jr z, .got_hp_fn_pointer ld hl, AICheckEnemyMaxHP .got_hp_fn_pointer - ld a, BANK(AICheckPlayerMaxHP) ; and BANK(AICheckEnemyMaxHP) + ld a, BANK(AICheckPlayerMaxHP) ; aka BANK(AICheckEnemyMaxHP) rst FarCall jr c, .already_fully_healed |