Prepare to merge

2015-11-01 18:13:31 -05:00
parent 31c407bb3d
commit 010b450834
15 changed files with 153 additions and 130 deletions
--- a/engine/specials.asm
+++ b/engine/specials.asm
@@ -333,7 +333,7 @@ Special_GetMysteryGiftItem: ; c309
 	ld a, [sMysteryGiftItem]
 	ld [CurItem], a
 	ld a, $1
-	ld [wd10c], a
+	ld [wItemQuantityChangeBuffer], a
 	ld hl, NumItems
 	call ReceiveItem
 	jr nc, .asm_c33d