aboutsummaryrefslogtreecommitdiff
path: root/attacks
diff options
context:
space:
mode:
Diffstat (limited to 'attacks')
-rw-r--r--attacks/freeze.gbasm12
-rw-r--r--attacks/heal.gbasm4
-rw-r--r--attacks/hop.gbasm14
3 files changed, 15 insertions, 15 deletions
diff --git a/attacks/freeze.gbasm b/attacks/freeze.gbasm
index fa83d03..936bf47 100644
--- a/attacks/freeze.gbasm
+++ b/attacks/freeze.gbasm
@@ -6,10 +6,10 @@ Freeze_Attack_Loading_VBlank:
AND $03
BIT 1, A
RES 1, A
- JR NZ, =Freeze_Attack_Loading_VBlank.Shaking_Animation.skip_invert
+ JR NZ, =.Shaking_Animation.skip_invert
CPL
INC A
- Freeze_Attack_Loading_VBlank.Shaking_Animation.skip_invert:
+ .Shaking_Animation.skip_invert:
ADD B
LD $mem_prepared_viewport_x, A
@@ -17,16 +17,16 @@ Freeze_Attack_Loading_VBlank:
SRA A
SRA A
BIT 0, A
- JR Z, =Freeze_Attack_Loading_VBlank.Blink_Animation.dark_palette
+ JR Z, =.Blink_Animation.dark_palette
LD A, $palette_normal
LD $mem_prepared_color_palette, A
- JR =Freeze_Attack_Loading_VBlank.end
+ JR =.end
- Freeze_Attack_Loading_VBlank.Blink_Animation.dark_palette:
+ .Blink_Animation.dark_palette:
LD A, $palette_white
LD $mem_prepared_color_palette, A
- Freeze_Attack_Loading_VBlank.end:
+ .end:
LD A, $mem_loading_step
INC A
AND $0f
diff --git a/attacks/heal.gbasm b/attacks/heal.gbasm
index 4aacc23..281726a 100644
--- a/attacks/heal.gbasm
+++ b/attacks/heal.gbasm
@@ -3,9 +3,9 @@ Heal_Attack:
ADD $03
DAA
CP $20
- JR C, =Heal_Attack.Set_health
+ JR C, =.Set_health
LD A, $20
- Heal_Attack.Set_health:
+ .Set_health:
LD $mem_bunny_health, A
PUSH BC
diff --git a/attacks/hop.gbasm b/attacks/hop.gbasm
index 1b3d93b..e159ee4 100644
--- a/attacks/hop.gbasm
+++ b/attacks/hop.gbasm
@@ -15,22 +15,22 @@ Preload_Map_Hop:
DEC A
BIT 1, A
- JR NZ, =Preload_Map_Hop.Map_Load.vertical
+ JR NZ, =.Map_Load.vertical
- Preload_Map_Hop.Map_Load.horizontal:
+ .Map_Load.horizontal:
CALL =Load_Next_Block_Column
- JR =Preload_Map_Hop.Map_Load.End
+ JR =.Map_Load.End
- Preload_Map_Hop.Map_Load.vertical:
+ .Map_Load.vertical:
CALL =Load_Next_Block_Row
- Preload_Map_Hop.Map_Load.End:
+ .Map_Load.End:
RET
Hop_Attack_Loading_VBlank:
LD A, $mem_loading_step
CP $00
- JP Z, =Hop_Attack_Loading_VBlank.Skip_Display_Block
+ JP Z, =.Skip_Display_Block
LD A, $mem_map_loading_flags
BIT 2, A
@@ -81,7 +81,7 @@ Hop_Attack_Loading_VBlank:
LD A, C
LD $mem_viewport_y, A
- Hop_Attack_Loading_VBlank.Skip_Display_Block:
+ .Skip_Display_Block:
LD A, $mem_loading_step
INC A