diff options
author | Daniel Harding <33dannye@gmail.com> | 2020-05-16 21:42:24 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-05-16 21:42:24 -0500 |
commit | 8a924f1f783572ff395f617f99546b4c949c8b04 (patch) | |
tree | 1b6c7de331cb983256651b11b8adf413a3a434f1 /engine/events/misc_scripts.asm | |
parent | 88d7e9a34a8b610b358cec1ccc6660634ca9ce80 (diff) | |
parent | ed94962edf1668aba3f60938e8a5ba8040e2a59c (diff) |
Merge pull request #30 from entrpntr/spring-cleaning
Spring Cleaning
Diffstat (limited to 'engine/events/misc_scripts.asm')
-rwxr-xr-x | engine/events/misc_scripts.asm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/engine/events/misc_scripts.asm b/engine/events/misc_scripts.asm index f9ba459f..e9006332 100755 --- a/engine/events/misc_scripts.asm +++ b/engine/events/misc_scripts.asm @@ -29,27 +29,27 @@ FindItemInBallScript:: .FoundItemText: text_far _FoundItemText - db "@" + text_end .CantCarryItemText: text_far _CantCarryItemText - db "@" + text_end .TryReceiveItem: xor a ld [wScriptVar], a - ld a, [wcf29] - ld [wDeciramBuffer], a + ld a, [wItemBallItemID] + ld [wNamedObjectIndexBuffer], a call GetItemName ld hl, wStringBuffer3 call CopyName2 - ld a, [wcf29] - ld [wd002], a - ld a, [wcf2a] + ld a, [wItemBallItemID] + ld [wCurItem], a + ld a, [wItemBallQuantity] ld [wItemQuantityChangeBuffer], a ld hl, wNumItems call ReceiveItem ret nc ld a, $1 ld [wScriptVar], a - ret
\ No newline at end of file + ret |