Skip to content

Commit

Permalink
Player hurt function, used for getting damaged by something.
Browse files Browse the repository at this point in the history
  • Loading branch information
dustmop committed Mar 29, 2017
1 parent fb8a10e commit a64600b
Show file tree
Hide file tree
Showing 11 changed files with 57 additions and 74 deletions.
3 changes: 2 additions & 1 deletion Makefile
Expand Up @@ -58,7 +58,8 @@ SRC = gfx.asm \
sound.asm \
samples.asm \
move_trig.asm \
dynamic_star_loader.asm
dynamic_star_loader.asm \
hurt_player.asm

OBJ = $(patsubst %.asm,.b/%.o,$(SRC)) .b/trig.o

Expand Down
15 changes: 4 additions & 11 deletions blender.asm
Expand Up @@ -11,13 +11,12 @@
.include "trash_gunk.h.asm"
.include "shared_object_values.asm"
.include "draw_picture.h.asm"
.include "sound.h.asm"
.include "hurt_player.h.asm"

.importzp camera_h, camera_screen
.importzp draw_screen, draw_h, draw_v, draw_frame
.importzp player_v, player_h, player_screen
.importzp player_injury, player_iframe, player_gravity
.importzp player_gravity_low, player_health_delta
.importzp player_iframe
.importzp elec_sfx
.importzp values

Expand Down Expand Up @@ -116,14 +115,8 @@ Next:
jsr ObjectCollisionWithPlayer
bcc Next
DidCollide:
lda #SFX_GOT_HURT
jsr SoundPlay
mov player_injury, #30
mov player_iframe, #100
mov player_gravity, #$fe
mov player_gravity_low, #$00
dec player_health_delta
dec player_health_delta
ldy #2
jsr HurtPlayer
Next:
.endscope

Expand Down
15 changes: 5 additions & 10 deletions dirt.asm
Expand Up @@ -14,12 +14,13 @@
.include "sound.h.asm"
.include "random.h.asm"
.include "move_trig.h.asm"
.include "hurt_player.h.asm"

.importzp camera_h, camera_screen
.importzp player_health_delta
.importzp draw_screen, draw_h, draw_v
.importzp player_injury, player_iframe, player_gravity
.importzp player_gravity_low, player_health_delta, player_just_landed
.importzp player_iframe
.importzp player_just_landed
.importzp values

num_tiles = values + $00
Expand Down Expand Up @@ -241,14 +242,8 @@ Later:
jsr ObjectCollisionWithPlayer
bcc Next
DidCollide:
lda #SFX_GOT_HURT
jsr SoundPlay
mov player_injury, #30
mov player_iframe, #100
mov player_gravity, #$fe
mov player_gravity_low, #$00
dec player_health_delta
dec player_health_delta
ldy #2
jsr HurtPlayer
Next:
.endscope

Expand Down
6 changes: 3 additions & 3 deletions endboss.asm
Expand Up @@ -21,6 +21,7 @@
.include "include.sprites.asm"
.include "sprite_space.h.asm"
.include "memory_layout.h.asm"
.include "hurt_player.h.asm"


.importzp endboss_screen, endboss_count, endboss_state
Expand Down Expand Up @@ -238,9 +239,8 @@ PlayerOverlap:
cmp endboss_h
blt Break
; Play sound effect
lda #SFX_GOT_HURT
jsr SoundPlay
mov player_health, #0
ldy #5
jsr HurtPlayer
Break:
.endscope

Expand Down
13 changes: 4 additions & 9 deletions fly.asm
Expand Up @@ -15,13 +15,13 @@
.include "shared_object_values.asm"
.include "sound.h.asm"
.include "move_trig.h.asm"
.include "hurt_player.h.asm"

COLLISION_SWATTER_FLY_H_HITBOX = 10
COLLISION_SWATTER_FLY_V_HITBOX = 10

.importzp player_screen, player_h, player_v, player_owns_swatter
.importzp player_injury, player_iframe, player_gravity, player_gravity_low
.importzp player_health_delta
.importzp player_iframe
.importzp camera_h, camera_screen
.importzp spawn_count
.importzp draw_h, draw_v, draw_screen, draw_frame
Expand Down Expand Up @@ -234,13 +234,8 @@ Break:
bcc Next
DidCollide:
jsr ExplodeTheFly
lda #SFX_GOT_HURT
jsr SoundPlay
mov player_injury, #30
mov player_iframe, #100
mov player_gravity, #$fe
mov player_gravity_low, #$00
dec player_health_delta
ldy #1
jsr HurtPlayer
jmp Return
Next:
.endscope
Expand Down
14 changes: 4 additions & 10 deletions gunk_drop.asm
Expand Up @@ -14,13 +14,13 @@
.include "sprite_space.h.asm"
.include "shared_object_values.asm"
.include "sound.h.asm"
.include "hurt_player.h.asm"

