diff options
Diffstat (limited to 'engine')
| -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 | ||||
| -rw-r--r-- | engine/events/heal_party.asm | 2 | ||||
| -rw-r--r-- | engine/items/item_effects.asm | 11 | ||||
| -rw-r--r-- | engine/pokemon/add_mon.asm | 2 | ||||
| -rw-r--r-- | engine/pokemon/evos_moves.asm | 4 | ||||
| -rw-r--r-- | engine/pokemon/learn_move.asm | 2 |
8 files changed, 16 insertions, 21 deletions
diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 433c62df..d9bcdddb 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -1633,7 +1633,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 @@ -1677,7 +1677,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 @@ -5101,7 +5101,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 @@ -5133,7 +5133,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 @@ -6077,7 +6077,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 d9690f27..067c096e 100644 --- a/engine/battle/effects.asm +++ b/engine/battle/effects.asm @@ -740,7 +740,7 @@ FellText: text_end PrintStatText: - ld hl, StatsTextStrings + ld hl, StatModTextStrings ld c, "@" .findStatName_outer dec b @@ -755,7 +755,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 d70f98a1..0117a057 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 diff --git a/engine/events/heal_party.asm b/engine/events/heal_party.asm index 7aaa1bd1..b26bc90f 100644 --- a/engine/events/heal_party.asm +++ b/engine/events/heal_party.asm @@ -35,7 +35,7 @@ HealParty: push bc ld hl, Moves - ld bc, MoveEnd - Moves + ld bc, MOVE_LENGTH call AddNTimes ld de, wcd6d ld a, BANK(Moves) diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm index 804a316d..0448866e 100644 --- a/engine/items/item_effects.asm +++ b/engine/items/item_effects.asm @@ -1292,7 +1292,7 @@ ItemUseMedicine: ld [hl], a pop hl call .recalculateStats - ld hl, VitaminText + ld hl, VitaminStats ld a, [wcf91] sub HP_UP - 1 ld c, a @@ -1425,12 +1425,7 @@ VitaminNoEffectText: text_far _VitaminNoEffectText text_end -VitaminText: - db "HEALTH@" - db "ATTACK@" - db "DEFENSE@" - db "SPEED@" - db "SPECIAL@" +INCLUDE "data/battle/stat_names.asm" ItemUseBait: ld hl, ThrewBaitText @@ -2490,7 +2485,7 @@ GetMaxPP: dec a push hl ld hl, Moves - ld bc, MoveEnd - Moves + ld bc, MOVE_LENGTH call AddNTimes ld de, wcd6d ld a, BANK(Moves) diff --git a/engine/pokemon/add_mon.asm b/engine/pokemon/add_mon.asm index c49a0a77..46a8b2b9 100644 --- a/engine/pokemon/add_mon.asm +++ b/engine/pokemon/add_mon.asm @@ -259,7 +259,7 @@ AddPartyMon_WriteMovePP: push de push bc ld hl, Moves - ld bc, MoveEnd - Moves + ld bc, MOVE_LENGTH call AddNTimes ld de, wcd6d ld a, BANK(Moves) diff --git a/engine/pokemon/evos_moves.asm b/engine/pokemon/evos_moves.asm index 21b1c9f4..7d5fd469 100644 --- a/engine/pokemon/evos_moves.asm +++ b/engine/pokemon/evos_moves.asm @@ -161,7 +161,7 @@ Evolution_PartyMonLoop: ; loop over party mons ld a, [wd11e] dec a ld hl, BaseStats - ld bc, MonBaseStatsEnd - MonBaseStats + ld bc, BASE_DATA_SIZE call AddNTimes ld de, wMonHeader call CopyData @@ -479,7 +479,7 @@ WriteMonMoves: push hl dec a ld hl, Moves - ld bc, MoveEnd - Moves + ld bc, MOVE_LENGTH call AddNTimes ld de, wBuffer ld a, BANK(Moves) diff --git a/engine/pokemon/learn_move.asm b/engine/pokemon/learn_move.asm index 4deb3f0b..fd92ec57 100644 --- a/engine/pokemon/learn_move.asm +++ b/engine/pokemon/learn_move.asm @@ -44,7 +44,7 @@ DontAbandonLearning: push de dec a ld hl, Moves - ld bc, MoveEnd - Moves + ld bc, MOVE_LENGTH call AddNTimes ld de, wBuffer ld a, BANK(Moves) |