diff options
| author | YamaArashi <shadow962@live.com> | 2015-08-07 12:39:29 -0700 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2015-08-07 12:39:29 -0700 |
| commit | 40c1ecb4374a83d9511fe2c5fa99704d9cfc521b (patch) | |
| tree | 400c46f2005706ea7243cb243544be9ca2c51206 /engine/battle | |
| parent | f658aff5383fa1e22343efc17e4551c6e7685a39 (diff) | |
fixed names
Diffstat (limited to 'engine/battle')
| -rwxr-xr-x | engine/battle/bank_e_misc.asm | 4 | ||||
| -rw-r--r-- | engine/battle/trainer_ai.asm | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/engine/battle/bank_e_misc.asm b/engine/battle/bank_e_misc.asm index f47087d8..dc766f23 100755 --- a/engine/battle/bank_e_misc.asm +++ b/engine/battle/bank_e_misc.asm @@ -92,9 +92,9 @@ InitList: ; 39bd5 (e:5bd5) ld a, h ld [wListPointer + 1], a ld a, e - ld [wcf8d], a + ld [wUnusedCF8D], a ld a, d - ld [wcf8e], a + ld [wUnusedCF8D + 1], a ld bc, ItemPrices ld a, c ld [wItemPrices], a diff --git a/engine/battle/trainer_ai.asm b/engine/battle/trainer_ai.asm index 9102b2d8..4fad50bb 100644 --- a/engine/battle/trainer_ai.asm +++ b/engine/battle/trainer_ai.asm @@ -191,7 +191,7 @@ AIMoveChoiceModification2: ; 397e7 (e:57e7) AIMoveChoiceModification3: ; 39817 (e:5817) ld hl, wBuffer - 1 ; temp move selection array (-1 byte offset) ld de, wEnemyMonMoves ; enemy moves - ld b, $5 + ld b, NUM_MOVES + 1 .nextMove dec b ret z ; processed all 4 moves @@ -208,7 +208,7 @@ AIMoveChoiceModification3: ; 39817 (e:5817) pop de pop bc pop hl - ld a, [wd11e] + ld a, [wTypeEffectiveness] cp $10 jr z, .nextMove jr c, .notEffectiveMove |