summaryrefslogtreecommitdiff
path: root/home/fade.asm
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2014-09-13 00:50:56 -0700
committerYamaArashi <shadow962@live.com>2014-09-13 00:50:56 -0700
commit0c916aea3353ed1bf2750be403b0da9ea0b922d4 (patch)
tree4e50d805a37f06fabac6086a7ad6ed1d4f4526c4 /home/fade.asm
parent91793015e53dbed09576f825d39e71bc59bf90a5 (diff)
Commented more sprite and map code
Diffstat (limited to 'home/fade.asm')
-rw-r--r--home/fade.asm22
1 files changed, 11 insertions, 11 deletions
diff --git a/home/fade.asm b/home/fade.asm
index 9b55eaf2..08e087b4 100644
--- a/home/fade.asm
+++ b/home/fade.asm
@@ -1,7 +1,7 @@
; These routines manage gradual fading
; (e.g., entering a doorway)
LoadGBPal::
- ld a, [wd35d] ;tells if cur.map is dark (requires HM5_FLASH?)
+ ld a, [wMapPalOffset] ;tells if cur.map is dark (requires HM5_FLASH?)
ld b, a
ld hl, FadePal4
ld a, l
@@ -18,16 +18,16 @@ LoadGBPal::
ld [rOBP1], a
ret
-GBFadeOut1::
+GBFadeInFromBlack::
ld hl, FadePal1
ld b, 4
- jr GBFadeOutCommon
+ jr GBFadeIncCommon
-GBFadeOut2::
+GBFadeOutToWhite::
ld hl, FadePal6
ld b, 3
-GBFadeOutCommon::
+GBFadeIncCommon:
ld a, [hli]
ld [rBGP], a
ld a, [hli]
@@ -37,19 +37,19 @@ GBFadeOutCommon::
ld c, 8
call DelayFrames
dec b
- jr nz, GBFadeOutCommon
+ jr nz, GBFadeIncCommon
ret
-GBFadeIn1::
+GBFadeOutToBlack::
ld hl, FadePal4 + 2
ld b, 4
- jr GBFadeInCommon
+ jr GBFadeDecCommon
-GBFadeIn2::
+GBFadeInFromWhite::
ld hl, FadePal7 + 2
ld b, 3
-GBFadeInCommon::
+GBFadeDecCommon:
ld a, [hld]
ld [rOBP1], a
ld a, [hld]
@@ -59,7 +59,7 @@ GBFadeInCommon::
ld c, 8
call DelayFrames
dec b
- jr nz, GBFadeInCommon
+ jr nz, GBFadeDecCommon
ret
FadePal1:: db %11111111, %11111111, %11111111