Leahnaya/pokepinball
1
0
Fork 0
mirror of https://github.com/pret/pokepinball.git synced 2026-04-25 23:36:59 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Label sprites related to flippers

Browse Source
This commit is contained in:
Raymond Dodge 2023-09-15 05:08:59 -04:00
parent 6135620da7
commit 0ff4d2e01c
No known key found for this signature in database
GPG Key ID: 59073651374C1D73
2 changed files with 64 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
data/sprite_frames.asm
View File

@ -15,12 +15,12 @@ SpriteDataPointers: ; 0x4000
SpriteDataPointer BallSpin6Sprite, SPRITE_BALL_SPIN_6
SpriteDataPointer BallSpin7Sprite, SPRITE_BALL_SPIN_7
DEF SPRITE_BALL_SPIN_COUNT = const_value - SPRITE_BALL_SPIN
SpriteDataPointer SpriteData_8, SPRITE_DATA_8
SpriteDataPointer SpriteData_9, SPRITE_DATA_9
SpriteDataPointer SpriteData_a, SPRITE_DATA_a
SpriteDataPointer SpriteData_b, SPRITE_DATA_b
SpriteDataPointer SpriteData_c, SPRITE_DATA_c
SpriteDataPointer SpriteData_d, SPRITE_DATA_d
SpriteDataPointer RightFlipperDownSprite, SPRITE_RIGHTFLIPPER_DOWN
SpriteDataPointer RightFlipperHorizontalSprite, SPRITE_RIGHTFLIPPER_HORIZONTAL
SpriteDataPointer RightFlipperUpSprite, SPRITE_RIGHTFLIPPER_UP
SpriteDataPointer LeftFlipperDownSprite, SPRITE_LEFTFLIPPER_DOWN
SpriteDataPointer LeftFlipperHorizontalSprite, SPRITE_LEFTFLIPPER_HORIZONTAL
SpriteDataPointer LeftFlipperUpSprite, SPRITE_LEFTFLIPPER_UP
SpriteDataPointer PikachuSaverAnimationFrame0Sprite, SPRITE_PIKACHU_SAVER_0
SpriteDataPointer PikachuSaverAnimationFrame1Sprite, SPRITE_PIKACHU_SAVER_1
SpriteDataPointer PikachuSaverAnimationFrame2Sprite, SPRITE_PIKACHU_SAVER_2
@ -30,8 +30,8 @@ SpriteDataPointers: ; 0x4000
SpriteDataPointer PikachuSaverAnimationFrame6Sprite, SPRITE_PIKACHU_SAVER_6
SpriteDataPointer PikachuSaverAnimationFrame7Sprite, SPRITE_PIKACHU_SAVER_7
SpriteDataPointer PikachuSaverAnimationFrame8Sprite, SPRITE_PIKACHU_SAVER_8
SpriteDataPointer SpriteData_17, SPRITE_DATA_17
SpriteDataPointer SpriteData_18, SPRITE_DATA_18
SpriteDataPointer RightFlipperDisabledSprite, SPRITE_RIGHTFLIPPER_DISABLED
SpriteDataPointer LeftFlipperDisabledSprite, SPRITE_LEFTFLIPPER_DISABLED
SpriteDataPointer BallCaptureFrame0Sprite, SPRITE_BALL_CAPTURE_0
SpriteDataPointer BallCaptureFrame1Sprite, SPRITE_BALL_CAPTURE_1
SpriteDataPointer BallCaptureFrame2Sprite, SPRITE_BALL_CAPTURE_2
@ -303,37 +303,37 @@ BallSpin7Sprite: ; 0x4231
db $08, $00, $5c, $00
db $80 ; terminator
SpriteData_8: ; 0x423a
RightFlipperDownSprite: ; 0x423a
db $0c, $05, $64, $02
db $0a, $fd, $62, $02
db $14, $f5, $60, $02
db $80 ; terminator
SpriteData_9: ; 0x4247
RightFlipperHorizontalSprite: ; 0x4247
db $0c, $05, $6a, $02
db $04, $fd, $68, $02
db $0c, $f5, $66, $02
db $80 ; terminator
SpriteData_a: ; 0x4254
RightFlipperUpSprite: ; 0x4254
db $0a, $05, $70, $02
db $03, $fd, $6e, $02
db $fd, $f5, $6c, $02
db $80 ; terminator
SpriteData_b: ; 0x4261
LeftFlipperDownSprite: ; 0x4261
db $0c, $03, $64, $22
db $0a, $0b, $62, $22
db $14, $13, $60, $22
db $80 ; terminator
SpriteData_c: ; 0x426e
LeftFlipperHorizontalSprite: ; 0x426e
db $0c, $03, $6a, $22
db $04, $0b, $68, $22
db $0c, $13, $66, $22
db $80 ; terminator
SpriteData_d: ; 0x427b
LeftFlipperUpSprite: ; 0x427b
db $0a, $03, $70, $22
db $03, $0b, $6e, $22
db $fd, $13, $6c, $22
@ -404,13 +404,13 @@ PikachuSaverAnimationFrame8Sprite: ; 0x4310
db $00, $01, $7a, $04
db $80 ; terminator
SpriteData_17: ; 0x4329
RightFlipperDisabledSprite: ; 0x4329
db $0c, $05, $64, $11
db $0a, $fd, $62, $11
db $14, $f5, $60, $11
db $80 ; terminator
SpriteData_18: ; 0x4336
LeftFlipperDisabledSprite: ; 0x4336
db $0c, $03, $64, $31
db $0a, $0b, $62, $31
db $14, $13, $60, $31

