diff options
| author | Bryan Bishop <kanzure@gmail.com> | 2013-07-12 19:16:49 -0700 |
|---|---|---|
| committer | Bryan Bishop <kanzure@gmail.com> | 2013-07-12 19:16:49 -0700 |
| commit | bb8990dc3cb19787e08c29409cfc674e2478fbc9 (patch) | |
| tree | 28592a2c2c32b7b16f4e63fc22390a36789fea8a /items | |
| parent | 226729d1750bc6ee0c45d96e3f6b7dcf0844a609 (diff) | |
| parent | 90c18c5cf320be70b0507deda0dd7611052f2bec (diff) | |
Merge pull request #157 from yenatch/overworld
overworld loop and movement
Diffstat (limited to 'items')
| -rw-r--r-- | items/item_effects.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/items/item_effects.asm b/items/item_effects.asm index 51e5ff0ef..09e6857bf 100644 --- a/items/item_effects.asm +++ b/items/item_effects.asm @@ -448,7 +448,7 @@ ParkBall: ; e8a2 xor a ld [CurPartyMon], a - ld a, $2 + ld a, BOXMON ld [MonType], a ld de, $d050 ld b, $0 @@ -775,7 +775,7 @@ Function_0xed12: ; ed12 push de ld a, [TempEnemyMonSpecies] ld [CurPartySpecies], a - ld a, $4 + ld a, WILDMON ld [MonType], a ld a, $14 ld hl, $4bdd |