summaryrefslogtreecommitdiff
path: root/engine/battle/core.asm
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2018-07-29 01:40:23 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2018-07-29 01:40:23 -0400
commitc9cb67141bd13db51b8f6cb79f158cbca21660d0 (patch)
tree79c1e49f87af73e355d6bdf1ead6dfba7f24edfb /engine/battle/core.asm
parent84983947011d79f1988388cf08dee55cdc82cc99 (diff)
Make reviewed fixes; standardize on " + "
Diffstat (limited to 'engine/battle/core.asm')
-rw-r--r--engine/battle/core.asm6
1 files changed, 3 insertions, 3 deletions
diff --git a/engine/battle/core.asm b/engine/battle/core.asm
index edb8023c2..2d5e85cef 100644
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@@ -5989,7 +5989,7 @@ LoadEnemyMon:
; Used for Ho-Oh, Lugia and Snorlax encounters
ld a, [wBattleType]
cp BATTLETYPE_FORCEITEM
- ld a, [wBaseItems]
+ ld a, [wBaseItem1]
jr z, .UpdateItem
; Failing that, it's all up to chance
@@ -6007,9 +6007,9 @@ LoadEnemyMon:
; From there, an 8% chance for Item2
call BattleRandom
cp 8 percent ; 8% of 25% = 2% Item2
- ld a, [wBaseItems]
+ ld a, [wBaseItem1]
jr nc, .UpdateItem
- ld a, [wBaseItems+1]
+ ld a, [wBaseItem2]
.UpdateItem:
ld [wEnemyMonItem], a