diff options
| author | yenatch <yenatch@gmail.com> | 2018-02-03 17:15:20 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-03 17:15:20 -0500 |
| commit | b35eb72290b964b98844afbe741bb7ede34b9ef3 (patch) | |
| tree | 2cf2652bc9c3e69ae5f7b2a2632c02a12498615f /engine/events/misc_scripts.asm | |
| parent | 7547ad839cf1c8141b931d08ef16a894e7db68c9 (diff) | |
| parent | 32ade4ac9bf113d630d904aab51f2c49c91bf8c2 (diff) | |
Merge pull request #480 from luckytyphlosion/master
[Ready to merge] Prefix wram labels with w.
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 73ed89143..4e4d5dc86 100755 --- a/engine/events/misc_scripts.asm +++ b/engine/events/misc_scripts.asm @@ -43,20 +43,20 @@ FindItemInBallScript:: ; 0x122ce .TryReceiveItem: ; 122f8 xor a - ld [ScriptVar], a - ld a, [EngineBuffer1] + ld [wScriptVar], a + ld a, [wEngineBuffer1] ld [wNamedObjectIndexBuffer], a call GetItemName - ld hl, StringBuffer3 + ld hl, wStringBuffer3 call CopyName2 - ld a, [EngineBuffer1] - ld [CurItem], a - ld a, [CurFruit] + ld a, [wEngineBuffer1] + ld [wCurItem], a + ld a, [wCurFruit] ld [wItemQuantityChangeBuffer], a - ld hl, NumItems + ld hl, wNumItems call ReceiveItem ret nc ld a, $1 - ld [ScriptVar], a + ld [wScriptVar], a ret ; 12324 |