diff options
| author | dannye <33dannye@gmail.com> | 2021-03-25 17:39:44 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2021-03-25 17:39:44 -0500 |
| commit | eb47bda8ee5c1f002236200df36012de9e243a97 (patch) | |
| tree | fc69fc5435582efebd36fc54414673dd8ac7f646 /engine/battle | |
| parent | Merge remote-tracking branch 'remotes/pokered/master' (diff) | |
| parent | Verify data table and name list sizes with assertion macros (diff) | |
| download | pokeyellow-eb47bda8ee5c1f002236200df36012de9e243a97.tar.gz pokeyellow-eb47bda8ee5c1f002236200df36012de9e243a97.tar.xz pokeyellow-eb47bda8ee5c1f002236200df36012de9e243a97.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'engine/battle')
| -rw-r--r-- | engine/battle/core.asm | 10 | ||||
| -rw-r--r-- | engine/battle/effects.asm | 4 | ||||
| -rw-r--r-- | engine/battle/trainer_ai.asm | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 79defa33..45dfdc6f 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -1674,7 +1674,7 @@ LoadBattleMonFromParty: ld bc, wPartyMon1DVs - wPartyMon1OTID add hl, bc ld de, wBattleMonDVs - ld bc, NUM_DVS + ld bc, wPartyMon1PP - wPartyMon1DVs call CopyData ld de, wBattleMonPP ld bc, NUM_MOVES @@ -1718,7 +1718,7 @@ LoadEnemyMonFromParty: ld bc, wEnemyMon1DVs - wEnemyMon1OTID add hl, bc ld de, wEnemyMonDVs - ld bc, NUM_DVS + ld bc, wEnemyMon1PP - wEnemyMon1DVs call CopyData ld de, wEnemyMonPP ld bc, NUM_MOVES @@ -5270,7 +5270,7 @@ ReloadMoveData: ld [wd11e], a dec a ld hl, Moves - ld bc, MoveEnd - Moves + ld bc, MOVE_LENGTH call AddNTimes ld a, BANK(Moves) call FarCopyData ; copy the move's stats @@ -5302,7 +5302,7 @@ MetronomePickMove: call BattleRandom and a jr z, .pickMoveLoop - cp NUM_ATTACKS + 1 ; max normal move number + 1 (this is Struggle's move number) + cp NUM_ATTACKS ; max move number (including Struggle) jr nc, .pickMoveLoop cp METRONOME jr z, .pickMoveLoop @@ -6257,7 +6257,7 @@ GetCurrentMove: ld [wd0b5], a dec a ld hl, Moves - ld bc, MoveEnd - Moves + ld bc, MOVE_LENGTH call AddNTimes ld a, BANK(Moves) call FarCopyData diff --git a/engine/battle/effects.asm b/engine/battle/effects.asm index 3762caea..6f860cd2 100644 --- a/engine/battle/effects.asm +++ b/engine/battle/effects.asm @@ -776,7 +776,7 @@ FellText: text_end PrintStatText: - ld hl, StatsTextStrings + ld hl, StatModTextStrings ld c, "@" .findStatName_outer dec b @@ -791,7 +791,7 @@ PrintStatText: ld bc, $a jp CopyData -INCLUDE "data/battle/stat_names.asm" +INCLUDE "data/battle/stat_mod_names.asm" INCLUDE "data/battle/stat_modifiers.asm" diff --git a/engine/battle/trainer_ai.asm b/engine/battle/trainer_ai.asm index a2c5e5fb..3efbeeda 100644 --- a/engine/battle/trainer_ai.asm +++ b/engine/battle/trainer_ai.asm @@ -264,7 +264,7 @@ ReadMove: push bc dec a ld hl, Moves - ld bc, MoveEnd - Moves + ld bc, MOVE_LENGTH call AddNTimes ld de, wEnemyMoveNum call CopyData |