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 | |
| 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')
| -rw-r--r-- | engine/pokemon/add_mon.asm | 8 | ||||
| -rw-r--r-- | engine/pokemon/bills_pc.asm | 10 | ||||
| -rw-r--r-- | engine/pokemon/load_mon_data.asm | 2 | ||||
| -rw-r--r-- | engine/pokemon/remove_mon.asm | 2 |
4 files changed, 11 insertions, 11 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 diff --git a/engine/pokemon/bills_pc.asm b/engine/pokemon/bills_pc.asm index 42d4fb07..13ad1b20 100644 --- a/engine/pokemon/bills_pc.asm +++ b/engine/pokemon/bills_pc.asm @@ -215,7 +215,7 @@ BillsPCDeposit: call PrintText jp BillsPCMenu .partyLargeEnough - ld a, [wNumInBox] + ld a, [wBoxCount] cp MONS_PER_BOX jr nz, .boxNotFull ld hl, BoxFullText @@ -276,7 +276,7 @@ SleepingPikachuText2: text_end BillsPCWithdraw: - ld a, [wNumInBox] + ld a, [wBoxCount] and a jr nz, .boxNotEmpty ld hl, NoMonText @@ -290,7 +290,7 @@ BillsPCWithdraw: call PrintText jp BillsPCMenu .partyNotFull - ld hl, wNumInBox + ld hl, wBoxCount call DisplayMonListMenu jp c, BillsPCMenu call DisplayDepositWithdrawMenu @@ -319,14 +319,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 callfar IsThisPartymonStarterPikachu_Box diff --git a/engine/pokemon/load_mon_data.asm b/engine/pokemon/load_mon_data.asm index 53840728..3d9417a7 100644 --- a/engine/pokemon/load_mon_data.asm +++ b/engine/pokemon/load_mon_data.asm @@ -59,7 +59,7 @@ GetMonSpecies: ld hl, wBoxSpecies jr .getSpecies .enemyParty - ld hl, wEnemyPartyMons + ld hl, wEnemyPartySpecies .getSpecies ld d, 0 add hl, de 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 |