diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2020-02-04 11:17:14 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-04 11:17:14 -0500 |
| commit | ed44d1cdb7e2f389be56a0158f8ce857e02a76b3 (patch) | |
| tree | f0b0c99546651898e1c326697164f2f95aa97d0b /engine | |
| parent | dd6812c06a3a5123fa277c9c07089cb35647b4d2 (diff) | |
| parent | 24a23b19224fd8d2ac255e810c4b9c235118277a (diff) | |
Merge pull request #680 from Rangi42/master
Miscellaneous fixes for #676
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/overworld/events.asm | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/engine/overworld/events.asm b/engine/overworld/events.asm index d4c6ec0bf..bdac21c94 100644 --- a/engine/overworld/events.asm +++ b/engine/overworld/events.asm @@ -1509,20 +1509,20 @@ CmdQueue_Type4: .zero ldh a, [hSCY] - ld hl, 4 + ld hl, CMDQUEUE_04 add hl, bc ld [hl], a call CmdQueueAnonJT_Increment .one - ld hl, 1 + ld hl, CMDQUEUE_ADDR add hl, bc ld a, [hl] dec a ld [hl], a jr z, .finish - and $1 + and 1 jr z, .add - ld hl, 2 + ld hl, CMDQUEUE_02 add hl, bc ldh a, [hSCY] sub [hl] @@ -1530,7 +1530,7 @@ CmdQueue_Type4: ret .add - ld hl, 2 + ld hl, CMDQUEUE_02 add hl, bc ldh a, [hSCY] add [hl] @@ -1538,7 +1538,7 @@ CmdQueue_Type4: ret .finish - ld hl, 4 + ld hl, CMDQUEUE_04 add hl, bc ld a, [hl] ldh [hSCY], a @@ -1561,7 +1561,7 @@ CmdQueue_Type3: jr z, .PlayerNotFacingDown call CmdQueueAnonJT_Increment - ld hl, 2 + ld hl, CMDQUEUE_02 add hl, bc ld a, [hl] ld [wd173], a @@ -1572,7 +1572,7 @@ CmdQueue_Type3: jr z, .PlayerNotFacingDown call CmdQueueAnonJT_Decrement - ld hl, 3 + ld hl, CMDQUEUE_03 add hl, bc ld a, [hl] ld [wd173], a @@ -1581,7 +1581,7 @@ CmdQueue_Type3: .PlayerNotFacingDown: ld a, $7f ld [wd173], a - ld hl, 5 + ld hl, CMDQUEUE_05 add hl, bc ld [hl], 0 ret |