From 7a24703398aba3ab112ed770368805a17c601c03 Mon Sep 17 00:00:00 2001 From: xCrystal Date: Tue, 2 Jan 2018 15:05:14 +0100 Subject: Clean up Predef function names --- engine/timeofdaypals.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'engine/timeofdaypals.asm') diff --git a/engine/timeofdaypals.asm b/engine/timeofdaypals.asm index 0b1ea71a2..393a9e84a 100644 --- a/engine/timeofdaypals.asm +++ b/engine/timeofdaypals.asm @@ -1,5 +1,5 @@ -Predef35: ; 8c000 -Predef36: +DummyPredef35: ; 8c000 +DummyPredef36: ret UpdateTimeOfDayPal:: ; 8c001 -- cgit v1.2.3 From f1ea15bbfe8528143ace793b050891a9b1f99d03 Mon Sep 17 00:00:00 2001 From: xCrystal Date: Tue, 2 Jan 2018 17:13:57 +0100 Subject: Consolidate Special function names --- engine/timeofdaypals.asm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'engine/timeofdaypals.asm') diff --git a/engine/timeofdaypals.asm b/engine/timeofdaypals.asm index 393a9e84a..31a55a7d8 100644 --- a/engine/timeofdaypals.asm +++ b/engine/timeofdaypals.asm @@ -98,7 +98,7 @@ _TimeOfDayPals:: ; 8c011 ld [rSVBK], a ; update palettes - call _UpdateTimePals + call _Special_UpdateTimePals call DelayFrame ; successful change @@ -112,14 +112,14 @@ _TimeOfDayPals:: ; 8c011 ; 8c070 -_UpdateTimePals:: ; 8c070 +_Special_UpdateTimePals:: ; 8c070 ld c, $9 ; normal call GetTimePalFade call DmgToCgbTimePals 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 -- cgit v1.2.3 From d7970f749ac23786728926109be430ab732f19e6 Mon Sep 17 00:00:00 2001 From: xCrystal Date: Tue, 2 Jan 2018 18:49:25 +0100 Subject: Consistent predef function names --- engine/timeofdaypals.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'engine/timeofdaypals.asm') diff --git a/engine/timeofdaypals.asm b/engine/timeofdaypals.asm index 31a55a7d8..3679f2d23 100644 --- a/engine/timeofdaypals.asm +++ b/engine/timeofdaypals.asm @@ -98,7 +98,7 @@ _TimeOfDayPals:: ; 8c011 ld [rSVBK], a ; update palettes - call _Special_UpdateTimePals + call _UpdateTimePals call DelayFrame ; successful change @@ -112,7 +112,7 @@ _TimeOfDayPals:: ; 8c011 ; 8c070 -_Special_UpdateTimePals:: ; 8c070 +_UpdateTimePals:: ; 8c070 ld c, $9 ; normal call GetTimePalFade call DmgToCgbTimePals -- cgit v1.2.3 From 9d0ba6bfd3b2f10fae9969a784aa7b2b573e8411 Mon Sep 17 00:00:00 2001 From: Adelaide Walter Date: Wed, 3 Jan 2018 19:12:45 -0500 Subject: Use BANK for hardcoded WRAM banks (except where bankswitches appear unnecessary). --- engine/timeofdaypals.asm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'engine/timeofdaypals.asm') diff --git a/engine/timeofdaypals.asm b/engine/timeofdaypals.asm index 0b1ea71a2..defa9e96d 100644 --- a/engine/timeofdaypals.asm +++ b/engine/timeofdaypals.asm @@ -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 @@ -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 -- cgit v1.2.3 From a9f8aeb94efa833c562b435854ca169f81184db8 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Thu, 18 Jan 2018 21:48:52 -0500 Subject: Remove trailing whitespace --- engine/timeofdaypals.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'engine/timeofdaypals.asm') diff --git a/engine/timeofdaypals.asm b/engine/timeofdaypals.asm index 2f24dcb95..6dfa5657a 100644 --- a/engine/timeofdaypals.asm +++ b/engine/timeofdaypals.asm @@ -47,7 +47,7 @@ _TimeOfDayPals:: ; 8c011 ; save wram bank ld a, [rSVBK] ld b, a - + ld a, BANK(wBGPals1) ld [rSVBK], a @@ -78,7 +78,7 @@ _TimeOfDayPals:: ; 8c011 ; save wram bank ld a, [rSVBK] ld d, a - + ld a, BANK(wOBPals1) ld [rSVBK], a -- cgit v1.2.3