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

Label sprite and sprite constants for dugtrio bonus stage

Browse Source
This commit is contained in:
Raymond Dodge 2023-09-14 18:52:39 -04:00
parent 0e628798ba
commit 56166711cf
No known key found for this signature in database
GPG Key ID: 59073651374C1D73
3 changed files with 92 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
data/sprite_frames.asm
View File

@ -2306,20 +2306,20 @@ SpriteDataPointers2: ; 0x55d7
SpriteDataPointer SpriteData2_43, SPRITE2_DATA_43
SpriteDataPointer SpriteData2_44, SPRITE2_DATA_44
SpriteDataPointer SpriteData2_45, SPRITE2_DATA_45
SpriteDataPointer SpriteData2_46, SPRITE2_DATA_46
SpriteDataPointer SpriteData2_47, SPRITE2_DATA_47
SpriteDataPointer SpriteData2_48, SPRITE2_DATA_48
SpriteDataPointer SpriteData2_49, SPRITE2_DATA_49
SpriteDataPointer SpriteData2_4a, SPRITE2_DATA_4a
SpriteDataPointer SpriteData2_4b, SPRITE2_DATA_4b
SpriteDataPointer SpriteData2_4c, SPRITE2_DATA_4c
SpriteDataPointer SpriteData2_4d, SPRITE2_DATA_4d
SpriteDataPointer SpriteData2_4e, SPRITE2_DATA_4e
SpriteDataPointer SpriteData2_4f, SPRITE2_DATA_4f
SpriteDataPointer SpriteData2_50, SPRITE2_DATA_50
SpriteDataPointer SpriteData2_51, SPRITE2_DATA_51
SpriteDataPointer SpriteData2_52, SPRITE2_DATA_52
SpriteDataPointer SpriteData2_53, SPRITE2_DATA_53
SpriteDataPointer DugtrioHealth3Frame0Sprite, SPRITE2_DUGTRIO_HEALTH3_FRAME0
SpriteDataPointer DugtrioHealth3Frame1Sprite, SPRITE2_DUGTRIO_HEALTH3_FRAME1
SpriteDataPointer DugtrioHealth3Frame2Sprite, SPRITE2_DUGTRIO_HEALTH3_FRAME2
SpriteDataPointer DugtrioHealth3HitSprite, SPRITE2_DUGTRIO_HEALTH3_HIT
SpriteDataPointer DugtrioHealth2Frame0Sprite, SPRITE2_DUGTRIO_HEALTH2_FRAME0
SpriteDataPointer DugtrioHealth2Frame1Sprite, SPRITE2_DUGTRIO_HEALTH2_FRAME1
SpriteDataPointer DugtrioHealth2Frame2Sprite, SPRITE2_DUGTRIO_HEALTH2_FRAME2
SpriteDataPointer DugtrioHealth2HitSprite, SPRITE2_DUGTRIO_HEALTH2_HIT
SpriteDataPointer DugtrioHealth1Frame0Sprite, SPRITE2_DUGTRIO_HEALTH1_FRAME0
SpriteDataPointer DugtrioHealth1Frame1Sprite, SPRITE2_DUGTRIO_HEALTH1_FRAME1
SpriteDataPointer DugtrioHealth1Frame2Sprite, SPRITE2_DUGTRIO_HEALTH1_FRAME2
SpriteDataPointer DugtrioHealth1HitSprite, SPRITE2_DUGTRIO_HEALTH1_HIT
SpriteDataPointer DroppedDugtrioSprite, SPRITE2_DUGTRIO_DROPPED
SpriteDataPointer DefeatedDugtrioSprite, SPRITE2_DUGTRIO_DEFEATED
SpriteDataPointer SpriteData2_54, SPRITE2_DATA_54
SpriteDataPointer SpriteData2_55, SPRITE2_DATA_55
SpriteDataPointer SpriteData2_56, SPRITE2_DATA_56
@ -3007,7 +3007,7 @@ SpriteData2_45: ; 0x
db $10, $08, $DE, $00
db $80 ; terminator
SpriteData2_46: ; 0x
DugtrioHealth3Frame0Sprite: ; 0x
db $20, $20, $9E, $11
db $20, $18, $9C, $11
db $20, $10, $9A, $11
@ -3018,7 +3018,7 @@ SpriteData2_46: ; 0x
db $10, $08, $90, $11
db $80 ; terminator
SpriteData2_47: ; 0x
DugtrioHealth3Frame1Sprite: ; 0x
db $20, $20, $1E, $11
db $20, $18, $1C, $11
db $20, $10, $1A, $11
@ -3029,7 +3029,7 @@ SpriteData2_47: ; 0x
db $10, $08, $A0, $11
db $80 ; terminator
SpriteData2_48: ; 0x
DugtrioHealth3Frame2Sprite: ; 0x
db $20, $20, $9E, $11
db $10, $20, $96, $11
db $20, $10, $1A, $11
@ -3040,7 +3040,7 @@ SpriteData2_48: ; 0x
db $10, $10, $20, $11
db $80 ; terminator
SpriteData2_49: ; 0x
DugtrioHealth3HitSprite: ; 0x
db $10, $08, $A0, $11
db $20, $20, $32, $11
db $20, $18, $30, $11
@ -3051,7 +3051,7 @@ SpriteData2_49: ; 0x
db $10, $10, $26, $11
db $80 ; terminator
SpriteData2_4a: ; 0x
DugtrioHealth2Frame0Sprite: ; 0x
db $20, $18, $AA, $11
db $20, $10, $7E, $11
db $10, $18, $7C, $11
@ -3062,7 +3062,7 @@ SpriteData2_4a: ; 0x
db $10, $08, $90, $11
db $80 ; terminator
SpriteData2_4b: ; 0x
DugtrioHealth2Frame1Sprite: ; 0x
db $20, $18, $B2, $11
db $20, $10, $B0, $11
db $10, $18, $AE, $11
@ -3073,7 +3073,7 @@ SpriteData2_4b: ; 0x
db $10, $08, $A0, $11
db $80 ; terminator
SpriteData2_4c: ; 0x
DugtrioHealth2Frame2Sprite: ; 0x
db $20, $10, $B0, $11
db $10, $10, $AC, $11
db $20, $18, $AA, $11
@ -3084,7 +3084,7 @@ SpriteData2_4c: ; 0x
db $10, $08, $A0, $11
db $80 ; terminator
SpriteData2_4d: ; 0x
DugtrioHealth2HitSprite: ; 0x
db $20, $18, $BA, $11
db $20, $10, $B8, $11
db $10, $18, $B6, $11
@ -3095,7 +3095,7 @@ SpriteData2_4d: ; 0x
db $10, $20, $2A, $11
db $80 ; terminator
SpriteData2_4e: ; 0x
DugtrioHealth1Frame0Sprite: ; 0x
db $20, $20, $C2, $11
db $20, $18, $C0, $11
db $10, $20, $BE, $11
@ -3106,7 +3106,7 @@ SpriteData2_4e: ; 0x
db $10, $08, $90, $11
db $80 ; terminator
SpriteData2_4f: ; 0x
DugtrioHealth1Frame1Sprite: ; 0x
db $20, $10, $B0, $11
db $10, $10, $AC, $11
db $20, $08, $A8, $11
@ -3117,7 +3117,7 @@ SpriteData2_4f: ; 0x
db $10, $18, $BC, $11
db $80 ; terminator
SpriteData2_50: ; 0x
DugtrioHealth1Frame2Sprite: ; 0x
db $20, $10, $B0, $11
db $10, $10, $AC, $11
db $20, $08, $A8, $11
@ -3128,7 +3128,7 @@ SpriteData2_50: ; 0x
db $10, $18, $BC, $11
db $80 ; terminator
SpriteData2_51: ; 0x
DugtrioHealth1HitSprite: ; 0x
db $20, $20, $CA, $11
db $20, $18, $C8, $11
db $10, $20, $C6, $11
@ -3139,7 +3139,7 @@ SpriteData2_51: ; 0x
db $20, $08, $2C, $11
db $80 ; terminator
SpriteData2_52: ; 0x
DroppedDugtrioSprite:
db $20, $08, $38, $11
db $10, $18, $36, $11
db $10, $10, $34, $11
@ -3148,7 +3148,7 @@ SpriteData2_52: ; 0x
db $20, $10, $3A, $11
db $80 ; terminator
SpriteData2_53: ; 0x
DefeatedDugtrioSprite: ; 0x
db $20, $10, $CE, $11
db $20, $08, $CC, $11
db $20, $20, $C2, $11

