diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2021-04-27 15:49:59 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2021-04-27 15:49:59 -0400 |
| commit | 6a31663c960a5c1da9dbbf12d49e0252860b96d0 (patch) | |
| tree | 74c333d90fda4297a40748ddf0dd11771feb0832 /engine/items/item_effects.asm | |
| parent | bcc4380d40767983a0b253d486bb3c82f0f1fd07 (diff) | |
Use {interpolation} to generate sequences of RAM labels
Fixes #319
Diffstat (limited to 'engine/items/item_effects.asm')
| -rw-r--r-- | engine/items/item_effects.asm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm index 0448866e..38ea37c0 100644 --- a/engine/items/item_effects.asm +++ b/engine/items/item_effects.asm @@ -120,7 +120,7 @@ ItemUseBall: ld a, [wPartyCount] ; is party full? cp PARTY_LENGTH jr nz, .canUseBall - ld a, [wNumInBox] ; is box full? + ld a, [wBoxCount] ; is box full? cp MONS_PER_BOX jp z, BoxFullCannotThrowBall @@ -2638,7 +2638,7 @@ IsKeyItem_:: INCLUDE "data/items/key_items.asm" SendNewMonToBox: - ld de, wNumInBox + ld de, wBoxCount ld a, [de] inc a ld [de], a @@ -2657,7 +2657,7 @@ SendNewMonToBox: call GetMonHeader ld hl, wBoxMonOT ld bc, NAME_LENGTH - ld a, [wNumInBox] + ld a, [wBoxCount] dec a jr z, .asm_e7ee dec a @@ -2668,7 +2668,7 @@ SendNewMonToBox: ld d, h ld e, l pop hl - ld a, [wNumInBox] + ld a, [wBoxCount] dec a ld b, a .asm_e7db @@ -2689,7 +2689,7 @@ SendNewMonToBox: ld de, wBoxMonOT ld bc, NAME_LENGTH call CopyData - ld a, [wNumInBox] + ld a, [wBoxCount] dec a jr z, .asm_e82a ld hl, wBoxMonNicks @@ -2702,7 +2702,7 @@ SendNewMonToBox: ld d, h ld e, l pop hl - ld a, [wNumInBox] + ld a, [wBoxCount] dec a ld b, a .asm_e817 @@ -2723,7 +2723,7 @@ SendNewMonToBox: ld a, NAME_MON_SCREEN ld [wNamingScreenType], a predef AskName - ld a, [wNumInBox] + ld a, [wBoxCount] dec a jr z, .asm_e867 ld hl, wBoxMons @@ -2736,7 +2736,7 @@ SendNewMonToBox: ld d, h ld e, l pop hl - ld a, [wNumInBox] + ld a, [wBoxCount] dec a ld b, a .asm_e854 |