aboutsummaryrefslogtreecommitdiff
path: root/playerattacks/freeze.gbasm
diff options
context:
space:
mode:
Diffstat (limited to 'playerattacks/freeze.gbasm')
-rw-r--r--playerattacks/freeze.gbasm36
1 files changed, 18 insertions, 18 deletions
diff --git a/playerattacks/freeze.gbasm b/playerattacks/freeze.gbasm
index 80e3ca1..0ce697f 100644
--- a/playerattacks/freeze.gbasm
+++ b/playerattacks/freeze.gbasm
@@ -20,34 +20,21 @@ Freeze_Attack_Loading_VBlank:
JR Z, =.Blink_Animation.dark_palette
LD A, $palette_normal
LD $mem_prepared_color_palette, A
- JR =.end
+ RET
.Blink_Animation.dark_palette:
LD A, $palette_white
LD $mem_prepared_color_palette, A
- .end:
- LD A, $mem_loading_step
- INC A
- AND $0f
- 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
Freeze_Attack_Loading_Regular:
LD A, $mem_loading_step
+ INC A
+ AND $0f
+ LD $mem_loading_step, A
CP $00
- RET Z
+ JR Z, =.end_attack
LD BC, $mem_entities_list
SLA A
@@ -101,6 +88,19 @@ Freeze_Attack_Loading_Regular:
LD (BC), A
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
+
Freeze_Attack:
LD BC, =Freeze_Attack_Loading_VBlank
LD A, B