diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-17 08:40:42 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-17 08:40:56 -0400 |
| commit | 98f443f70c60f8fdbcf8621ab2c4f9dd37c66bde (patch) | |
| tree | 42dc1cc21f8916c6d6ffe3b503fffddc4cab68cf /engine/events_2.asm | |
| parent | 2eeb78d1bcecf09b2a48035dc24c19a726c41819 (diff) | |
engine/events.asm labels finished
fixed palred/green/blue macros
Diffstat (limited to 'engine/events_2.asm')
| -rw-r--r-- | engine/events_2.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engine/events_2.asm b/engine/events_2.asm index af0f8df17..42e3ed8e4 100644 --- a/engine/events_2.asm +++ b/engine/events_2.asm @@ -458,7 +458,7 @@ HandleQueuedCommand: ; 97e79 .okay ld e, a ld d, 0 - ld hl, .Jumptable_ba + ld hl, .Jumptable add hl, de add hl, de add hl, de @@ -472,7 +472,7 @@ HandleQueuedCommand: ; 97e79 ret ; 97e94 -.Jumptable_ba: ; 97e94 +.Jumptable: ; 97e94 dba CmdQueue_Null dba CmdQueue_Null2 dba CmdQueue_StoneTable @@ -531,9 +531,9 @@ CmdQueue_Type4: ; 97ebc ld a, [hl] dec a ld [hl], a - jr z, .asm_97eee + jr z, .finish and $1 - jr z, .asm_97ee4 + jr z, .add ld hl, 2 add hl, bc ld a, [hSCY] @@ -541,7 +541,7 @@ CmdQueue_Type4: ; 97ebc ld [hSCY], a ret -.asm_97ee4 +.add ld hl, 2 add hl, bc ld a, [hSCY] @@ -549,7 +549,7 @@ CmdQueue_Type4: ; 97ebc ld [hSCY], a ret -.asm_97eee +.finish ld hl, 4 add hl, bc ld a, [hl] |