summaryrefslogtreecommitdiff
path: root/engine/battle
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2021-04-27 15:49:59 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2021-04-27 15:49:59 -0400
commit6a31663c960a5c1da9dbbf12d49e0252860b96d0 (patch)
tree74c333d90fda4297a40748ddf0dd11771feb0832 /engine/battle
parentbcc4380d40767983a0b253d486bb3c82f0f1fd07 (diff)
Use {interpolation} to generate sequences of RAM labels
Fixes #319
Diffstat (limited to 'engine/battle')
-rw-r--r--engine/battle/misc.asm2
-rw-r--r--engine/battle/read_trainer_party.asm2
2 files changed, 2 insertions, 2 deletions
diff --git a/engine/battle/misc.asm b/engine/battle/misc.asm
index 33af6f6f..524ec161 100644
--- a/engine/battle/misc.asm
+++ b/engine/battle/misc.asm
@@ -113,7 +113,7 @@ GetMonSpecies:
ld hl, wBoxSpecies
jr .getSpecies
.enemyParty
- ld hl, wEnemyPartyMons
+ ld hl, wEnemyPartySpecies
.getSpecies
ld d, 0
add hl, de
diff --git a/engine/battle/read_trainer_party.asm b/engine/battle/read_trainer_party.asm
index a0132a4f..a9e09a30 100644
--- a/engine/battle/read_trainer_party.asm
+++ b/engine/battle/read_trainer_party.asm
@@ -5,7 +5,7 @@ ReadTrainer:
and a
ret nz
-; set [wEnemyPartyCount] to 0, [wEnemyPartyMons] to FF
+; set [wEnemyPartyCount] to 0, [wEnemyPartySpecies] to FF
; XXX first is total enemy pokemon?
; XXX second is species of first pokemon?
ld hl, wEnemyPartyCount