diff options
Diffstat (limited to 'engine/battle/move_effects')
32 files changed, 62 insertions, 62 deletions
diff --git a/engine/battle/move_effects/baton_pass.asm b/engine/battle/move_effects/baton_pass.asm index 7f922b214..46baeb75f 100644 --- a/engine/battle/move_effects/baton_pass.asm +++ b/engine/battle/move_effects/baton_pass.asm @@ -1,7 +1,7 @@ BattleCommand_BatonPass: ; batonpass - ld a, [hBattleTurn] + ldh a, [hBattleTurn] and a jp nz, .Enemy diff --git a/engine/battle/move_effects/beat_up.asm b/engine/battle/move_effects/beat_up.asm index 673fc46c6..bd0307f40 100644 --- a/engine/battle/move_effects/beat_up.asm +++ b/engine/battle/move_effects/beat_up.asm @@ -2,7 +2,7 @@ BattleCommand_BeatUp: ; beatup call ResetDamage - ld a, [hBattleTurn] + ldh a, [hBattleTurn] and a jp nz, .enemy_beats_up @@ -210,7 +210,7 @@ GetBeatupMonLocation: push bc ld c, a ld b, 0 - ld a, [hBattleTurn] + ldh a, [hBattleTurn] and a ld hl, wPartyMon1Species jr z, .got_species diff --git a/engine/battle/move_effects/bide.asm b/engine/battle/move_effects/bide.asm index 871e0e7a8..cfb3f3ab2 100644 --- a/engine/battle/move_effects/bide.asm +++ b/engine/battle/move_effects/bide.asm @@ -7,7 +7,7 @@ BattleCommand_StoreEnergy: ret z ld hl, wPlayerRolloutCount - ld a, [hBattleTurn] + ldh a, [hBattleTurn] and a jr z, .check_still_storing_energy ld hl, wEnemyRolloutCount @@ -28,7 +28,7 @@ BattleCommand_StoreEnergy: ld [hl], a ld hl, wPlayerDamageTaken + 1 ld de, wPlayerCharging ; player - ld a, [hBattleTurn] + ldh a, [hBattleTurn] and a jr z, .player ld hl, wEnemyDamageTaken + 1 @@ -74,7 +74,7 @@ BattleCommand_UnleashEnergy: ld de, wPlayerDamageTaken ld bc, wPlayerRolloutCount - ld a, [hBattleTurn] + ldh a, [hBattleTurn] and a jr z, .got_damage ld de, wEnemyDamageTaken diff --git a/engine/battle/move_effects/conversion.asm b/engine/battle/move_effects/conversion.asm index f9307056c..4b13f29dd 100644 --- a/engine/battle/move_effects/conversion.asm +++ b/engine/battle/move_effects/conversion.asm @@ -3,7 +3,7 @@ BattleCommand_Conversion: ld hl, wBattleMonMoves ld de, wBattleMonType1 - ld a, [hBattleTurn] + ldh a, [hBattleTurn] and a jr z, .got_moves ld hl, wEnemyMonMoves diff --git a/engine/battle/move_effects/conversion2.asm b/engine/battle/move_effects/conversion2.asm index 14a7e257a..d67725f9c 100644 --- a/engine/battle/move_effects/conversion2.asm +++ b/engine/battle/move_effects/conversion2.asm @@ -5,7 +5,7 @@ BattleCommand_Conversion2: and a jr nz, .failed ld hl, wBattleMonType1 - ld a, [hBattleTurn] + ldh a, [hBattleTurn] and a jr z, .got_type ld hl, wEnemyMonType1 diff --git a/engine/battle/move_effects/curse.asm b/engine/battle/move_effects/curse.asm index 4861e9a37..fb59d9b67 100644 --- a/engine/battle/move_effects/curse.asm +++ b/engine/battle/move_effects/curse.asm @@ -3,7 +3,7 @@ BattleCommand_Curse: ld de, wBattleMonType1 ld bc, wPlayerStatLevels - ld a, [hBattleTurn] + ldh a, [hBattleTurn] and a jr z, .go ld de, wEnemyMonType1 diff --git a/engine/battle/move_effects/disable.asm b/engine/battle/move_effects/disable.asm index 44017e30d..7f5cfaea0 100644 --- a/engine/battle/move_effects/disable.asm +++ b/engine/battle/move_effects/disable.asm @@ -7,7 +7,7 @@ BattleCommand_Disable: ld de, wEnemyDisableCount ld hl, wEnemyMonMoves - ld a, [hBattleTurn] + ldh a, [hBattleTurn] and a jr z, .got_moves ld de, wPlayerDisableCount @@ -33,7 +33,7 @@ BattleCommand_Disable: cp b jr nz, .loop - ld a, [hBattleTurn] + ldh a, [hBattleTurn] and a ld hl, wEnemyMonPP jr z, .got_pp @@ -55,7 +55,7 @@ BattleCommand_Disable: ld [de], a call AnimateCurrentMove ld hl, wDisabledMove - ld a, [hBattleTurn] + ldh a, [hBattleTurn] and a jr nz, .got_disabled_move_pointer inc hl diff --git a/engine/battle/move_effects/encore.asm b/engine/battle/move_effects/encore.asm index f436fd970..3ac107e2b 100644 --- a/engine/battle/move_effects/encore.asm +++ b/engine/battle/move_effects/encore.asm @@ -3,7 +3,7 @@ BattleCommand_Encore: ld hl, wEnemyMonMoves ld de, wEnemyEncoreCount - ld a, [hBattleTurn] + ldh a, [hBattleTurn] and a jr z, .ok ld hl, wBattleMonMoves @@ -47,7 +47,7 @@ BattleCommand_Encore: ld [de], a call CheckOpponentWentFirst jr nz, .finish_move - ld a, [hBattleTurn] + ldh a, [hBattleTurn] and a jr z, .force_last_enemy_move diff --git a/engine/battle/move_effects/false_swipe.asm b/engine/battle/move_effects/false_swipe.asm index 0d3f7d47c..e2e0c6f10 100644 --- a/engine/battle/move_effects/false_swipe.asm +++ b/engine/battle/move_effects/false_swipe.asm @@ -4,7 +4,7 @@ BattleCommand_FalseSwipe: ; Makes sure wCurDamage < MonHP ld hl, wEnemyMonHP - ld a, [hBattleTurn] + ldh a, [hBattleTurn] and a jr z, .got_hp ld hl, wBattleMonHP diff --git a/engine/battle/move_effects/frustration.asm b/engine/battle/move_effects/frustration.asm index 3d395b510..e9986bdf3 100644 --- a/engine/battle/move_effects/frustration.asm +++ b/engine/battle/move_effects/frustration.asm @@ -3,25 +3,25 @@ BattleCommand_FrustrationPower: push bc ld hl, wBattleMonHappiness - ld a, [hBattleTurn] + ldh a, [hBattleTurn] and a jr z, .got_happiness ld hl, wEnemyMonHappiness .got_happiness ld a, $ff sub [hl] - ld [hMultiplicand + 2], a + ldh [hMultiplicand + 2], a xor a - ld [hMultiplicand + 0], a - ld [hMultiplicand + 1], a + ldh [hMultiplicand + 0], a + ldh [hMultiplicand + 1], a ld a, 10 - ld [hMultiplier], a + ldh [hMultiplier], a call Multiply ld a, 25 - ld [hDivisor], a + ldh [hDivisor], a ld b, 4 call Divide - ld a, [hQuotient + 2] + ldh a, [hQuotient + 2] ld d, a pop bc ret diff --git a/engine/battle/move_effects/fury_cutter.asm b/engine/battle/move_effects/fury_cutter.asm index 6aa6b7838..a12848499 100644 --- a/engine/battle/move_effects/fury_cutter.asm +++ b/engine/battle/move_effects/fury_cutter.asm @@ -2,7 +2,7 @@ BattleCommand_FuryCutter: ; furycutter ld hl, wPlayerFuryCutterCount - ld a, [hBattleTurn] + ldh a, [hBattleTurn] and a jr z, .go ld hl, wEnemyFuryCutterCount @@ -42,7 +42,7 @@ ResetFuryCutterCount: push hl ld hl, wPlayerFuryCutterCount - ld a, [hBattleTurn] + ldh a, [hBattleTurn] and a jr z, .reset ld hl, wEnemyFuryCutterCount diff --git a/engine/battle/move_effects/future_sight.asm b/engine/battle/move_effects/future_sight.asm index c28841b35..0cb0b43ba 100644 --- a/engine/battle/move_effects/future_sight.asm +++ b/engine/battle/move_effects/future_sight.asm @@ -3,7 +3,7 @@ BattleCommand_CheckFutureSight: ld hl, wPlayerFutureSightCount ld de, wPlayerFutureSightDamage - ld a, [hBattleTurn] + ldh a, [hBattleTurn] and a jr z, .ok ld hl, wEnemyFutureSightCount @@ -41,7 +41,7 @@ BattleCommand_FutureSight: ld [hl], b .AlreadyChargingFutureSight: ld hl, wPlayerFutureSightCount - ld a, [hBattleTurn] + ldh a, [hBattleTurn] and a jr z, .GotFutureSightCount ld hl, wEnemyFutureSightCount @@ -57,7 +57,7 @@ BattleCommand_FutureSight: call StdBattleTextBox call BattleCommand_RaiseSub ld de, wPlayerFutureSightDamage - ld a, [hBattleTurn] + ldh a, [hBattleTurn] and a jr z, .StoreDamage ld de, wEnemyFutureSightDamage diff --git a/engine/battle/move_effects/heal_bell.asm b/engine/battle/move_effects/heal_bell.asm index 2570a53ba..a9923429e 100644 --- a/engine/battle/move_effects/heal_bell.asm +++ b/engine/battle/move_effects/heal_bell.asm @@ -5,7 +5,7 @@ BattleCommand_HealBell: call GetBattleVarAddr res SUBSTATUS_NIGHTMARE, [hl] ld de, wPartyMon1Status - ld a, [hBattleTurn] + ldh a, [hBattleTurn] and a jr z, .got_status ld de, wOTPartyMon1Status @@ -28,7 +28,7 @@ BattleCommand_HealBell: ld hl, BellChimedText call StdBattleTextBox - ld a, [hBattleTurn] + ldh a, [hBattleTurn] and a jp z, CalcPlayerStats jp CalcEnemyStats diff --git a/engine/battle/move_effects/leech_seed.asm b/engine/battle/move_effects/leech_seed.asm index 5602e7f62..7cb14c27c 100644 --- a/engine/battle/move_effects/leech_seed.asm +++ b/engine/battle/move_effects/leech_seed.asm @@ -7,7 +7,7 @@ BattleCommand_LeechSeed: jr nz, .evaded ld de, wEnemyMonType1 - ld a, [hBattleTurn] + ldh a, [hBattleTurn] and a jr z, .ok ld de, wBattleMonType1 diff --git a/engine/battle/move_effects/mimic.asm b/engine/battle/move_effects/mimic.asm index b1c6608fa..30b531572 100644 --- a/engine/battle/move_effects/mimic.asm +++ b/engine/battle/move_effects/mimic.asm @@ -7,7 +7,7 @@ BattleCommand_Mimic: and a jr nz, .fail ld hl, wBattleMonMoves - ld a, [hBattleTurn] + ldh a, [hBattleTurn] and a jr z, .player_turn ld hl, wEnemyMonMoves diff --git a/engine/battle/move_effects/pay_day.asm b/engine/battle/move_effects/pay_day.asm index ba1dce884..9f59dbb08 100644 --- a/engine/battle/move_effects/pay_day.asm +++ b/engine/battle/move_effects/pay_day.asm @@ -5,7 +5,7 @@ BattleCommand_PayDay: ld hl, wStringBuffer1 ld [hli], a - ld a, [hBattleTurn] + ldh a, [hBattleTurn] and a ld a, [wBattleMonLevel] jr z, .ok diff --git a/engine/battle/move_effects/present.asm b/engine/battle/move_effects/present.asm index f0949558f..35713927b 100644 --- a/engine/battle/move_effects/present.asm +++ b/engine/battle/move_effects/present.asm @@ -54,7 +54,7 @@ BattleCommand_Present: call AnimateCurrentMove call BattleCommand_SwitchTurn ld hl, AICheckPlayerMaxHP - ld a, [hBattleTurn] + ldh a, [hBattleTurn] and a jr z, .got_hp_fn_pointer ld hl, AICheckEnemyMaxHP diff --git a/engine/battle/move_effects/protect.asm b/engine/battle/move_effects/protect.asm index 9025d2f4b..1e540923d 100644 --- a/engine/battle/move_effects/protect.asm +++ b/engine/battle/move_effects/protect.asm @@ -14,7 +14,7 @@ BattleCommand_Protect: ProtectChance: ld de, wPlayerProtectCount - ld a, [hBattleTurn] + ldh a, [hBattleTurn] and a jr z, .asm_37637 ld de, wEnemyProtectCount diff --git a/engine/battle/move_effects/psych_up.asm b/engine/battle/move_effects/psych_up.asm index 02fdef5d2..c32316ccd 100644 --- a/engine/battle/move_effects/psych_up.asm +++ b/engine/battle/move_effects/psych_up.asm @@ -3,7 +3,7 @@ BattleCommand_PsychUp: ld hl, wEnemyStatLevels ld de, wPlayerStatLevels - ld a, [hBattleTurn] + ldh a, [hBattleTurn] and a jr z, .pointers_correct ; It's the enemy's turn, so swap the pointers. @@ -35,7 +35,7 @@ BattleCommand_PsychUp: inc de dec b jr nz, .loop2 - ld a, [hBattleTurn] + ldh a, [hBattleTurn] and a jr nz, .calc_enemy_stats call CalcPlayerStats diff --git a/engine/battle/move_effects/pursuit.asm b/engine/battle/move_effects/pursuit.asm index 18c358144..f8979fb9f 100644 --- a/engine/battle/move_effects/pursuit.asm +++ b/engine/battle/move_effects/pursuit.asm @@ -3,7 +3,7 @@ BattleCommand_Pursuit: ; Double damage if the opponent is switching. ld hl, wEnemyIsSwitching - ld a, [hBattleTurn] + ldh a, [hBattleTurn] and a jr z, .ok ld hl, wPlayerIsSwitching diff --git a/engine/battle/move_effects/rapid_spin.asm b/engine/battle/move_effects/rapid_spin.asm index 0dc8b7de2..6e40726db 100644 --- a/engine/battle/move_effects/rapid_spin.asm +++ b/engine/battle/move_effects/rapid_spin.asm @@ -12,7 +12,7 @@ BattleCommand_ClearHazards: ld hl, wPlayerScreens ld de, wPlayerWrapCount - ld a, [hBattleTurn] + ldh a, [hBattleTurn] and a jr z, .got_screens_wrap ld hl, wEnemyScreens diff --git a/engine/battle/move_effects/return.asm b/engine/battle/move_effects/return.asm index d3071d23a..18a2d10f4 100644 --- a/engine/battle/move_effects/return.asm +++ b/engine/battle/move_effects/return.asm @@ -2,24 +2,24 @@ BattleCommand_HappinessPower: ; happinesspower push bc ld hl, wBattleMonHappiness - ld a, [hBattleTurn] + ldh a, [hBattleTurn] and a jr z, .ok ld hl, wEnemyMonHappiness .ok xor a - ld [hMultiplicand + 0], a - ld [hMultiplicand + 1], a + ldh [hMultiplicand + 0], a + ldh [hMultiplicand + 1], a ld a, [hl] - ld [hMultiplicand + 2], a + ldh [hMultiplicand + 2], a ld a, 10 - ld [hMultiplier], a + ldh [hMultiplier], a call Multiply ld a, 25 - ld [hDivisor], a + ldh [hDivisor], a ld b, 4 call Divide - ld a, [hQuotient + 2] + ldh a, [hQuotient + 2] ld d, a pop bc ret diff --git a/engine/battle/move_effects/rollout.asm b/engine/battle/move_effects/rollout.asm index de4bfcaa6..e2f810e6a 100644 --- a/engine/battle/move_effects/rollout.asm +++ b/engine/battle/move_effects/rollout.asm @@ -4,7 +4,7 @@ BattleCommand_CheckCurl: ; checkcurl ld de, wPlayerRolloutCount - ld a, [hBattleTurn] + ldh a, [hBattleTurn] and a jr z, .ok ld de, wEnemyRolloutCount @@ -31,7 +31,7 @@ BattleCommand_RolloutPower: ret nz ld hl, wPlayerRolloutCount - ld a, [hBattleTurn] + ldh a, [hBattleTurn] and a jr z, .got_rollout_count ld hl, wEnemyRolloutCount diff --git a/engine/battle/move_effects/safeguard.asm b/engine/battle/move_effects/safeguard.asm index a926bdccc..cb5a4857e 100644 --- a/engine/battle/move_effects/safeguard.asm +++ b/engine/battle/move_effects/safeguard.asm @@ -3,7 +3,7 @@ BattleCommand_Safeguard: ld hl, wPlayerScreens ld de, wPlayerSafeguardCount - ld a, [hBattleTurn] + ldh a, [hBattleTurn] and a jr z, .ok ld hl, wEnemyScreens diff --git a/engine/battle/move_effects/sketch.asm b/engine/battle/move_effects/sketch.asm index a5b0d1c03..2d9705106 100644 --- a/engine/battle/move_effects/sketch.asm +++ b/engine/battle/move_effects/sketch.asm @@ -27,7 +27,7 @@ BattleCommand_Sketch: ld e, l ; Get the battle move structs. ld hl, wBattleMonMoves - ld a, [hBattleTurn] + ldh a, [hBattleTurn] and a jr z, .get_last_move ld hl, wEnemyMonMoves @@ -74,7 +74,7 @@ BattleCommand_Sketch: ld [hl], a pop bc - ld a, [hBattleTurn] + ldh a, [hBattleTurn] and a jr z, .user_trainer ld a, [wBattleMode] diff --git a/engine/battle/move_effects/sleep_talk.asm b/engine/battle/move_effects/sleep_talk.asm index ae2d252b7..92bff2602 100644 --- a/engine/battle/move_effects/sleep_talk.asm +++ b/engine/battle/move_effects/sleep_talk.asm @@ -5,7 +5,7 @@ BattleCommand_SleepTalk: ld a, [wAttackMissed] and a jr nz, .fail - ld a, [hBattleTurn] + ldh a, [hBattleTurn] and a ld hl, wBattleMonMoves + 1 ld a, [wDisabledMove] @@ -77,7 +77,7 @@ BattleCommand_SleepTalk: ret .check_has_usable_move - ld a, [hBattleTurn] + ldh a, [hBattleTurn] and a ld a, [wDisabledMove] jr z, .got_move_2 diff --git a/engine/battle/move_effects/spikes.asm b/engine/battle/move_effects/spikes.asm index 1eca7ae53..c22787d6d 100644 --- a/engine/battle/move_effects/spikes.asm +++ b/engine/battle/move_effects/spikes.asm @@ -2,7 +2,7 @@ BattleCommand_Spikes: ; spikes ld hl, wEnemyScreens - ld a, [hBattleTurn] + ldh a, [hBattleTurn] and a jr z, .asm_3768e ld hl, wPlayerScreens diff --git a/engine/battle/move_effects/spite.asm b/engine/battle/move_effects/spite.asm index 71252fe22..031cdb71f 100644 --- a/engine/battle/move_effects/spite.asm +++ b/engine/battle/move_effects/spite.asm @@ -6,7 +6,7 @@ BattleCommand_Spite: jp nz, .failed ld bc, PARTYMON_STRUCT_LENGTH ; ???? ld hl, wEnemyMonMoves - ld a, [hBattleTurn] + ldh a, [hBattleTurn] and a jr z, .got_moves ld hl, wBattleMonMoves @@ -63,7 +63,7 @@ BattleCommand_Spite: call GetBattleVar bit SUBSTATUS_TRANSFORMED, a jr nz, .transformed - ld a, [hBattleTurn] + ldh a, [hBattleTurn] and a jr nz, .not_wildmon ld a, [wBattleMode] diff --git a/engine/battle/move_effects/substitute.asm b/engine/battle/move_effects/substitute.asm index 8f14bc315..bafd4c460 100644 --- a/engine/battle/move_effects/substitute.asm +++ b/engine/battle/move_effects/substitute.asm @@ -4,7 +4,7 @@ BattleCommand_Substitute: call BattleCommand_MoveDelay ld hl, wBattleMonMaxHP ld de, wPlayerSubstituteHP - ld a, [hBattleTurn] + ldh a, [hBattleTurn] and a jr z, .got_hp ld hl, wEnemyMonMaxHP @@ -46,7 +46,7 @@ BattleCommand_Substitute: ld hl, wPlayerWrapCount ld de, wPlayerTrappingMove - ld a, [hBattleTurn] + ldh a, [hBattleTurn] and a jr z, .player ld hl, wEnemyWrapCount diff --git a/engine/battle/move_effects/teleport.asm b/engine/battle/move_effects/teleport.asm index 1c67ef112..55eb6675f 100644 --- a/engine/battle/move_effects/teleport.asm +++ b/engine/battle/move_effects/teleport.asm @@ -16,7 +16,7 @@ BattleCommand_Teleport: bit SUBSTATUS_CANT_RUN, a jr nz, .failed ; Only need to check these next things if it's your turn - ld a, [hBattleTurn] + ldh a, [hBattleTurn] and a jr nz, .enemy_turn ; Can't teleport from a trainer battle diff --git a/engine/battle/move_effects/thief.asm b/engine/battle/move_effects/thief.asm index 34a9699fc..47270d6c2 100644 --- a/engine/battle/move_effects/thief.asm +++ b/engine/battle/move_effects/thief.asm @@ -1,7 +1,7 @@ BattleCommand_Thief: ; thief - ld a, [hBattleTurn] + ldh a, [hBattleTurn] and a jr nz, .enemy diff --git a/engine/battle/move_effects/transform.asm b/engine/battle/move_effects/transform.asm index ef8071290..ab94da79c 100644 --- a/engine/battle/move_effects/transform.asm +++ b/engine/battle/move_effects/transform.asm @@ -30,7 +30,7 @@ BattleCommand_Transform: call ResetActorDisable ld hl, wBattleMonSpecies ld de, wEnemyMonSpecies - ld a, [hBattleTurn] + ldh a, [hBattleTurn] and a jr nz, .got_mon_species ld hl, wEnemyMonSpecies @@ -46,7 +46,7 @@ BattleCommand_Transform: inc de ld bc, NUM_MOVES call CopyBytes - ld a, [hBattleTurn] + ldh a, [hBattleTurn] and a jr z, .mimic_enemy_backup ld a, [de] @@ -112,7 +112,7 @@ BattleCommand_Transform: call BattleSideCopy call _CheckBattleScene jr c, .mimic_anims - ld a, [hBattleTurn] + ldh a, [hBattleTurn] and a ld a, [wPlayerMinimized] jr z, .got_byte |