summaryrefslogtreecommitdiff
path: root/engine/move_mon.asm
diff options
context:
space:
mode:
authorentrpntr <entrpntr@gmail.com>2020-03-16 09:31:44 -0400
committerentrpntr <entrpntr@gmail.com>2020-03-17 11:47:47 -0400
commite3b53fa1b8ae55a82d50895aee67a3078209b216 (patch)
tree5d5bbe8bc66bf92c567fbea4475b25a4cd304db1 /engine/move_mon.asm
parent1e0807e4bfd5ca3e710c284cbbd4c0a50131baf3 (diff)
Fill in a lot of missing bank $04 code.
Diffstat (limited to 'engine/move_mon.asm')
-rwxr-xr-xengine/move_mon.asm10
1 files changed, 5 insertions, 5 deletions
diff --git a/engine/move_mon.asm b/engine/move_mon.asm
index 7410375f..7198910d 100755
--- a/engine/move_mon.asm
+++ b/engine/move_mon.asm
@@ -1196,7 +1196,7 @@ RemoveMonFromPartyOrBox: ; e03f (3:603f)
ld a, [wCurPartyMon]
cp [hl]
jr z, .asm_e137
- ld hl, s0_a600
+ ld hl, sPartyMail
ld bc, MAIL_STRUCT_LENGTH
call AddNTimes
push hl
@@ -1502,14 +1502,14 @@ GivePoke: ; Give a Pokemon from script
push bc
push de
push af
- ld a, [wd002]
+ ld a, [wCurItem]
and a
jr z, .asm_e2fa
ld a, [wCurPartyMon]
ld hl, wPartyMon1Item
ld bc, PARTYMON_STRUCT_LENGTH
call AddNTimes
- ld a, [wd002]
+ ld a, [wCurItem]
ld [hl], a
jr .asm_e2fa
@@ -1530,10 +1530,10 @@ GivePoke: ; Give a Pokemon from script
push bc
push de
push af
- ld a, [wd002]
+ ld a, [wCurItem]
and a
jr z, .asm_e2fa
- ld a, [wd002]
+ ld a, [wCurItem]
ld [sBoxMon1Item], a
.asm_e2fa
ld a, [wCurPartySpecies]