25
engine/pinball_game/draw_sprites/draw_diglett_bonus_sprites.asm
View File

@ -16,13 +16,32 @@ DrawDugtrio: ; 0x1acb0
ld a, [wDugtrioAnimationFrame]
ld e, a
ld d, $0
ld hl, SpriteIds_1accf
ld hl, DugtrioSpriteIds
add hl, de
ld a, [hl]
bit 7, a
call z, LoadSpriteData2
ret
SpriteIds_1accf:
db $46, $47, $48, $49, $4A, $4B, $4C, $4D, $4E, $4F, $50, $51, $52, $53
DEF const_value = 0
MACRO DugtrioSpriteId
const \2
db \1
ENDM
DugtrioSpriteIds:
DugtrioSpriteId SPRITE2_DUGTRIO_HEALTH3_FRAME0, DUGTRIOSPRITE_HEALTH3_FRAME0
DugtrioSpriteId SPRITE2_DUGTRIO_HEALTH3_FRAME1, DUGTRIOSPRITE_HEALTH3_FRAME1
DugtrioSpriteId SPRITE2_DUGTRIO_HEALTH3_FRAME2, DUGTRIOSPRITE_HEALTH3_FRAME2
DugtrioSpriteId SPRITE2_DUGTRIO_HEALTH3_HIT, DUGTRIOSPRITE_HEALTH3_HIT
DugtrioSpriteId SPRITE2_DUGTRIO_HEALTH2_FRAME0, DUGTRIOSPRITE_HEALTH2_FRAME0
DugtrioSpriteId SPRITE2_DUGTRIO_HEALTH2_FRAME1, DUGTRIOSPRITE_HEALTH2_FRAME1
DugtrioSpriteId SPRITE2_DUGTRIO_HEALTH2_FRAME2, DUGTRIOSPRITE_HEALTH2_FRAME2
DugtrioSpriteId SPRITE2_DUGTRIO_HEALTH2_HIT, DUGTRIOSPRITE_HEALTH2_HIT
DugtrioSpriteId SPRITE2_DUGTRIO_HEALTH1_FRAME0, DUGTRIOSPRITE_HEALTH1_FRAME0
DugtrioSpriteId SPRITE2_DUGTRIO_HEALTH1_FRAME1, DUGTRIOSPRITE_HEALTH1_FRAME1
DugtrioSpriteId SPRITE2_DUGTRIO_HEALTH1_FRAME2, DUGTRIOSPRITE_HEALTH1_FRAME2
DugtrioSpriteId SPRITE2_DUGTRIO_HEALTH1_HIT, DUGTRIOSPRITE_HEALTH1_HIT
DugtrioSpriteId SPRITE2_DUGTRIO_DROPPED, DUGTRIOSPRITE_DROPPED
DugtrioSpriteId SPRITE2_DUGTRIO_DEFEATED, DUGTRIOSPRITE_DEFEATED
db $FF

