diff options
| author | ElectroDeoxys <ElectroDeoxys@gmail.com> | 2021-02-03 00:01:13 +0000 |
|---|---|---|
| committer | ElectroDeoxys <ElectroDeoxys@gmail.com> | 2021-02-03 00:04:40 +0000 |
| commit | 68b8291b1920bcae99750f4bb97b7c01b73f786c (patch) | |
| tree | 134e5ee49f29c266789de1d00ce679b78153e891 /src/engine/bank20.asm | |
| parent | dc57997f0e3268e6c9a621429f01c55a96e21bc8 (diff) | |
| parent | ab9b857e68af66e8bc37628bd76dbba337971a15 (diff) | |
Merge branch 'anims' of https://github.com/ElectroDeoxys/poketcg
Diffstat (limited to 'src/engine/bank20.asm')
| -rw-r--r-- | src/engine/bank20.asm | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/src/engine/bank20.asm b/src/engine/bank20.asm index 31e6d91..9e5aa31 100644 --- a/src/engine/bank20.asm +++ b/src/engine/bank20.asm @@ -33,7 +33,7 @@ Func_80082: ; 80082 (20:4082) call Func_803b9 ld a, [wTempPointerBank] ld [wd23d], a - ld de, wd23e + ld de, wLoadedPalData ld bc, $0006 call CopyBankedDataToDE ld l, e @@ -87,7 +87,7 @@ Func_800e0: ; 800e0 (20:40e0) sla [hl] .asm_800f0 ld c, $40 - ld hl, wd23e + ld hl, wLoadedPalData xor a .asm_800f6 ld [hli], a @@ -101,13 +101,13 @@ Func_800e0: ; 800e0 (20:40e0) ld b, $00 ld a, [wd28e] ld c, a - ld de, wd23e + ld de, wLoadedPalData call Func_3be4 ld a, [wd12f] ld b, a pop de push de - ld hl, wd23e + ld hl, wLoadedPalData call Func_8016e ld a, [wConsole] cp $02 @@ -116,7 +116,7 @@ Func_800e0: ; 800e0 (20:40e0) ld a, [wd12f] ld c, a ld b, $00 - ld hl, wd23e + ld hl, wLoadedPalData add hl, bc pop de push de @@ -422,7 +422,7 @@ Func_803b9: ; 803b9 (20:43b9) ; b = palette index ; c = palette size ; hl = palette data to copy -LoadPaletteData: ; 803ec (20:43ec) +LoadPaletteDataFromHL: ; 803ec (20:43ec) push hl push bc push de @@ -466,13 +466,14 @@ LoadPaletteData: ; 803ec (20:43ec) ret ; 0x80418 -Func_80418: ; 80418 (20:4418) +; loads palette index a +LoadPaletteData: ; 80418 (20:4418) push hl push bc push de call CopyPaletteDataToBuffer - ld hl, wd23e + ld hl, wLoadedPalData ld a, [hli] ; number palettes ld c, a or a @@ -513,7 +514,7 @@ Func_80418: ; 80418 (20:4418) ; ensure it's a palette index starting from wObjectPalettesCGB or NUM_BACKGROUND_PALETTES ld b, a - call LoadPaletteData + call LoadPaletteDataFromHL .done pop de @@ -522,7 +523,7 @@ Func_80418: ; 80418 (20:4418) ret ; 0x80456 -; copies palette data of index in a to wd23e +; copies palette data of index in a to wLoadedPalData CopyPaletteDataToBuffer: ; 80456 (20:4456) push hl push bc @@ -545,7 +546,7 @@ CopyPaletteDataToBuffer: ; 80456 (20:4456) ld c, a ld b, $00 - ld de, wd23e + ld de, wLoadedPalData call CopyBankedDataToDE pop de pop bc |