aboutsummaryrefslogtreecommitdiff
path: root/playerattacks
diff options
context:
space:
mode:
authorAstatin <[email protected]>2025-02-18 19:03:42 +0900
committerAstatin <[email protected]>2025-02-18 19:03:42 +0900
commit18d7d064daf704193f8dff6b2ef3ae68b7fc3aac (patch)
tree9af417ec9a09294edec8ca0e5ffbd146a0081b4b /playerattacks
parentf4197f6117b7cc16873fca749c0dcb838577a7e5 (diff)
Did a bunch of things I honestly don't remember everything but now basic attack is broken
Diffstat (limited to 'playerattacks')
-rw-r--r--playerattacks/earcoptr.gbasm19
-rw-r--r--playerattacks/heal.gbasm3
2 files changed, 18 insertions, 4 deletions
diff --git a/playerattacks/earcoptr.gbasm b/playerattacks/earcoptr.gbasm
index 123ec86..cc47672 100644
--- a/playerattacks/earcoptr.gbasm
+++ b/playerattacks/earcoptr.gbasm
@@ -51,10 +51,6 @@ Earcoptr_Attack_Loading_Regular:
RET NC
INC C
- LD A, (BC)
- AND $0f
- OR $50
- LD (BC), A
LD A, C
ADD $03
@@ -63,6 +59,18 @@ Earcoptr_Attack_Loading_Regular:
SUB $01
RET C
LD (BC), A
+
+ INC C
+ LD A, (BC)
+ SET 3, A
+ LD (BC), A
+
+ LD A, $mem_moving_animation_step
+ LD B, A
+ LD A, $1f
+ SUB B
+ LD $mem_blinking_animation_counter, A
+
RET
Earcoptr_Attack:
@@ -72,8 +80,11 @@ Earcoptr_Attack:
LD A, $mem_bunny_y
LD C, A
LD A, $02
+ PUSH DE
LD E, $30
+ LD D, $00
CALL =Try_Launch_Animation
+ POP DE
POP BC
LD BC, =Earcoptr_Attack_Loading_VBlank
diff --git a/playerattacks/heal.gbasm b/playerattacks/heal.gbasm
index 789afac..72f83fe 100644
--- a/playerattacks/heal.gbasm
+++ b/playerattacks/heal.gbasm
@@ -14,8 +14,11 @@ Heal_Attack:
LD A, $mem_bunny_y
LD C, A
LD A, $01
+ PUSH DE
LD E, $20
+ LD D, $00
CALL =Try_Launch_Animation
+ POP DE
POP BC
LD A, $enum_dungeon_mode