summaryrefslogtreecommitdiff
path: root/engine/battle/ai
diff options
context:
space:
mode:
Diffstat (limited to 'engine/battle/ai')
-rw-r--r--engine/battle/ai/items.asm14
-rw-r--r--engine/battle/ai/scoring.asm18
2 files changed, 16 insertions, 16 deletions
diff --git a/engine/battle/ai/items.asm b/engine/battle/ai/items.asm
index 28dfb1010..b3f40cd34 100644
--- a/engine/battle/ai/items.asm
+++ b/engine/battle/ai/items.asm
@@ -520,7 +520,7 @@ AIUpdateHUD:
call UpdateEnemyMonInParty
farcall UpdateEnemyHUD
ld a, $1
- ld [hBGMapMode], a
+ ldh [hBGMapMode], a
ld hl, wEnemyItemState
dec [hl]
scf
@@ -671,7 +671,7 @@ AI_Switch:
ld hl, wEnemySubStatus4
res SUBSTATUS_RAGE, [hl]
xor a
- ld [hBattleTurn], a
+ ldh [hBattleTurn], a
callfar PursuitSwitch
push af
@@ -755,17 +755,17 @@ EnemyUsedDireHit:
jp PrintText_UsedItemOn_AND_AIUpdateHUD
Function3851e: ; This appears to be unused
- ld [hDivisor], a
+ ldh [hDivisor], a
ld hl, wEnemyMonMaxHP
ld a, [hli]
- ld [hDividend], a
+ ldh [hDividend], a
ld a, [hl]
- ld [hDividend + 1], a
+ ldh [hDividend + 1], a
ld b, 2
call Divide
- ld a, [hQuotient + 2]
+ ldh a, [hQuotient + 2]
ld c, a
- ld a, [hQuotient + 1]
+ ldh a, [hQuotient + 1]
ld b, a
ld hl, wEnemyMonHP + 1
ld a, [hld]
diff --git a/engine/battle/ai/scoring.asm b/engine/battle/ai/scoring.asm
index 752796892..75efcf920 100644
--- a/engine/battle/ai/scoring.asm
+++ b/engine/battle/ai/scoring.asm
@@ -165,7 +165,7 @@ AI_Types:
push bc
push de
ld a, 1
- ld [hBattleTurn], a
+ ldh [hBattleTurn], a
callfar BattleCheckTypeMatchup
pop de
pop bc
@@ -410,7 +410,7 @@ AI_Smart_Sleep:
AI_Smart_LeechHit:
push hl
ld a, 1
- ld [hBattleTurn], a
+ ldh [hBattleTurn], a
callfar BattleCheckTypeMatchup
pop hl
@@ -486,7 +486,7 @@ AI_Smart_LockOn:
jr nc, .asm_3884f
ld a, $1
- ld [hBattleTurn], a
+ ldh [hBattleTurn], a
push hl
push bc
@@ -1289,7 +1289,7 @@ AI_Smart_Mimic:
call AIGetEnemyMove
ld a, $1
- ld [hBattleTurn], a
+ ldh [hBattleTurn], a
callfar BattleCheckTypeMatchup
ld a, [wTypeMatchup]
@@ -1631,7 +1631,7 @@ AI_Smart_PriorityHit:
; Greatly encourage this move if it will KO the player.
ld a, $1
- ld [hBattleTurn], a
+ ldh [hBattleTurn], a
push hl
callfar EnemyAttackDamage
callfar BattleCommand_DamageCalc
@@ -1675,7 +1675,7 @@ AI_Smart_Conversion2:
ld [wPlayerMoveStruct + MOVE_TYPE], a
xor a
- ld [hBattleTurn], a
+ ldh [hBattleTurn], a
callfar BattleCheckTypeMatchup
@@ -2285,7 +2285,7 @@ AI_Smart_RapidSpin:
AI_Smart_HiddenPower:
push hl
ld a, 1
- ld [hBattleTurn], a
+ ldh [hBattleTurn], a
; Calculate Hidden Power's type and base power based on enemy's DVs.
callfar HiddenPowerDamage
@@ -3013,7 +3013,7 @@ INCLUDE "data/battle/ai/reckless_moves.asm"
AIDamageCalc:
ld a, 1
- ld [hBattleTurn], a
+ ldh [hBattleTurn], a
ld a, [wEnemyMoveStruct + MOVE_EFFECT]
ld de, 1
ld hl, ConstantDamageEffects
@@ -3119,7 +3119,7 @@ AI_Status:
push bc
push de
ld a, 1
- ld [hBattleTurn], a
+ ldh [hBattleTurn], a
callfar BattleCheckTypeMatchup
pop de
pop bc