84
engine/pinball_game/object_collision/diglett_bonus_resolve_collision.asm
View File

@ -179,7 +179,7 @@ Func_19c52: ; 0x19c52
ld a, c
cp NUM_DIGLETTS
jr nz, .asm_19cc8
ld hl, AnimationData_1ac75
ld hl, AnimationData_DugtrioHealth3
ld de, wDugtrioAnimation
call InitAnimation
ld a, $1
@ -607,7 +607,7 @@ Func_1aad4: ; 0x1aad4
sla a
ld c, a
ld b, $0
ld hl, AnimationDataPointers_1ac62
ld hl, AnimationDataPointers_Dugtrio
add hl, bc
ld a, [hli]
ld h, [hl]
@ -638,7 +638,7 @@ Func_1ab30: ; 0x1ab30
sla a
ld c, a
ld b, $0
ld hl, AnimationDataPointers_1ac62
ld hl, AnimationDataPointers_Dugtrio
add hl, bc
ld a, [hli]
ld h, [hl]
@ -654,7 +654,7 @@ Func_1ab30: ; 0x1ab30
ld a, [wDugtrioAnimationIndex]
cp $3
ret nz
ld hl, AnimationData_1ac75
ld hl, AnimationData_DugtrioHealth3
ld de, wDugtrioAnimation
call InitAnimation
ld a, $1
@ -667,7 +667,7 @@ Func_1ab30: ; 0x1ab30
ld a, [wDugtrioAnimationIndex]
cp $1
ret nz
ld hl, AnimationData_1ac7f
ld hl, AnimationData_DugtrioHealth2
ld de, wDugtrioAnimation
call InitAnimation
ld a, $3
@ -680,7 +680,7 @@ Func_1ab30: ; 0x1ab30
ld a, [wDugtrioAnimationIndex]
cp $3
ret nz
ld hl, AnimationData_1ac7f
ld hl, AnimationData_DugtrioHealth2
ld de, wDugtrioAnimation
call InitAnimation
ld a, $3
@ -693,7 +693,7 @@ Func_1ab30: ; 0x1ab30
ld a, [wDugtrioAnimationIndex]
cp $1
ret nz
ld hl, AnimationData_1ac89
ld hl, AnimationData_DugtrioHealth1
ld de, wDugtrioAnimation
call InitAnimation
ld a, $5
@ -706,7 +706,7 @@ Func_1ab30: ; 0x1ab30
ld a, [wDugtrioAnimationIndex]
cp $3
ret nz
ld hl, AnimationData_1ac89
ld hl, AnimationData_DugtrioHealth1
ld de, wDugtrioAnimation
call InitAnimation
ld a, $5
@ -719,7 +719,7 @@ Func_1ab30: ; 0x1ab30
ld a, [wDugtrioAnimationIndex]
cp $1
ret nz
ld hl, AnimationData_1ac93
ld hl, AnimationData_DugtrioDefeated
ld de, wDugtrioAnimation
call InitAnimation
ld a, $7
@ -739,7 +739,7 @@ Func_1ab30: ; 0x1ab30
.asm_1abf2
cp $2
ret nz
ld hl, AnimationData_1ac72
ld hl, AnimationData_DugtrioDropped
ld de, wDugtrioAnimation
call InitAnimation
xor a
@ -797,59 +797,59 @@ Data_1ac56:
db $02, $02, $02, $02
db $02, $02, $02, $02
AnimationDataPointers_1ac62: ; 0x1ac62
dw AnimationData_1ac72
dw AnimationData_1ac75
dw AnimationData_1ac7c
dw AnimationData_1ac7f
dw AnimationData_1ac86
dw AnimationData_1ac89
dw AnimationData_1ac90
dw AnimationData_1ac93
AnimationDataPointers_Dugtrio: ; 0x1ac62
dw AnimationData_DugtrioDropped
dw AnimationData_DugtrioHealth3
dw AnimationData_DugtrioHealth3Hit
dw AnimationData_DugtrioHealth2
dw AnimationData_DugtrioHealth2Hit
dw AnimationData_DugtrioHealth1
dw AnimationData_DugtrioHealth1Hit
dw AnimationData_DugtrioDefeated
AnimationData_1ac72: ; 0x1ac72
AnimationData_DugtrioDropped: ; 0x1ac72
; Each entry is [duration][sprite id]
db $01, $0C
db $01, DUGTRIOSPRITE_DROPPED
db $00 ; terminator
AnimationData_1ac75: ; 0x1ac75
AnimationData_DugtrioHealth3: ; 0x1ac75
; Each entry is [duration][sprite id]
db $0E, $00
db $0E, $01
db $0E, $02
db $0E, DUGTRIOSPRITE_HEALTH3_FRAME0
db $0E, DUGTRIOSPRITE_HEALTH3_FRAME1
db $0E, DUGTRIOSPRITE_HEALTH3_FRAME2
db $00 ; terminator
AnimationData_1ac7c: ; 0x1ac7c
AnimationData_DugtrioHealth3Hit: ; 0x1ac7c
; Each entry is [duration][sprite id]
db $0D, $03
db $0D, DUGTRIOSPRITE_HEALTH3_HIT
db $00 ; terminator
AnimationData_1ac7f: ; 0x1ac7f
AnimationData_DugtrioHealth2: ; 0x1ac7f
; Each entry is [duration][sprite id]
db $0E, $04
db $0E, $05
db $0E, $06
db $0E, DUGTRIOSPRITE_HEALTH2_FRAME0
db $0E, DUGTRIOSPRITE_HEALTH2_FRAME1
db $0E, DUGTRIOSPRITE_HEALTH2_FRAME2
db $00
AnimationData_1ac86: ; 0x1ac86
AnimationData_DugtrioHealth2Hit: ; 0x1ac86
; Each entry is [duration][sprite id]
db $0D, $07
db $0D, DUGTRIOSPRITE_HEALTH2_HIT
db $00 ; terminator
AnimationData_1ac89: ; 0x1ac89
AnimationData_DugtrioHealth1: ; 0x1ac89
; Each entry is [duration][sprite id]
db $0E, $08
db $0E, $09
db $0E, $0A
db $0E, DUGTRIOSPRITE_HEALTH1_FRAME0
db $0E, DUGTRIOSPRITE_HEALTH1_FRAME1
db $0E, DUGTRIOSPRITE_HEALTH1_FRAME2
db $00
AnimationData_1ac90: ; 0x1ac90
AnimationData_DugtrioHealth1Hit: ; 0x1ac90
; Each entry is [duration][sprite id]
db $0D, $0B
db $0D, DUGTRIOSPRITE_HEALTH1_HIT
db $00 ; terminator
AnimationData_1ac93: ; 0x1ac93
AnimationData_DugtrioDefeated: ; 0x1ac93
; Each entry is [duration][sprite id]
db $01, $0D
db $40, $0D
db $01, DUGTRIOSPRITE_DEFEATED
db $40, DUGTRIOSPRITE_DEFEATED
db $00 ; terminator