diff options
| author | dannye <33dannye@gmail.com> | 2021-04-30 14:03:34 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2021-04-30 14:03:34 -0500 |
| commit | 0cbd5acb76d0f5df35ebf529bd227c201e0b3115 (patch) | |
| tree | fcc3124631cbbc05d3f4df670d13e5f2a3e02e59 /engine/pokemon/add_mon.asm | |
| parent | pokered -> pokeyellow (diff) | |
| parent | Use {interpolation} to generate sequences of RAM labels (diff) | |
| download | pokeyellow-0cbd5acb76d0f5df35ebf529bd227c201e0b3115.tar.gz pokeyellow-0cbd5acb76d0f5df35ebf529bd227c201e0b3115.tar.xz pokeyellow-0cbd5acb76d0f5df35ebf529bd227c201e0b3115.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'engine/pokemon/add_mon.asm')
| -rw-r--r-- | engine/pokemon/add_mon.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engine/pokemon/add_mon.asm b/engine/pokemon/add_mon.asm index e86b7b61..c498f02a 100644 --- a/engine/pokemon/add_mon.asm +++ b/engine/pokemon/add_mon.asm @@ -354,7 +354,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 @@ -391,7 +391,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 @@ -441,7 +441,7 @@ _MoveMon:: ld a, [wPartyCount] jr nz, .addOToffset ld hl, wBoxMonOT - ld a, [wNumInBox] + ld a, [wBoxCount] .addOToffset dec a call SkipFixedLengthTextEntries @@ -472,7 +472,7 @@ _MoveMon:: ld a, [wPartyCount] jr nz, .addNickOffset ld hl, wBoxMonNicks - ld a, [wNumInBox] + ld a, [wBoxCount] .addNickOffset dec a call SkipFixedLengthTextEntries |