diff options
Diffstat (limited to 'engine/movie/splash.asm')
| -rw-r--r-- | engine/movie/splash.asm | 52 |
1 files changed, 36 insertions, 16 deletions
diff --git a/engine/movie/splash.asm b/engine/movie/splash.asm index eede8ccb..0b14dcaa 100644 --- a/engine/movie/splash.asm +++ b/engine/movie/splash.asm @@ -3,9 +3,11 @@ LoadShootingStarGraphics: ldh [rOBP0], a ld a, $a4 ldh [rOBP1], a + call UpdateGBCPal_OBP0 + call UpdateGBCPal_OBP1 ld de, AnimationTileset2 tile 3 ; star tile (top left quadrant) ld hl, vChars1 tile $20 - lb bc, BANK(AnimationTileset2), 1 + lb bc, BANK(AnimationTileset2), $01 call CopyVideoData ld de, AnimationTileset2 tile 19 ; star tile (bottom left quadrant) ld hl, vChars1 tile $21 @@ -75,6 +77,7 @@ AnimateShootingStar: ld hl, rOBP0 rrc [hl] rrc [hl] + call UpdateGBCPal_OBP0 ld c, 10 call CheckForUserInterruption ret c @@ -118,6 +121,15 @@ AnimateShootingStar: ld [hli], a ; X inc de inc hl + push bc + ld a, [de] + ld b, a + ld a, [hl] + and $f0 + or b + ld [hl], a + inc de + pop bc inc hl dec c jr nz, .smallStarsInnerLoop @@ -162,24 +174,32 @@ SmallStarsWaveCoordsPointerTable: SmallStarsWave1Coords: db $68, $30 - db $68, $40 + db $05, $68 + db $40, $05 db $68, $58 - db $68, $78 + db $04, $68 + db $78, $07 SmallStarsWave2Coords: db $68, $38 - db $68, $48 + db $05, $68 + db $48, $06 db $68, $60 - db $68, $70 + db $04, $68 + db $70, $07 SmallStarsWave3Coords: db $68, $34 - db $68, $4C + db $05, $68 + db $4c, $06 db $68, $54 - db $68, $64 + db $06, $68 + db $64, $07 SmallStarsWave4Coords: - db $68, $3C - db $68, $5C - db $68, $6C - db $68, $74 + db $68, $3c + db $05, $68 + db $5c, $04 + db $68, $6c + db $07, $68 + db $74, $07 SmallStarsEmptyWave: db -1 ; end @@ -200,7 +220,7 @@ MoveDownSmallStars: ldh a, [rOBP1] xor %10100000 ldh [rOBP1], a - + call UpdateGBCPal_OBP1 ld c, 3 call CheckForUserInterruption ret c @@ -228,10 +248,10 @@ GameFreakLogoOAMData: GameFreakLogoOAMDataEnd: GameFreakShootingStarOAMData: - dbsprite 20, 0, 0, 0, $a0, OAM_OBP1 - dbsprite 21, 0, 0, 0, $a0, OAM_OBP1 | OAM_HFLIP - dbsprite 20, 1, 0, 0, $a1, OAM_OBP1 - dbsprite 21, 1, 0, 0, $a1, OAM_OBP1 | OAM_HFLIP + dbsprite 20, 0, 0, 0, $a0, OAM_OBP1 | OAM_HIGH_PALS + dbsprite 21, 0, 0, 0, $a0, OAM_OBP1 | OAM_HIGH_PALS | OAM_HFLIP + dbsprite 20, 1, 0, 0, $a1, OAM_OBP1 | OAM_HIGH_PALS + dbsprite 21, 1, 0, 0, $a1, OAM_OBP1 | OAM_HIGH_PALS | OAM_HFLIP GameFreakShootingStarOAMDataEnd: FallingStar: |