summaryrefslogtreecommitdiff
path: root/engine/battle
diff options
context:
space:
mode:
Diffstat (limited to 'engine/battle')
-rw-r--r--engine/battle/ai/items.asm4
-rw-r--r--engine/battle/core.asm60
-rw-r--r--engine/battle/effect_commands.asm52
-rw-r--r--engine/battle/link_result.asm4
-rw-r--r--engine/battle/misc.asm6
-rw-r--r--engine/battle/move_effects/frustration.asm2
-rw-r--r--engine/battle/move_effects/return.asm2
-rw-r--r--engine/battle/read_trainer_party.asm8
8 files changed, 69 insertions, 69 deletions
diff --git a/engine/battle/ai/items.asm b/engine/battle/ai/items.asm
index b3f40cd34..cccea4e00 100644
--- a/engine/battle/ai/items.asm
+++ b/engine/battle/ai/items.asm
@@ -763,9 +763,9 @@ Function3851e: ; This appears to be unused
ldh [hDividend + 1], a
ld b, 2
call Divide
- ldh a, [hQuotient + 2]
+ ldh a, [hQuotient + 3]
ld c, a
- ldh a, [hQuotient + 1]
+ ldh a, [hQuotient + 2]
ld b, a
ld hl, wEnemyMonHP + 1
ld a, [hld]
diff --git a/engine/battle/core.asm b/engine/battle/core.asm
index 32de2d307..d5a7d7073 100644
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@@ -3715,23 +3715,23 @@ TryToRunAwayFromBattle:
inc a
ld [wNumFleeAttempts], a
ld a, [hli]
- ldh [hPartyMon1Speed + 0], a
+ ldh [hMultiplicand + 1], a
ld a, [hl]
- ldh [hPartyMon1Speed + 1], a
+ ldh [hMultiplicand + 2], a
ld a, [de]
inc de
ldh [hEnemyMonSpeed + 0], a
ld a, [de]
ldh [hEnemyMonSpeed + 1], a
call Call_LoadTempTileMapToTileMap
- ld de, hPartyMon1Speed
+ ld de, hMultiplicand + 1
ld hl, hEnemyMonSpeed
ld c, 2
call CompareBytes
jr nc, .can_escape
xor a
- ldh [hMultiplicand], a
+ ldh [hMultiplicand + 0], a
ld a, 32
ldh [hMultiplier], a
call Multiply
@@ -3751,7 +3751,7 @@ TryToRunAwayFromBattle:
ldh [hDivisor], a
ld b, 2
call Divide
- ldh a, [hQuotient + 1]
+ ldh a, [hQuotient + 2]
and a
jr nz, .can_escape
ld a, [wNumFleeAttempts]
@@ -3760,16 +3760,16 @@ TryToRunAwayFromBattle:
dec c
jr z, .cant_escape_2
ld b, 30
- ldh a, [hQuotient + 2]
+ ldh a, [hQuotient + 3]
add b
- ldh [hQuotient + 2], a
+ ldh [hQuotient + 3], a
jr c, .can_escape
jr .loop
.cant_escape_2
call BattleRandom
ld b, a
- ldh a, [hQuotient + 2]
+ ldh a, [hQuotient + 3]
cp b
jr nc, .can_escape
ld a, BATTLEPLAYERACTION_USEITEM
@@ -4787,7 +4787,7 @@ DrawEnemyHUD:
.not_fainted
xor a
- ldh [hMultiplicand], a
+ ldh [hMultiplicand + 0], a
ld a, HP_BAR_LENGTH_PX
ldh [hMultiplier], a
call Multiply
@@ -4824,7 +4824,7 @@ DrawEnemyHUD:
ld a, 2
ld b, a
call Divide
- ldh a, [hQuotient + 2]
+ ldh a, [hQuotient + 3]
ld e, a
ld a, HP_BAR_LENGTH
ld d, a
@@ -6723,22 +6723,22 @@ ApplyStatLevelMultiplier:
pop hl
; Cap at 999.
- ldh a, [hQuotient + 2]
+ ldh a, [hQuotient + 3]
sub LOW(MAX_STAT_VALUE)
- ldh a, [hQuotient + 1]
+ ldh a, [hQuotient + 2]
sbc HIGH(MAX_STAT_VALUE)
jp c, .okay3
ld a, HIGH(MAX_STAT_VALUE)
- ldh [hQuotient + 1], a
- ld a, LOW(MAX_STAT_VALUE)
ldh [hQuotient + 2], a
+ ld a, LOW(MAX_STAT_VALUE)
+ ldh [hQuotient + 3], a
.okay3
- ldh a, [hQuotient + 1]
+ ldh a, [hQuotient + 2]
ld [hli], a
ld b, a
- ldh a, [hQuotient + 2]
+ ldh a, [hQuotient + 3]
ld [hl], a
or b
jr nz, .okay4
@@ -7095,9 +7095,9 @@ GiveExperiencePoints:
ld a, [hl]
cp LUCKY_EGG
call z, BoostExp
- ldh a, [hQuotient + 2]
+ ldh a, [hQuotient + 3]
ld [wStringBuffer2 + 1], a
- ldh a, [hQuotient + 1]
+ ldh a, [hQuotient + 2]
ld [wStringBuffer2], a
ld a, [wCurPartyMon]
ld hl, wPartyMonNicknames
@@ -7105,9 +7105,9 @@ GiveExperiencePoints:
ld hl, Text_MonGainedExpPoint
call BattleTextBox
ld a, [wStringBuffer2 + 1]
- ldh [hQuotient + 2], a
+ ldh [hQuotient + 3], a
ld a, [wStringBuffer2]
- ldh [hQuotient + 1], a
+ ldh [hQuotient + 2], a
pop bc
call AnimateExpBar
push bc
@@ -7116,11 +7116,11 @@ GiveExperiencePoints:
ld hl, MON_EXP + 2
add hl, bc
ld d, [hl]
- ldh a, [hQuotient + 2]
+ ldh a, [hQuotient + 3]
add d
ld [hld], a
ld d, [hl]
- ldh a, [hQuotient + 1]
+ ldh a, [hQuotient + 2]
adc d
ld [hl], a
jr nc, .skip2
@@ -7148,11 +7148,11 @@ GiveExperiencePoints:
ld hl, MON_EXP + 2
add hl, bc
push bc
- ldh a, [hQuotient]
- ld b, a
ldh a, [hQuotient + 1]
- ld c, a
+ ld b, a
ldh a, [hQuotient + 2]
+ ld c, a
+ ldh a, [hQuotient + 3]
ld d, a
ld a, [hld]
sub d
@@ -7371,7 +7371,7 @@ GiveExperiencePoints:
ldh [hDivisor], a
ld b, 2
call Divide
- ldh a, [hQuotient + 2]
+ ldh a, [hQuotient + 3]
ld [hli], a
dec c
jr nz, .count_loop2
@@ -7646,7 +7646,7 @@ SendOutMonText:
ldh [hDivisor], a
call Divide
- ldh a, [hQuotient + 2]
+ ldh a, [hQuotient + 3]
ld hl, JumpText_GoMon
cp 70
jr nc, .skip_to_textbox
@@ -7728,7 +7728,7 @@ WithdrawMonText:
call Divide
pop bc
pop de
- ldh a, [hQuotient + 2]
+ ldh a, [hQuotient + 3]
ld hl, TextJump_ThatsEnoughComeBack
and a
ret z
@@ -7869,7 +7869,7 @@ CalcExpBar:
xor a
ld [hl], a
; multiply by 64
- ld a, $40
+ ld a, 64
ldh [hMultiplier], a
call Multiply
pop af
@@ -7897,7 +7897,7 @@ CalcExpBar:
ldh [hDivisor], a
ld b, 4
call Divide
- ldh a, [hQuotient + 2]
+ ldh a, [hQuotient + 3]
ld b, a
ld a, $40
sub b
diff --git a/engine/battle/effect_commands.asm b/engine/battle/effect_commands.asm
index 8ad52ef3c..366898c8c 100644
--- a/engine/battle/effect_commands.asm
+++ b/engine/battle/effect_commands.asm
@@ -1368,9 +1368,9 @@ BattleCommand_Stab:
ldh [hDivisor], a
ld b, 4
call Divide
- ldh a, [hQuotient + 1]
- ld b, a
ldh a, [hQuotient + 2]
+ ld b, a
+ ldh a, [hQuotient + 3]
or b
jr nz, .ok
@@ -1469,7 +1469,7 @@ CheckTypeMatchup:
ld b, 4
call Divide
pop bc
- ldh a, [hQuotient + 2]
+ ldh a, [hQuotient + 3]
ld [wTypeMatchup], a
jr .TypesLoop
@@ -1547,10 +1547,10 @@ BattleCommand_DamageVariation:
call Divide
; ...to get .85-1.00x damage.
- ldh a, [hQuotient + 1]
+ ldh a, [hQuotient + 2]
ld hl, wCurDamage
ld [hli], a
- ldh a, [hQuotient + 2]
+ ldh a, [hQuotient + 3]
ld [hl], a
ret
@@ -1832,14 +1832,14 @@ BattleCommand_CheckHit:
ld b, 4
call Divide
; minimum accuracy is $0001
- ldh a, [hQuotient + 2]
+ ldh a, [hQuotient + 3]
ld b, a
- ldh a, [hQuotient + 1]
+ ldh a, [hQuotient + 2]
or b
jr nz, .min_accuracy
- ldh [hQuotient + 1], a
- ld a, 1
ldh [hQuotient + 2], a
+ ld a, 1
+ ldh [hQuotient + 3], a
.min_accuracy
; do the same thing to the target's evasion
@@ -1848,9 +1848,9 @@ BattleCommand_CheckHit:
jr nz, .accuracy_loop
; if the result is more than 2 bytes, max out at 100%
- ldh a, [hQuotient + 1]
- and a
ldh a, [hQuotient + 2]
+ and a
+ ldh a, [hQuotient + 3]
jr z, .finish_accuracy
ld a, $ff
@@ -2984,7 +2984,7 @@ BattleCommand_DamageCalc:
ld a, e
add a
jr nc, .level_not_overflowing
- ld [hl], $1
+ ld [hl], 1
.level_not_overflowing
inc hl
ld [hli], a
@@ -2993,7 +2993,7 @@ BattleCommand_DamageCalc:
ld a, 5
ld [hld], a
push bc
- ld b, $4
+ ld b, 4
call Divide
pop bc
@@ -3012,7 +3012,7 @@ BattleCommand_DamageCalc:
; / Defense
ld [hl], c
- ld b, $4
+ ld b, 4
call Divide
; / 50
@@ -3146,11 +3146,11 @@ BattleCommand_DamageCalc:
ret z
; x2
- ldh a, [hQuotient + 2]
+ ldh a, [hQuotient + 3]
add a
ldh [hProduct + 3], a
- ldh a, [hQuotient + 1]
+ ldh a, [hQuotient + 2]
rl a
ldh [hProduct + 2], a
@@ -3257,7 +3257,7 @@ BattleCommand_ConstantDamage:
ldh [hMultiplicand + 1], a
ld a, [hli]
ldh [hMultiplicand + 2], a
- ld a, $30
+ ld a, 48
ldh [hMultiplier], a
call Multiply
ld a, [hli]
@@ -3288,7 +3288,7 @@ BattleCommand_ConstantDamage:
.skip_to_divide
ld b, 4
call Divide
- ldh a, [hQuotient + 2]
+ ldh a, [hQuotient + 3]
ld b, a
ld hl, FlailReversalPower
@@ -4918,34 +4918,34 @@ CalcStats:
ld b, 4
call Divide
- ldh a, [hQuotient + 1]
- ld b, a
ldh a, [hQuotient + 2]
+ ld b, a
+ ldh a, [hQuotient + 3]
or b
jr nz, .check_maxed_out
ld a, 1
- ldh [hQuotient + 2], a
+ ldh [hQuotient + 3], a
jr .not_maxed_out
.check_maxed_out
- ldh a, [hQuotient + 2]
+ ldh a, [hQuotient + 3]
cp LOW(MAX_STAT_VALUE)
ld a, b
sbc HIGH(MAX_STAT_VALUE)
jr c, .not_maxed_out
ld a, LOW(MAX_STAT_VALUE)
- ldh [hQuotient + 2], a
+ ldh [hQuotient + 3], a
ld a, HIGH(MAX_STAT_VALUE)
- ldh [hQuotient + 1], a
+ ldh [hQuotient + 2], a
.not_maxed_out
pop bc
- ldh a, [hQuotient + 1]
+ ldh a, [hQuotient + 2]
ld [bc], a
inc bc
- ldh a, [hQuotient + 2]
+ ldh a, [hQuotient + 3]
ld [bc], a
inc bc
pop hl
diff --git a/engine/battle/link_result.asm b/engine/battle/link_result.asm
index 07426d523..b0244aad9 100644
--- a/engine/battle/link_result.asm
+++ b/engine/battle/link_result.asm
@@ -100,10 +100,10 @@ DetermineLinkBattleResult:
ldh [hDivisor], a
ld b, $4
call Divide
- ldh a, [hQuotient + 2]
+ ldh a, [hQuotient + 3]
add e
ld e, a
- ldh a, [hQuotient + 1]
+ ldh a, [hQuotient + 2]
adc d
ld d, a
dec hl
diff --git a/engine/battle/misc.asm b/engine/battle/misc.asm
index 5a7b44cb1..6bfc4eb24 100644
--- a/engine/battle/misc.asm
+++ b/engine/battle/misc.asm
@@ -119,14 +119,14 @@ DoWeatherModifiers:
ld b, 4
call Divide
- ldh a, [hQuotient + 0]
+ ldh a, [hQuotient + 1]
and a
ld bc, -1
jr nz, .Update
- ldh a, [hQuotient + 1]
- ld b, a
ldh a, [hQuotient + 2]
+ ld b, a
+ ldh a, [hQuotient + 3]
ld c, a
or b
jr nz, .Update
diff --git a/engine/battle/move_effects/frustration.asm b/engine/battle/move_effects/frustration.asm
index e9986bdf3..b07942c76 100644
--- a/engine/battle/move_effects/frustration.asm
+++ b/engine/battle/move_effects/frustration.asm
@@ -21,7 +21,7 @@ BattleCommand_FrustrationPower:
ldh [hDivisor], a
ld b, 4
call Divide
- ldh a, [hQuotient + 2]
+ ldh a, [hQuotient + 3]
ld d, a
pop bc
ret
diff --git a/engine/battle/move_effects/return.asm b/engine/battle/move_effects/return.asm
index 18a2d10f4..7c7c5fcb2 100644
--- a/engine/battle/move_effects/return.asm
+++ b/engine/battle/move_effects/return.asm
@@ -19,7 +19,7 @@ BattleCommand_HappinessPower:
ldh [hDivisor], a
ld b, 4
call Divide
- ldh a, [hQuotient + 2]
+ ldh a, [hQuotient + 3]
ld d, a
pop bc
ret
diff --git a/engine/battle/read_trainer_party.asm b/engine/battle/read_trainer_party.asm
index bf32a1e21..9a7545a2c 100644
--- a/engine/battle/read_trainer_party.asm
+++ b/engine/battle/read_trainer_party.asm
@@ -305,12 +305,12 @@ ComputeTrainerReward:
ld hl, hProduct
xor a
ld [hli], a
- ld [hli], a
- ld [hli], a
+ ld [hli], a ; hMultiplicand + 0
+ ld [hli], a ; hMultiplicand + 1
ld a, [wEnemyTrainerBaseReward]
- ld [hli], a
+ ld [hli], a ; hMultiplicand + 2
ld a, [wCurPartyLevel]
- ld [hl], a
+ ld [hl], a ; hMultiplier
call Multiply
ld hl, wBattleReward
xor a
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-15 22:14:09 +0000