diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2021-04-27 12:11:39 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-27 12:11:39 -0400 |
| commit | efd1006917b438ff683e8f702adbe6b4d0733a0f (patch) | |
| tree | f16f9860af61e855d90db4c9641af84034be4644 /engine | |
| parent | c5f9e25cc493ecc0e49ffd437dad73893b5529d0 (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')
| -rw-r--r-- | engine/battle/core.asm | 2 | ||||
| -rw-r--r-- | engine/battle_anims/bg_effects.asm | 2 | ||||
| -rw-r--r-- | engine/events/battle_tower/battle_tower.asm | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/engine/battle/core.asm b/engine/battle/core.asm index d176c60c4..8e6283738 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -6392,7 +6392,7 @@ LoadEnemyMon: and a ret z -; Update enemy nick +; Update enemy nickname ld hl, wStringBuffer1 ld de, wEnemyMonNickname ld bc, MON_NAME_LENGTH diff --git a/engine/battle_anims/bg_effects.asm b/engine/battle_anims/bg_effects.asm index d86757b95..e334a7982 100644 --- a/engine/battle_anims/bg_effects.asm +++ b/engine/battle_anims/bg_effects.asm @@ -2294,7 +2294,7 @@ BattleBGEffect_Rollout: ldh [hSCY], a xor $ff inc a - ld [wAnimObject01YOffset], a + ld [wAnimObject1YOffset], a ret BattleBGEffect_ShakeScreenX: 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 |