diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-05 15:07:37 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-05 15:07:37 -0400 |
| commit | 8c265476455c4793d263c7f2e6386904fbd3e305 (patch) | |
| tree | 2cc2f5e077e3494c0a0dce3276dcae4f609e9696 /engine/color.asm | |
| parent | a613ed915c32d3befec54a98dae98e21649e19ce (diff) | |
Mobile and more battle anims
Diffstat (limited to 'engine/color.asm')
| -rw-r--r-- | engine/color.asm | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/engine/color.asm b/engine/color.asm index faf102867..74d194176 100644 --- a/engine/color.asm +++ b/engine/color.asm @@ -138,6 +138,7 @@ Function8b07: ; Unreferenced call CheckCGB ret z +; CGB only ld hl, .BGPal ld de, UnknBGPals ld bc, 1 palettes @@ -534,9 +535,9 @@ CopyPalettes: GetPredefPal: ld l, a ld h, $0 -rept 3 ; multiply by 8 add hl, hl -endr + add hl, hl + add hl, hl ld bc, Palettes_9df6 add hl, bc ret @@ -924,9 +925,10 @@ PushSGBPals: jr nz, .loop ret -Function9853: +InitSGBBorder: call CheckCGB ret nz +; SGB/DMG only di ld a, [wcfbe] push af @@ -936,7 +938,7 @@ Function9853: ld [rJOYP], a ld [hSGB], a call Function994a - jr nc, .asm_988a + jr nc, .skip ld a, $1 ld [hSGB], a call Function98eb @@ -949,15 +951,16 @@ Function9853: ld hl, PalPacket_9d66 call PushSGBPals -.asm_988a +.skip pop af ld [wcfbe], a ei ret -Function9890:: +InitCGBPals:: call CheckCGB ret z +; CGB only ld a, $1 ld [rVBK], a ld hl, VTiles0 @@ -1123,7 +1126,7 @@ Function99ab: Function99b4: call DisableLCD - ld a, $e4 + ld a, %11100100 ld [rBGP], a ld hl, Palettes_9df6 ld de, VTiles1 @@ -1198,25 +1201,27 @@ Function9a24: CopyData: ; 0x9a52 ; copy bc bytes of data from hl to de +.loop ld a, [hli] ld [de], a inc de dec bc ld a, c or b - jr nz, CopyData + jr nz, .loop ret ; 0x9a5b ClearBytes: ; 0x9a5b ; clear bc bytes of data starting from de +.loop xor a ld [de], a inc de dec bc ld a, c or b - jr nz, ClearBytes + jr nz, .loop ret ; 0x9a64 |