aboutsummaryrefslogtreecommitdiff
path: root/playerattacks/earcoptr.gbasm
diff options
context:
space:
mode:
Diffstat (limited to 'playerattacks/earcoptr.gbasm')
-rw-r--r--playerattacks/earcoptr.gbasm31
1 files changed, 16 insertions, 15 deletions
diff --git a/playerattacks/earcoptr.gbasm b/playerattacks/earcoptr.gbasm
index ef6a4b5..721692e 100644
--- a/playerattacks/earcoptr.gbasm
+++ b/playerattacks/earcoptr.gbasm
@@ -1,24 +1,13 @@
Earcoptr_Attack_Loading_VBlank:
- LD A, $mem_loading_step
- INC A
- AND $1f
- LD $mem_loading_step, A
- CP $00
- RET NZ
-
- LD A, $enum_dungeon_mode
- LD $mem_current_mode, A
- LD $mem_requested_mode, A
- CALL =Update_VBlank_Handler
- LD A, $mem_map_loading_flags
- SET 3, A
- LD $mem_map_loading_flags, A
RET
Earcoptr_Attack_Loading_Regular:
LD A, $mem_loading_step
+ INC A
+ AND $1f
+ LD $mem_loading_step, A
CP $00
- RET Z
+ JR Z, =.end_attack
CP $11
RET C
@@ -76,6 +65,18 @@ Earcoptr_Attack_Loading_Regular:
RET
+ .end_attack:
+ LD A, $enum_dungeon_mode
+ LD $mem_current_mode, A
+ LD $mem_requested_mode, A
+ CALL =Update_VBlank_Handler
+
+ LD A, $mem_map_loading_flags
+ SET 3, A
+ LD $mem_map_loading_flags, A
+
+ RET
+
Earcoptr_Attack:
PUSH BC
LD A, $mem_bunny_x