diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2015-12-17 17:51:32 -0500 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2015-12-17 17:51:32 -0500 |
| commit | fe4ef4e5951e855174cbff3da308b342b0b5bd09 (patch) | |
| tree | c5d635a2b4fa10699a8b37817e041d46938e53df /engine | |
| parent | 42dd25b3e50569d94ca78adf47c527a9859089b5 (diff) | |
Elevator
Diffstat (limited to 'engine')
| -rwxr-xr-x | engine/mart.asm | 2 | ||||
| -rwxr-xr-x | engine/selectmenu.asm | 6 | ||||
| -rwxr-xr-x | engine/switch_items.asm | 26 |
3 files changed, 17 insertions, 17 deletions
diff --git a/engine/mart.asm b/engine/mart.asm index d051d4632..7673df5af 100755 --- a/engine/mart.asm +++ b/engine/mart.asm @@ -662,7 +662,7 @@ MenuDataHeader_Buy: ; 0x15e18 ; 15e30 .PrintBCDPrices: ; 15e30 - ld a, [wcf77] + ld a, [wScrollingMenuCursorPosition] ld c, a ld b, 0 ld hl, wMartItem1BCD diff --git a/engine/selectmenu.asm b/engine/selectmenu.asm index 1298de0f9..03210f43d 100755 --- a/engine/selectmenu.asm +++ b/engine/selectmenu.asm @@ -167,11 +167,11 @@ UseRegisteredItem: ; 133c3 .Overworld ; 13406 call ResetWindow ld a, 1 - ld [wd0ef], a + ld [wUsingItemWithSelect], a call DoItemEffect xor a - ld [wd0ef], a - ld a, [wd0ec] + ld [wUsingItemWithSelect], a + ld a, [wItemEffectSucceeded] cp 1 jr nz, ._cantuse scf diff --git a/engine/switch_items.asm b/engine/switch_items.asm index 834648773..7de3440fa 100755 --- a/engine/switch_items.asm +++ b/engine/switch_items.asm @@ -3,11 +3,11 @@ SwitchItemsInBag: ; 2490c (9:490c) and a jr z, .init ld b, a - ld a, [wCurrPocketCursorPosition] + ld a, [wScrollingMenuCursorPosition] inc a cp b jr z, .trivial - ld a, [wCurrPocketCursorPosition] + ld a, [wScrollingMenuCursorPosition] call Function24a5c ld a, [hl] cp $ff @@ -17,7 +17,7 @@ SwitchItemsInBag: ; 2490c (9:490c) ld [wSwitchItem], a call Function249a7 jp c, Function249d1 - ld a, [wCurrPocketCursorPosition] + ld a, [wScrollingMenuCursorPosition] ld c, a ld a, [wSwitchItem] cp c @@ -25,7 +25,7 @@ SwitchItemsInBag: ; 2490c (9:490c) jr .asm_2494a .init - ld a, [wCurrPocketCursorPosition] + ld a, [wScrollingMenuCursorPosition] inc a ld [wSwitchItem], a ret @@ -38,7 +38,7 @@ SwitchItemsInBag: ; 2490c (9:490c) .asm_2494a ld a, [wSwitchItem] call Function24a40 - ld a, [wCurrPocketCursorPosition] + ld a, [wScrollingMenuCursorPosition] ld d, a ld a, [wSwitchItem] ld e, a @@ -55,7 +55,7 @@ SwitchItemsInBag: ; 2490c (9:490c) pop hl pop bc call Function24aab - ld a, [wCurrPocketCursorPosition] + ld a, [wScrollingMenuCursorPosition] call Function24a4d xor a ld [wSwitchItem], a @@ -64,7 +64,7 @@ SwitchItemsInBag: ; 2490c (9:490c) .asm_2497a ld a, [wSwitchItem] call Function24a40 - ld a, [wCurrPocketCursorPosition] + ld a, [wScrollingMenuCursorPosition] ld d, a ld a, [wSwitchItem] ld e, a @@ -78,7 +78,7 @@ SwitchItemsInBag: ; 2490c (9:490c) add hl, bc pop bc call CopyBytes - ld a, [wCurrPocketCursorPosition] + ld a, [wScrollingMenuCursorPosition] call Function24a4d xor a ld [wSwitchItem], a @@ -89,12 +89,12 @@ Function249a7: ; 249a7 (9:49a7) call Function24a5c ld d, h ld e, l - ld a, [wCurrPocketCursorPosition] + ld a, [wScrollingMenuCursorPosition] call Function24a5c ld a, [de] cp [hl] jr nz, .asm_249cd - ld a, [wCurrPocketCursorPosition] + ld a, [wScrollingMenuCursorPosition] call Function24a97 cp 99 jr z, .asm_249cd @@ -115,7 +115,7 @@ Function249d1: ; 249d1 (9:49d1) call Function24a5c inc hl push hl - ld a, [wCurrPocketCursorPosition] + ld a, [wScrollingMenuCursorPosition] call Function24a5c inc hl ld a, [hl] @@ -125,7 +125,7 @@ Function249d1: ; 249d1 (9:49d1) jr c, .asm_24a01 sub 99 push af - ld a, [wCurrPocketCursorPosition] + ld a, [wScrollingMenuCursorPosition] call Function24a5c inc hl ld [hl], 99 @@ -140,7 +140,7 @@ Function249d1: ; 249d1 (9:49d1) .asm_24a01 push af - ld a, [wCurrPocketCursorPosition] + ld a, [wScrollingMenuCursorPosition] call Function24a5c inc hl pop af |