.importzp camera_h, camera_screen
.importzp player_health_delta
.importzp draw_screen, draw_h, draw_v, draw_frame
.importzp player_v
.importzp player_injury, player_iframe, player_gravity
.importzp player_gravity_low, player_health_delta
.importzp player_iframe
.importzp gloop_sfx
.importzp values

Expand Down Expand Up @@ -111,14 +111,8 @@ Next:
jsr ObjectCollisionWithPlayer
bcc Next
DidCollide:
lda #SFX_GOT_HURT
jsr SoundPlay
mov player_injury, #30
mov player_iframe, #100
mov player_gravity, #$fe
mov player_gravity_low, #$00
dec player_health_delta
dec player_health_delta
ldy #2
jsr HurtPlayer
Next:
.endscope

Expand Down
22 changes: 22 additions & 0 deletions hurt_player.asm
@@ -0,0 +1,22 @@
.export HurtPlayer

.include "include.mov-macros.asm"
.include "sound.h.asm"

.importzp player_injury, player_iframe, player_gravity, player_gravity_low
.importzp player_health_delta

.segment "CODE"

.proc HurtPlayer
dec player_health_delta
dey
bne HurtPlayer
lda #SFX_GOT_HURT
jsr SoundPlay
mov player_injury, #30
mov player_iframe, #100
mov player_gravity, #$fe
mov player_gravity_low, #$00
rts
.endproc
1 change: 1 addition & 0 deletions hurt_player.h.asm
@@ -0,0 +1 @@
.import HurtPlayer
14 changes: 4 additions & 10 deletions toaster.asm
Expand Up @@ -11,12 +11,12 @@
.include "shared_object_values.asm"
.include "draw_picture.h.asm"
.include "sound.h.asm"
.include "hurt_player.h.asm"

.importzp camera_h, camera_screen
.importzp draw_screen, draw_h, draw_v, draw_frame
.importzp player_v
.importzp player_injury, player_iframe, player_gravity
.importzp player_gravity_low, player_health_delta
.importzp player_iframe
.importzp elec_sfx
.importzp values

Expand Down Expand Up @@ -95,14 +95,8 @@ Next:
jsr ObjectCollisionWithPlayer
bcc Next
DidCollide:
lda #SFX_GOT_HURT
jsr SoundPlay
mov player_injury, #30
mov player_iframe, #100
mov player_gravity, #$fe
mov player_gravity_low, #$00
dec player_health_delta
dec player_health_delta
ldy #2
jsr HurtPlayer
Next:
.endscope

Expand Down
13 changes: 4 additions & 9 deletions trash_gunk.asm
Expand Up @@ -15,13 +15,13 @@
.include "sprite_space.h.asm"
.include "shared_object_values.asm"
.include "sound.h.asm"
.include "hurt_player.h.asm"

.importzp camera_h, camera_screen
.importzp player_health_delta
.importzp draw_screen, draw_h, draw_v, draw_frame
.importzp player_v
.importzp player_injury, player_iframe, player_gravity
.importzp player_gravity_low, player_health_delta
.importzp player_iframe
.importzp gloop_sfx
.importzp values

Expand Down Expand Up @@ -136,13 +136,8 @@ RegularCheck:
jsr ObjectCollisionWithPlayer
bcc Next
DidCollide:
lda #SFX_GOT_HURT
jsr SoundPlay
mov player_injury, #30
mov player_iframe, #100
mov player_gravity, #$fe
mov player_gravity_low, #$00
dec player_health_delta
ldy #1
jsr HurtPlayer
Next:
.endscope

Expand Down
15 changes: 4 additions & 11 deletions utensils.asm
Expand Up @@ -9,14 +9,13 @@
.include "object_list.h.asm"
.include "sprite_space.h.asm"
.include "shared_object_values.asm"
.include "sound.h.asm"
.include "hurt_player.h.asm"

.importzp camera_h, camera_screen
.importzp player_health_delta
.importzp draw_screen, draw_h, draw_v, draw_frame
.importzp player_v
.importzp player_injury, player_iframe, player_gravity
.importzp player_gravity_low, player_health_delta
.importzp player_iframe
.importzp values

.import object_data_extend
Expand Down Expand Up @@ -62,14 +61,8 @@ Okay:
jsr ObjectCollisionWithPlayer
bcc Next
DidCollide:
lda #SFX_GOT_HURT
jsr SoundPlay
mov player_injury, #30
mov player_iframe, #100
mov player_gravity, #$fe
mov player_gravity_low, #$00
dec player_health_delta
dec player_health_delta
ldy #2
jsr HurtPlayer
Next:
.endscope

Expand Down

0 comments on commit a64600b

Please sign in to comment.