aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/oakslab.asm
diff options
context:
space:
mode:
authordannye <corrnondacqb@yahoo.com>2015-07-14 00:58:09 -0500
committerdannye <corrnondacqb@yahoo.com>2015-07-14 00:58:09 -0500
commite25a7148d0a78549de4f33fa72d519dcaf660e97 (patch)
tree5fcc95934c26b1fc86345b10f2a5c80fa740d083 /scripts/oakslab.asm
parentUse more *Coord (diff)
parentnamed town map stuff (diff)
downloadpokeyellow-e25a7148d0a78549de4f33fa72d519dcaf660e97.tar.gz
pokeyellow-e25a7148d0a78549de4f33fa72d519dcaf660e97.tar.xz
pokeyellow-e25a7148d0a78549de4f33fa72d519dcaf660e97.zip
Merge branch 'master' of https://github.com/YamaArashi/pokered
Conflicts: engine/town_map.asm
Diffstat (limited to 'scripts/oakslab.asm')
-rwxr-xr-xscripts/oakslab.asm2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/oakslab.asm b/scripts/oakslab.asm
index 7c99d802..1c255103 100755
--- a/scripts/oakslab.asm
+++ b/scripts/oakslab.asm
@@ -641,7 +641,7 @@ OaksLabScript_1d00a: ; 1d00a (7:500a)
ld a, c
ld [wWhichPokemon], a
ld a, $1
- ld [wcf96], a
+ ld [wItemQuantity], a
jp RemoveItemFromInventory
OaksLabScript_1d02b: ; 1d02b (7:502b)