diff options
author | dannye <33dannye@gmail.com> | 2021-02-15 09:44:52 -0600 |
---|---|---|
committer | dannye <33dannye@gmail.com> | 2021-02-15 10:03:07 -0600 |
commit | 9a74ae3bc62fe1aa1c6ef33cdac4df324fd44e57 (patch) | |
tree | ba0877ba507c5116b10e2628e4eb3ab2a3fbccac /src | |
parent | 4be1777e135ab7496878e810c0b91ad570eec862 (diff) |
Rename wBGMapBuffer to wDecompressionBuffer
and update routine names accordingly
Diffstat (limited to 'src')
-rw-r--r-- | src/engine/bank03.asm | 4 | ||||
-rw-r--r-- | src/engine/bank1c.asm | 14 | ||||
-rw-r--r-- | src/engine/bank20.asm | 14 | ||||
-rw-r--r-- | src/engine/home.asm | 22 | ||||
-rw-r--r-- | src/wram.asm | 4 |
5 files changed, 29 insertions, 29 deletions
diff --git a/src/engine/bank03.asm b/src/engine/bank03.asm index 872a37c..0d94519 100644 --- a/src/engine/bank03.asm +++ b/src/engine/bank03.asm @@ -497,7 +497,7 @@ Func_c38f: ; c38f (3:438f) push hl ld b, HIGH(wc000) - call InitBGMapDecompression + call InitDataDecompression ld a, [wd23d] ld [wTempPointerBank], a ld a, [wBGMapHeight] @@ -512,7 +512,7 @@ Func_c38f: ; c38f (3:438f) .asm_c3b7 push bc ld b, $00 - call DecompressBGMapFromBank + call DecompressDataFromBank ld hl, $10 add hl, de ld d, h diff --git a/src/engine/bank1c.asm b/src/engine/bank1c.asm index 5391317..3542d61 100644 --- a/src/engine/bank1c.asm +++ b/src/engine/bank1c.asm @@ -261,10 +261,10 @@ Func_701e9: ; 701e9 (1c:41e9) ld e, l ld d, h ld b, HIGH(wc000) - call InitBGMapDecompression + call InitDataDecompression pop bc pop de - call DecompressBGMap + call DecompressData ret Func_701fe: ; 701fe (1c:41fe) @@ -341,11 +341,11 @@ Func_703cb: ; 703cb (1c:43cb) push bc push de call Func_70403 - ld hl, wBGMapBuffer + ld hl, wDecompressionBuffer ld de, wTempSGBPacket + $1 ld bc, $8 call CopyDataHLtoDE - ld hl, wBGMapBuffer + $22 + ld hl, wDecompressionBuffer + $22 ld de, wTempSGBPacket + $9 ld bc, $6 call CopyDataHLtoDE @@ -373,10 +373,10 @@ Func_70403: ; 70403 (1c:4403) ld e, l ld d, h ld b, HIGH(wc000) - call InitBGMapDecompression + call InitDataDecompression pop bc - ld de, wBGMapBuffer - call DecompressBGMap + ld de, wDecompressionBuffer + call DecompressData pop de pop bc pop hl diff --git a/src/engine/bank20.asm b/src/engine/bank20.asm index 8026829..4d46930 100644 --- a/src/engine/bank20.asm +++ b/src/engine/bank20.asm @@ -63,7 +63,7 @@ Func_80082: ; 80082 (20:4082) ld [wd23d], a ; store header data - ld de, wBGMapBuffer + ld de, wDecompressionBuffer ld bc, $0006 ; header + 1st instruction call CopyBankedDataToDE ld l, e @@ -96,7 +96,7 @@ Func_800bd: ; 800bd (20:40bd) adc $00 ld d, a ld b, HIGH(wc000) - call InitBGMapDecompression + call InitDataDecompression ld a, [wVRAMPointer] ld e, a ld a, [wVRAMPointer + 1] @@ -120,7 +120,7 @@ Func_800e0: ; 800e0 (20:40e0) .asm_800f0 ld c, $40 - ld hl, wBGMapBuffer + ld hl, wDecompressionBuffer xor a .loop_clear ld [hli], a @@ -136,14 +136,14 @@ Func_800e0: ; 800e0 (20:40e0) ld b, $00 ld a, [wd28e] ld c, a - ld de, wBGMapBuffer - call DecompressBGMapFromBank + ld de, wDecompressionBuffer + call DecompressDataFromBank ld a, [wBGMapWidth] ld b, a pop de push de - ld hl, wBGMapBuffer + ld hl, wDecompressionBuffer call CopyBGDataToVRAMOrSRAM ld a, [wConsole] cp CONSOLE_CGB @@ -154,7 +154,7 @@ Func_800e0: ; 800e0 (20:40e0) ld a, [wBGMapWidth] ld c, a ld b, $00 - ld hl, wBGMapBuffer + ld hl, wDecompressionBuffer add hl, bc pop de push de diff --git a/src/engine/home.asm b/src/engine/home.asm index 56f4f68..7b410c8 100644 --- a/src/engine/home.asm +++ b/src/engine/home.asm @@ -1520,12 +1520,12 @@ UpdateRNGSources: ; 089b (0:089b) ret ; initilizes variables used to decompress -; BG Map data in DecompressBGMap +; data in DecompressData ; de points to the source of compressed data ; b is used as the HIGH byte of the ; WRAM address to write to ($100 bytes of buffer space) ; also clears this $100 byte space -InitBGMapDecompression: ; 08bf (0:08bf) +InitDataDecompression: ; 08bf (0:08bf) ld hl, wcad6 ld [hl], e inc hl @@ -1553,13 +1553,13 @@ InitBGMapDecompression: ; 08bf (0:08bf) jr nz, .loop ret -; decompresses BG Map data -; uses values initialized by InitBGMapDecompression +; decompresses data +; uses values initialized by InitDataDecompression ; wcad6 holds the pointer for compressed source ; input: -; bc = map width +; bc = row width ; de = buffer to place decompressed data -DecompressBGMap: ; 08de (0:08de) +DecompressData: ; 08de (0:08de) push hl push de .loop @@ -11234,17 +11234,17 @@ ResetDoFrameFunction: ; 3bdb (0:3bdb) pop hl ret -; decompresses BG Map data from a given bank -; uses values initialized by InitBGMapDecompression +; decompresses data from a given bank +; uses values initialized by InitDataDecompression ; input: -; bc = map width +; bc = row width ; de = buffer to place decompressed data -DecompressBGMapFromBank: ; 3be4 (0:3be4) +DecompressDataFromBank: ; 3be4 (0:3be4) ldh a, [hBankROM] push af ld a, [wTempPointerBank] call BankswitchROM - call DecompressBGMap + call DecompressData pop af call BankswitchROM ret diff --git a/src/wram.asm b/src/wram.asm index 8ccd57b..473ec49 100644 --- a/src/wram.asm +++ b/src/wram.asm @@ -2150,8 +2150,8 @@ wLoadedPalData:: ; d23e NEXTU -; where BG map data is decompressed -wBGMapBuffer:: ; d23e +; where BG map data or other compressed data is decompressed +wDecompressionBuffer:: ; d23e ds $40 ENDU |