diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2016-07-21 07:58:36 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2016-07-21 07:58:36 -0400 |
| commit | 803c6081d7b458f1965c4b9e62be2714b73fcdf4 (patch) | |
| tree | 94632a90406f3b185d82cabee2beb834bd711215 /engine/timeofdaypals.asm | |
| parent | c33ba049a5a993fc678fd1698645039ce4974022 (diff) | |
| parent | a32b6ccbb5b9ad15befa3b9893659f2ceabd1ba0 (diff) | |
Merge github.com:pikalaxalt/pokecrystal
Diffstat (limited to 'engine/timeofdaypals.asm')
| -rw-r--r-- | engine/timeofdaypals.asm | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/engine/timeofdaypals.asm b/engine/timeofdaypals.asm index 1bfc2457b..e9b19c6f7 100644 --- a/engine/timeofdaypals.asm +++ b/engine/timeofdaypals.asm @@ -140,9 +140,9 @@ Special_BattleTowerFade: ; 8c092 ld b, $4 .asm_8c09c call DmgToCgbTimePals -rept 3 inc hl -endr + inc hl + inc hl ld c, $7 call DelayFrames dec b @@ -245,9 +245,8 @@ GetTimePalette: ; 8c117 ld e, a ld d, 0 ld hl, .TimePalettes -rept 2 add hl, de -endr + add hl, de ld a, [hli] ld h, [hl] ld l, a @@ -305,9 +304,9 @@ DmgToCgbTimePals: ; 8c14e ConvertTimePalsIncHL: ; 8c15e .loop call DmgToCgbTimePals -rept 3 inc hl -endr + inc hl + inc hl ld c, 2 call DelayFrames dec b @@ -318,9 +317,9 @@ endr ConvertTimePalsDecHL: ; 8c16d .loop call DmgToCgbTimePals -rept 3 dec hl -endr + dec hl + dec hl ld c, 2 call DelayFrames dec b @@ -346,9 +345,8 @@ GetTimePalFade: ; 8c17c ld c, a ld b, $0 ld hl, .dmgfades -rept 2 add hl, bc -endr + add hl, bc ld a, [hli] ld h, [hl] ld l, a |