summaryrefslogtreecommitdiff
path: root/engine/battle/misc.asm
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2018-07-28 19:27:34 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2018-07-29 00:25:52 -0400
commit9dec80b07e3638c722b9768a1ca0184edea20392 (patch)
treefdd5e227f20540b838ec45d282e40b083ae56c72 /engine/battle/misc.asm
parent2ec900d96c3b6020be0816151b9ad606c04114b5 (diff)
Add meaningful aliases for wd265
Introduce MONICON_* constants Introduce BATTLEPLAYERACTION_* constants
Diffstat (limited to 'engine/battle/misc.asm')
-rw-r--r--engine/battle/misc.asm10
1 files changed, 5 insertions, 5 deletions
diff --git a/engine/battle/misc.asm b/engine/battle/misc.asm
index 48062f643..8985385a0 100644
--- a/engine/battle/misc.asm
+++ b/engine/battle/misc.asm
@@ -53,13 +53,13 @@ DoWeatherModifiers:
ld de, WeatherTypeModifiers
ld a, [wBattleWeather]
ld b, a
- ld a, [wd265] ; move type
+ ld a, [wCurType]
ld c, a
.CheckWeatherType:
ld a, [de]
inc de
- cp $ff
+ cp -1
jr z, .done_weather_types
cp b
@@ -84,7 +84,7 @@ DoWeatherModifiers:
.CheckWeatherMove:
ld a, [de]
inc de
- cp $ff
+ cp -1
jr z, .done
cp b
@@ -116,7 +116,7 @@ DoWeatherModifiers:
ld a, 10
ld [hDivisor], a
- ld b, $4
+ ld b, 4
call Divide
ld a, [hQuotient + 0]
@@ -176,7 +176,7 @@ DoBadgeTypeBoosts:
rr c
jr nc, .NextBadge
- ld a, [wd265] ; move type
+ ld a, [wCurType]
cp [hl]
jr z, .ApplyBoost