diff options
| author | surskitty <surskitty@gmail.com> | 2017-12-11 17:37:34 -0500 |
|---|---|---|
| committer | surskitty <surskitty@gmail.com> | 2017-12-11 17:37:34 -0500 |
| commit | 98128cd4d8457948e7136a16e08bacff0bc3529d (patch) | |
| tree | 171c67509afba62571266bd6bebbfdb829d2a876 /engine/decorations.asm | |
| parent | 069ae7e2f3bc4f3939a4b97d6200a3fcdacc904b (diff) | |
| parent | 94c7def4883fbdbcd3987a067443a2069b8bb610 (diff) | |
Merge branch 'master' of github.com:pret/pokecrystal
Diffstat (limited to 'engine/decorations.asm')
| -rwxr-xr-x | engine/decorations.asm | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/engine/decorations.asm b/engine/decorations.asm index 4bd99c0a5..ad82a2080 100755 --- a/engine/decorations.asm +++ b/engine/decorations.asm @@ -908,16 +908,16 @@ DecoAction_putawayornament: ; 26dc9 DecoAction_FinishUp_Ornament: ; 26dd6 call QueryWhichSide - ld a, [wd1ec] + ld a, [wSelectedDecoration] ld [hl], a - ld a, [wd1ed] + ld a, [wOtherDecoration] ld [de], a xor a ret ; 26de3 DecoAction_SetItUp_Ornament: ; 26de3 - ld a, [wd1ec] + ld a, [wSelectedDecoration] and a jr z, .nothingthere ld b, a @@ -931,7 +931,7 @@ DecoAction_SetItUp_Ornament: ; 26de3 ld hl, StringBuffer4 call GetDecorationName ld a, [MenuSelection] - ld [wd1ec], a + ld [wSelectedDecoration], a call .getwhichside ld hl, DecoText_PutAwayAndSetUp call MenuTextBoxBackup @@ -940,7 +940,7 @@ DecoAction_SetItUp_Ornament: ; 26de3 .nothingthere ld a, [MenuSelection] - ld [wd1ec], a + ld [wSelectedDecoration], a call .getwhichside ld a, [MenuSelection] ld hl, StringBuffer3 @@ -960,11 +960,11 @@ DecoAction_SetItUp_Ornament: ; 26de3 .getwhichside ; 26e33 ld a, [MenuSelection] ld b, a - ld a, [wd1ed] + ld a, [wOtherDecoration] cp b ret nz xor a - ld [wd1ed], a + ld [wOtherDecoration], a ret ; 26e41 @@ -975,7 +975,7 @@ UnknownText_0x26e41: ; 0x26e41 ; 0x26e46 DecoAction_PutItAway_Ornament: ; 26e46 - ld a, [wd1ec] + ld a, [wSelectedDecoration] and a jr z, .nothingthere ld hl, StringBuffer3 @@ -983,7 +983,7 @@ DecoAction_PutItAway_Ornament: ; 26e46 ld a, $1 ld [Buffer5], a xor a - ld [wd1ec], a + ld [wSelectedDecoration], a ld hl, DecoText_PutAwayTheDeco call MenuTextBoxBackup xor a @@ -1015,9 +1015,9 @@ DecoAction_AskWhichSide: ; 26e70 ld [Buffer2], a call QueryWhichSide ld a, [hl] - ld [wd1ec], a + ld [wSelectedDecoration], a ld a, [de] - ld [wd1ed], a + ld [wOtherDecoration], a xor a ret |