diff options
| author | yenatch <yenatch@gmail.com> | 2018-02-25 22:39:51 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-25 22:39:51 -0500 |
| commit | 725148443f0ed0f70af747259ef49643359e92a2 (patch) | |
| tree | 5f8ccf80489e0820934d40a732a5ce8d7f65e1e3 /engine/timeofdaypals.asm | |
| parent | f44f306cfd4b438d0ba2f56b61be4b118ef3274b (diff) | |
| parent | 7453bd1aa8e55a1a9fcce7c69f62106f5e5f6e9c (diff) | |
Merge pull request #476 from Rangi42/master
Resolve some issues; rename some maps; move more tables into data/; warp_def → warp_event (ready to merge)
Diffstat (limited to 'engine/timeofdaypals.asm')
| -rw-r--r-- | engine/timeofdaypals.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engine/timeofdaypals.asm b/engine/timeofdaypals.asm index 781c2e91a..b8d43d252 100644 --- a/engine/timeofdaypals.asm +++ b/engine/timeofdaypals.asm @@ -119,7 +119,7 @@ _UpdateTimePals:: ; 8c070 ret ; 8c079 -Special_FadeInPalettes:: ; 8c079 +FadeInPalettes:: ; 8c079 ld c, $12 call GetTimePalFade ld b, $4 @@ -127,7 +127,7 @@ Special_FadeInPalettes:: ; 8c079 ret ; 8c084 -Special_FadeOutPalettes:: ; 8c084 +FadeOutPalettes:: ; 8c084 call FillWhiteBGColor ld c, $9 call GetTimePalFade @@ -136,7 +136,7 @@ Special_FadeOutPalettes:: ; 8c084 ret ; 8c092 -Special_BattleTowerFade: ; 8c092 +BattleTowerFade: ; 8c092 call FillWhiteBGColor ld c, $9 call GetTimePalFade @@ -153,7 +153,7 @@ Special_BattleTowerFade: ; 8c092 ret ; 8c0ab -Special_FadeInQuickly: ; 8c0ab +FadeInQuickly: ; 8c0ab ld c, $0 call GetTimePalFade ld b, $4 @@ -161,7 +161,7 @@ Special_FadeInQuickly: ; 8c0ab ret ; 8c0b6 -Special_FadeBlackQuickly: ; 8c0b6 +FadeBlackQuickly: ; 8c0b6 ld c, $9 call GetTimePalFade ld b, $4 @@ -216,7 +216,7 @@ ReplaceTimeOfDayPals: ; 8c0e5 .DarkCave: ld a, [wStatusFlags] - bit 2, a ; Flash + bit STATUSFLAGS_FLASH_F, a jr nz, .UsedFlash ld a, %11111111 ; 3, 3, 3, 3 ld [wTimeOfDayPalset], a |