Merge branch 'master' of https://github.com/pret/pokered

1 files changed, 41 insertions, 29 deletions

diff --git a/engine/pokemon/remove_mon.asm b/engine/pokemon/remove_mon.asm
index 60ec8c27..ee47f0c8 100644
--- a/engine/pokemon/remove_mon.asm
+++ b/engine/pokemon/remove_mon.asm
@@ -2,15 +2,16 @@ _RemovePokemon::
 	ld hl, wPartyCount
 	ld a, [wRemoveMonFromBox]
 	and a
-	jr z, .usePartyCount
+	jr z, .gotCount
 	ld hl, wBoxCount
-.usePartyCount
+.gotCount
 	ld a, [hl]
 	dec a
 	ld [hli], a
+
 	ld a, [wWhichPokemon]
 	ld c, a
-	ld b, $0
+	ld b, 0
 	add hl, bc
 	ld e, l
 	ld d, h
@@ -21,21 +22,27 @@ _RemovePokemon::
 	ld [hli], a
 	inc a ; reached terminator?
 	jr nz, .shiftMonSpeciesLoop ; if not, continue shifting species
+
 	ld hl, wPartyMonOT
 	ld d, PARTY_LENGTH - 1 ; max number of pokemon to shift
 	ld a, [wRemoveMonFromBox]
 	and a
-	jr z, .usePartyMonOTs
+	jr z, .gotOTsPointer
 	ld hl, wBoxMonOT
 	ld d, MONS_PER_BOX - 1
-.usePartyMonOTs
+.gotOTsPointer
 	ld a, [wWhichPokemon]
 	call SkipFixedLengthTextEntries
 	ld a, [wWhichPokemon]
 	cp d ; are we removing the last pokemon?
 	jr nz, .notRemovingLastMon ; if not, shift the pokemon below
-	ld [hl], $ff ; else, write the terminator and return
+
+	; bug: to erase a string, this should be ld [hl], '@'
+	; This is not needed, as wBoxSpecies/wPartySpecies determine if a slot is used.
+	; Besides, existing mon nick is left untouched
+	ld [hl], $ff
 	ret
+
 .notRemovingLastMon
 	ld d, h
 	ld e, l
@@ -44,44 +51,49 @@ _RemovePokemon::
 	ld bc, wPartyMonNicks
 	ld a, [wRemoveMonFromBox]
 	and a
-	jr z, .usePartyMonNicks
+	jr z, .gotNicksPointer
 	ld bc, wBoxMonNicks
-.usePartyMonNicks
+.gotNicksPointer
 	call CopyDataUntil
+
 	ld hl, wPartyMons
-	ld bc, wPartyMon2 - wPartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	ld a, [wRemoveMonFromBox]
 	and a
-	jr z, .usePartyMonStructs
+	jr z, .gotMonStructs
 	ld hl, wBoxMons
-	ld bc, wBoxMon2 - wBoxMon1
-.usePartyMonStructs
+	ld bc, BOXMON_STRUCT_LENGTH
+.gotMonStructs
 	ld a, [wWhichPokemon]
 	call AddNTimes ; get address of the pokemon removed
-	ld d, h ; store in de for CopyDataUntil
+
+	ld d, h ; de = start address for CopyDataUntil
 	ld e, l
 	ld a, [wRemoveMonFromBox]
 	and a
-	jr z, .copyUntilPartyMonOTs
-	ld bc, wBoxMon2 - wBoxMon1
-	add hl, bc ; get address of pokemon after the pokemon removed
-	ld bc, wBoxMonOT ; address of when to stop copying
-	jr .continue
-.copyUntilPartyMonOTs
-	ld bc, wPartyMon2 - wPartyMon1
-	add hl, bc ; get address of pokemon after the pokemon removed
-	ld bc, wPartyMonOT ; address of when to stop copying
-.continue
-	call CopyDataUntil ; shift all pokemon data after the removed mon to the removed mon's location
+	jr z, .copyUntilPartyMonOT
+; copy until wBoxMonOT
+	ld bc, BOXMON_STRUCT_LENGTH
+	add hl, bc ; get address of next slot
+	ld bc, wBoxMonOT
+	jr .shiftOTs
+.copyUntilPartyMonOT
+	ld bc, PARTYMON_STRUCT_LENGTH
+	add hl, bc ; get address of next slot
+	ld bc, wPartyMonOT
+.shiftOTs
+	call CopyDataUntil ; shift all pokemon data up one slot
+
 	ld hl, wPartyMonNicks
 	ld a, [wRemoveMonFromBox]
 	and a
-	jr z, .usePartyMonNicks2
+	jr z, .gotNicksPointer2
 	ld hl, wBoxMonNicks
-.usePartyMonNicks2
+.gotNicksPointer2
 	ld bc, NAME_LENGTH
 	ld a, [wWhichPokemon]
 	call AddNTimes
+
 	ld d, h
 	ld e, l
 	ld bc, NAME_LENGTH
@@ -89,7 +101,7 @@ _RemovePokemon::
 	ld bc, wPartyMonNicksEnd
 	ld a, [wRemoveMonFromBox]
 	and a
-	jr z, .copyUntilPartyMonNicksEnd
+	jr z, .shiftMonNicks
 	ld bc, wBoxMonNicksEnd
-.copyUntilPartyMonNicksEnd
-	jp CopyDataUntil
+.shiftMonNicks
+	jp CopyDataUntil ; shift all pokemon nicknames up one slot