@@ -375,7 +375,7 @@ PCGiveItem:
375
375
SwapPartyItem:
376
376
ld a , [ wPartyCount ]
377
377
cp 2
378
- jr c , .DontSwap
378
+ jmp c , .DontSwap
379
379
ld a , [ wCurPartyMon ]
380
380
inc a
381
381
ld [ wSwitchMon ], a
@@ -407,11 +407,11 @@ SwapPartyItem:
407
407
; First, swap mail metadata. Don't bother checking if we are holding Mail,
408
408
; doing the swap either way is harmless and simplifies checks.
409
409
; Note that wCurPartyMon is 0-indexed while wSwitchMon is 1-indexed.
410
- push bc
411
- push de
412
410
ld a , [ wCurPartyMon ]
413
- inc a
414
411
ld c , a
412
+ push bc
413
+ push de
414
+ inc c
415
415
ld a , [ wSwitchMon ]
416
416
ld e , a
417
417
farcall SwapPartyMonMail
@@ -422,22 +422,38 @@ SwapPartyItem:
422
422
; wCurPartyMon contains second selected pkmn
423
423
; getting pkmn2 item and putting into stack item addr + item id
424
424
call GetPartyItemLocation
425
- ld a , [ hl ] ; a pkmn2 contains item
425
+ ld a , [ hl ] ; a contains pkmn2 item
426
426
push hl
427
427
push af
428
428
; getting pkmn 1 item and putting item id into b
429
429
ld a , [ wSwitchMon ]
430
430
dec a
431
431
ld [ wCurPartyMon ], a
432
432
call GetPartyItemLocation
433
- ld a , [ hl ] ; a pkmn1 contains item
433
+ ld a , [ hl ] ; a contains pkmn1 item
434
434
ld b , a
435
435
; actual swap
436
436
pop af
437
- ld [ hl ], a ; pkmn1 get pkm2 item
437
+ ld [ hl ], a ; pkmn1 get pkmn2 item
438
+ xor a ; ld a, MON_SPECIES
439
+ push hl
440
+ call GetPartyParamLocationAndValue
441
+ pop hl
442
+ ld [ wCurPartySpecies ], a ; load pkmn1 species
443
+ push bc
444
+ call UpdateMewtwoForm
445
+ pop bc
438
446
pop hl
439
447
ld a , b
440
- ld [ hl ], a ; pkmn1 get pkm2 item
448
+ ld [ hl ], a ; pkmn2 get pkmn1 item
449
+ ld a , c
450
+ ld [ wCurPartyMon ], a ; restore pkmn2
451
+ xor a ; ld a, MON_SPECIES
452
+ push hl
453
+ call GetPartyParamLocationAndValue
454
+ pop hl
455
+ ld [ wCurPartySpecies ], a ; load pkmn2 species
456
+ call UpdateMewtwoForm
441
457
xor a
442
458
ld [ wPartyMenuActionText ], a
443
459
jmp CancelPokemonAction
0 commit comments