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/pokemon | |
| parent | Port 'add_tmnum' from pokecrystal (diff) | |
| download | pokeyellow-6a31663c960a5c1da9dbbf12d49e0252860b96d0.tar.gz pokeyellow-6a31663c960a5c1da9dbbf12d49e0252860b96d0.tar.xz pokeyellow-6a31663c960a5c1da9dbbf12d49e0252860b96d0.zip | |
Use {interpolation} to generate sequences of RAM labels
Fixes #319
Diffstat (limited to 'engine/pokemon')
| -rw-r--r-- | engine/pokemon/add_mon.asm | 8 | ||||
| -rw-r--r-- | engine/pokemon/bills_pc.asm | 10 | ||||
| -rw-r--r-- | engine/pokemon/remove_mon.asm | 2 |
3 files changed, 10 insertions, 10 deletions
diff --git a/engine/pokemon/add_mon.asm b/engine/pokemon/add_mon.asm index 46a8b2b9..611aebf4 100644 --- a/engine/pokemon/add_mon.asm +++ b/engine/pokemon/add_mon.asm @@ -348,7 +348,7 @@ _MoveMon:: ld hl, wDayCareMon jr z, .findMonDataSrc ; else it's PARTY_TO_BOX - ld hl, wNumInBox + ld hl, wBoxCount ld a, [hl] cp MONS_PER_BOX jr nz, .partyOrBoxNotFull @@ -385,7 +385,7 @@ _MoveMon:: ; if it's PARTY_TO_BOX ld hl, wBoxMons ld bc, wBoxMon2 - wBoxMon1 ; $21 - ld a, [wNumInBox] + ld a, [wBoxCount] .addMonOffset dec a call AddNTimes @@ -435,7 +435,7 @@ _MoveMon:: ld a, [wPartyCount] jr nz, .addOToffset ld hl, wBoxMonOT - ld a, [wNumInBox] + ld a, [wBoxCount] .addOToffset dec a call SkipFixedLengthTextEntries @@ -466,7 +466,7 @@ _MoveMon:: ld a, [wPartyCount] jr nz, .addNickOffset ld hl, wBoxMonNicks - ld a, [wNumInBox] + ld a, [wBoxCount] .addNickOffset dec a call SkipFixedLengthTextEntries diff --git a/engine/pokemon/bills_pc.asm b/engine/pokemon/bills_pc.asm index f83ed434..7aba8001 100644 --- a/engine/pokemon/bills_pc.asm +++ b/engine/pokemon/bills_pc.asm @@ -212,7 +212,7 @@ BillsPCDeposit: call PrintText jp BillsPCMenu .partyLargeEnough - ld a, [wNumInBox] + ld a, [wBoxCount] cp MONS_PER_BOX jr nz, .boxNotFull ld hl, BoxFullText @@ -254,7 +254,7 @@ BillsPCDeposit: jp BillsPCMenu BillsPCWithdraw: - ld a, [wNumInBox] + ld a, [wBoxCount] and a jr nz, .boxNotEmpty ld hl, NoMonText @@ -268,7 +268,7 @@ BillsPCWithdraw: call PrintText jp BillsPCMenu .partyNotFull - ld hl, wNumInBox + ld hl, wBoxCount call DisplayMonListMenu jp c, BillsPCMenu call DisplayDepositWithdrawMenu @@ -291,14 +291,14 @@ BillsPCWithdraw: jp BillsPCMenu BillsPCRelease: - ld a, [wNumInBox] + ld a, [wBoxCount] and a jr nz, .loop ld hl, NoMonText call PrintText jp BillsPCMenu .loop - ld hl, wNumInBox + ld hl, wBoxCount call DisplayMonListMenu jp c, BillsPCMenu ld hl, OnceReleasedText diff --git a/engine/pokemon/remove_mon.asm b/engine/pokemon/remove_mon.asm index c85b96bf..60ec8c27 100644 --- a/engine/pokemon/remove_mon.asm +++ b/engine/pokemon/remove_mon.asm @@ -3,7 +3,7 @@ _RemovePokemon:: ld a, [wRemoveMonFromBox] and a jr z, .usePartyCount - ld hl, wNumInBox + ld hl, wBoxCount .usePartyCount ld a, [hl] dec a |