diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-12-23 16:29:30 -0500 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-12-23 16:29:30 -0500 |
| commit | 99e66c25577e367d6c7ca75fea8b466b54c3317a (patch) | |
| tree | 56183dddfd540a395086a7540060c374f9541723 /engine/events/battle_tower | |
| parent | 1a054661ecac2d6075961e486213b6880c0afc4e (diff) | |
Rename some labels
- Remove "Buffer" suffix from some byte and word quantities
- Change "Ptr" to "Pointer"
Fixes #789
Diffstat (limited to 'engine/events/battle_tower')
| -rw-r--r-- | engine/events/battle_tower/battle_tower.asm | 8 | ||||
| -rw-r--r-- | engine/events/battle_tower/load_trainer.asm | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/engine/events/battle_tower/battle_tower.asm b/engine/events/battle_tower/battle_tower.asm index 50daff895..8eabc71ca 100644 --- a/engine/events/battle_tower/battle_tower.asm +++ b/engine/events/battle_tower/battle_tower.asm @@ -269,7 +269,7 @@ ReadBTTrainerParty: jr nc, .skip_mon_1 ld a, [wBT_OTTempMon1] - ld [wNamedObjectIndexBuffer], a + ld [wNamedObjectIndex], a call GetPokemonName ld l, e ld h, d @@ -283,7 +283,7 @@ ReadBTTrainerParty: farcall CheckStringForErrors jr nc, .skip_mon_2 ld a, [wBT_OTTempMon2] - ld [wNamedObjectIndexBuffer], a + ld [wNamedObjectIndex], a call GetPokemonName ld l, e ld h, d @@ -297,7 +297,7 @@ ReadBTTrainerParty: farcall CheckStringForErrors jr nc, .skip_mon_3 ld a, [wBT_OTTempMon3] - ld [wNamedObjectIndexBuffer], a + ld [wNamedObjectIndex], a call GetPokemonName ld l, e ld h, d @@ -1289,7 +1289,7 @@ endr ld a, EGG_TICKET ld [wCurItem], a ld a, 1 - ld [wItemQuantityChangeBuffer], a + ld [wItemQuantityChange], a ld a, -1 ld [wCurItemQuantity], a ld hl, wNumItems diff --git a/engine/events/battle_tower/load_trainer.asm b/engine/events/battle_tower/load_trainer.asm index 0368a1268..bcf0583f9 100644 --- a/engine/events/battle_tower/load_trainer.asm +++ b/engine/events/battle_tower/load_trainer.asm @@ -168,13 +168,13 @@ LoadRandomBattleTowerMon: ld bc, NICKNAMED_MON_STRUCT_LENGTH call CopyBytes - ld a, [wNamedObjectIndexBuffer] + ld a, [wNamedObjectIndex] push af push de ld hl, -NICKNAMED_MON_STRUCT_LENGTH add hl, de ld a, [hl] - ld [wNamedObjectIndexBuffer], a + ld [wNamedObjectIndex], a ld bc, PARTYMON_STRUCT_LENGTH add hl, bc push hl @@ -187,7 +187,7 @@ LoadRandomBattleTowerMon: pop de pop af - ld [wNamedObjectIndexBuffer], a + ld [wNamedObjectIndex], a pop bc dec c jp nz, .loop |