Identify more labels and constants

This commit is contained in:
Rangi
2020-06-29 19:35:47 -04:00
parent f2efda1f68
commit e171c84c29
5 changed files with 115 additions and 98 deletions

View File

@@ -14,7 +14,7 @@ FarDecompress::
ret
Decompress::
; Pokemon Crystal uses an lz variant for compression.
; Pokemon GSC uses an lz variant (lz3) for compression.
; This is mainly (but not necessarily) used for graphics.
; This function decompresses lz-compressed data from hl to de.

View File

@@ -1,23 +1,21 @@
FarCall_de::
; Call a:de.
; Preserves other registers.
ldh [hTempBank], a
ldh a, [hROMBank]
push af
ldh a, [hTempBank]
rst Bankswitch
call .de
call FarCall_JumpToDE
jr ReturnFarCall
.de
FarCall_JumpToDE:
push de
ret
FarCall_hl::
; Call a:hl.
; Preserves other registers.
ldh [hTempBank], a
ldh a, [hROMBank]
push af
@@ -29,7 +27,6 @@ FarCall_hl::
ReturnFarCall::
; We want to retain the contents of f.
; To do this, we can pop to bc instead of af.
ld a, b
ld [wFarCallBCBuffer], a
ld a, c
@@ -40,6 +37,7 @@ ReturnFarCall::
ld a, b
rst Bankswitch
; Restore the contents of bc.
ld a, [wFarCallBCBuffer]
ld b, a
ld a, [wFarCallBCBuffer + 1]

View File

@@ -334,14 +334,13 @@ Request1bpp::
jr .loop
Get2bpp::
; copy c 2bpp tiles from b:de to hl
ldh a, [rLCDC]
bit rLCDC_ENABLE, a
jp nz, Request2bpp
; fallthrough
Copy2bpp:
; copy c 2bpp tiles from b:de to hl
push hl
ld h, d
ld l, e
@@ -364,14 +363,13 @@ Copy2bpp:
jp FarCopyBytes
Get1bpp::
; copy c 1bpp tiles from b:de to hl
ldh a, [rLCDC]
bit rLCDC_ENABLE, a
jp nz, Request1bpp
; fallthrough
Copy1bpp::
; copy c 1bpp tiles from b:de to hl
push de
ld d, h
ld e, l