summaryrefslogtreecommitdiff
path: root/engine/events
diff options
context:
space:
mode:
authorRangi <35663410+Rangi42@users.noreply.github.com>2021-04-27 12:11:39 -0400
committerGitHub <noreply@github.com>2021-04-27 12:11:39 -0400
commitefd1006917b438ff683e8f702adbe6b4d0733a0f (patch)
treef16f9860af61e855d90db4c9641af84034be4644 /engine/events
parentc5f9e25cc493ecc0e49ffd437dad73893b5529d0 (diff)
Use {interpolation} to generate sequences of RAM labels
This makes the table_width/assert_table_length usages unnecessary, and also keeps the labels automatically up to date if the length constants change.
Diffstat (limited to 'engine/events')
-rw-r--r--engine/events/battle_tower/battle_tower.asm6
1 files changed, 3 insertions, 3 deletions
diff --git a/engine/events/battle_tower/battle_tower.asm b/engine/events/battle_tower/battle_tower.asm
index 55e65a126..785e43238 100644
--- a/engine/events/battle_tower/battle_tower.asm
+++ b/engine/events/battle_tower/battle_tower.asm
@@ -309,9 +309,9 @@ ReadBTTrainerParty:
.skip_mon_3
; Add the terminator character to each of these names
ld a, "@"
- ld [wBT_OTTempMon1NameEnd - 1], a
- ld [wBT_OTTempMon2NameEnd - 1], a
- ld [wBT_OTTempMon3NameEnd - 1], a
+ ld [wBT_OTTempMon1Name + MON_NAME_LENGTH - 1], a
+ ld [wBT_OTTempMon2Name + MON_NAME_LENGTH - 1], a
+ ld [wBT_OTTempMon3Name + MON_NAME_LENGTH - 1], a
; Fix errors in the movesets
call CheckBTMonMovesForErrors
; Repair the trainer name if needed, then copy it to wOTPlayerName