diff options
| author | yenatch <yenatch@gmail.com> | 2018-01-22 01:06:48 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-22 01:06:48 -0500 |
| commit | c60f1331fef22b886adf3472d2b4f348832cfaf7 (patch) | |
| tree | 5a471fad61e406f5b3ca1aba67ced0186de01c52 /engine/timeofdaypals.asm | |
| parent | f27f79488a460f0a89670f3611e1e9e175baf5d6 (diff) | |
| parent | 7fba864883732ccecb1221ae7ff97492d112362a (diff) | |
Merge pull request #456 from Rangi42/master
OAM data documentation; move more content into data/; move palettes into gfx/; more code+script constants; consistent map naming
Diffstat (limited to 'engine/timeofdaypals.asm')
| -rw-r--r-- | engine/timeofdaypals.asm | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/engine/timeofdaypals.asm b/engine/timeofdaypals.asm index 0b1ea71a2..6dfa5657a 100644 --- a/engine/timeofdaypals.asm +++ b/engine/timeofdaypals.asm @@ -1,5 +1,5 @@ -Predef35: ; 8c000 -Predef36: +DummyPredef35: ; 8c000 +DummyPredef36: ret UpdateTimeOfDayPal:: ; 8c001 @@ -47,8 +47,8 @@ _TimeOfDayPals:: ; 8c011 ; save wram bank ld a, [rSVBK] ld b, a -; wram bank 5 - ld a, $5 + + ld a, BANK(wBGPals1) ld [rSVBK], a ; push palette @@ -78,8 +78,8 @@ _TimeOfDayPals:: ; 8c011 ; save wram bank ld a, [rSVBK] ld d, a -; wram bank 5 - ld a, 5 + + ld a, BANK(wOBPals1) ld [rSVBK], a ; pop palette @@ -119,7 +119,7 @@ _UpdateTimePals:: ; 8c070 ret ; 8c079 -FadeInPalettes:: ; 8c079 +Special_FadeInPalettes:: ; 8c079 ld c, $12 call GetTimePalFade ld b, $4 @@ -127,7 +127,7 @@ FadeInPalettes:: ; 8c079 ret ; 8c084 -FadeOutPalettes:: ; 8c084 +Special_FadeOutPalettes:: ; 8c084 call FillWhiteBGColor ld c, $9 call GetTimePalFade @@ -173,7 +173,7 @@ Special_FadeBlackQuickly: ; 8c0b6 FillWhiteBGColor: ; 8c0c1 ld a, [rSVBK] push af - ld a, $5 + ld a, BANK(wBGPals1) ld [rSVBK], a ld hl, wBGPals1 |