Use {interpolation} to generate sequences of RAM labels

Fixes #319
This commit is contained in:
Rangi 2021-04-27 15:49:59 -04:00
parent bcc4380d40
commit 6a31663c96
15 changed files with 135 additions and 115 deletions

View file

@ -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

View file

@ -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

View file

@ -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