60
engine/pinball_game/flippers.asm
View File

@ -694,7 +694,7 @@ DrawFlippers: ; 0xe4a1
ld d, $0
add hl, de
ld a, [hl]
cp $b
cp SPRITE_LEFTFLIPPER_DOWN
jr nz, .asm_e4d6
ld a, [hGameBoyColorFlag]
and a
@ -702,11 +702,11 @@ DrawFlippers: ; 0xe4a1
ld a, [wFlippersDisabled]
and a
jr z, .asm_e4d4
ld a, $18
ld a, SPRITE_LEFTFLIPPER_DISABLED
jr .asm_e4d6
.asm_e4d4
ld a, $b
ld a, SPRITE_LEFTFLIPPER_DOWN
.asm_e4d6
call LoadSpriteData
pop hl
@ -726,7 +726,7 @@ DrawFlippers: ; 0xe4a1
ld d, $0
add hl, de
ld a, [hl]
cp $8
cp SPRITE_RIGHTFLIPPER_DOWN
jr nz, .asm_e506
ld a, [hGameBoyColorFlag]
and a
@ -734,11 +734,11 @@ DrawFlippers: ; 0xe4a1
ld a, [wFlippersDisabled]
and a
jr z, .asm_e504
ld a, $17
ld a, SPRITE_RIGHTFLIPPER_DISABLED
jr .asm_e506
.asm_e504
ld a, $8
ld a, SPRITE_RIGHTFLIPPER_DOWN
.asm_e506
call LoadSpriteData
ret
@ -751,14 +751,50 @@ FlippersSpritePixelOffsetData:
LeftFlipperSpriteIds:
; TODO: Don't know how exactly these are used, but it is used by the animation
; when the flipper is activated and rotates upward to hit the pinball.
db $0b, $0b, $0b, $0b, $0b, $0b, $0b
db $0c, $0c, $0c, $0c, $0c, $0c, $0c
db $0d, $0d, $0d, $0d, $0d, $0d, $0d
db SPRITE_LEFTFLIPPER_DOWN
db SPRITE_LEFTFLIPPER_DOWN
db SPRITE_LEFTFLIPPER_DOWN
db SPRITE_LEFTFLIPPER_DOWN
db SPRITE_LEFTFLIPPER_DOWN
db SPRITE_LEFTFLIPPER_DOWN
db SPRITE_LEFTFLIPPER_DOWN
db SPRITE_LEFTFLIPPER_HORIZONTAL
db SPRITE_LEFTFLIPPER_HORIZONTAL
db SPRITE_LEFTFLIPPER_HORIZONTAL
db SPRITE_LEFTFLIPPER_HORIZONTAL
db SPRITE_LEFTFLIPPER_HORIZONTAL
db SPRITE_LEFTFLIPPER_HORIZONTAL
db SPRITE_LEFTFLIPPER_HORIZONTAL
db SPRITE_LEFTFLIPPER_UP
db SPRITE_LEFTFLIPPER_UP
db SPRITE_LEFTFLIPPER_UP
db SPRITE_LEFTFLIPPER_UP
db SPRITE_LEFTFLIPPER_UP
db SPRITE_LEFTFLIPPER_UP
db SPRITE_LEFTFLIPPER_UP
RightFlipperSpriteIds:
db $08, $08, $08, $08, $08, $08, $08
db $09, $09, $09, $09, $09, $09, $09
db $0A, $0A, $0A, $0A, $0A, $0A, $0A
db SPRITE_RIGHTFLIPPER_DOWN
db SPRITE_RIGHTFLIPPER_DOWN
db SPRITE_RIGHTFLIPPER_DOWN
db SPRITE_RIGHTFLIPPER_DOWN
db SPRITE_RIGHTFLIPPER_DOWN
db SPRITE_RIGHTFLIPPER_DOWN
db SPRITE_RIGHTFLIPPER_DOWN
db SPRITE_RIGHTFLIPPER_HORIZONTAL
db SPRITE_RIGHTFLIPPER_HORIZONTAL
db SPRITE_RIGHTFLIPPER_HORIZONTAL
db SPRITE_RIGHTFLIPPER_HORIZONTAL
db SPRITE_RIGHTFLIPPER_HORIZONTAL
db SPRITE_RIGHTFLIPPER_HORIZONTAL
db SPRITE_RIGHTFLIPPER_HORIZONTAL
db SPRITE_RIGHTFLIPPER_UP
db SPRITE_RIGHTFLIPPER_UP
db SPRITE_RIGHTFLIPPER_UP
db SPRITE_RIGHTFLIPPER_UP
db SPRITE_RIGHTFLIPPER_UP
db SPRITE_RIGHTFLIPPER_UP
db SPRITE_RIGHTFLIPPER_UP
; See CalculateFlipperYForce to see how these magnitudes are used.
; Each entry corresponds to a distance from the flipper's rotation point.