diff options
| -rw-r--r-- | animation.gbasm | 2 | ||||
| -rw-r--r-- | animations/sparkles.gbasm | 4 | ||||
| -rw-r--r-- | attacks/freeze.gbasm | 12 | ||||
| -rw-r--r-- | attacks/heal.gbasm | 4 | ||||
| -rw-r--r-- | attacks/hop.gbasm | 14 | ||||
| -rw-r--r-- | buttons.gbasm | 20 | ||||
| -rw-r--r-- | entity/bunny.gbasm | 4 | ||||
| -rw-r--r-- | entity/display.gbasm | 100 | ||||
| -rw-r--r-- | gui.gbasm | 20 | ||||
| -rw-r--r-- | init.gbasm | 20 | ||||
| -rw-r--r-- | main.gbasm | 18 | ||||
| -rw-r--r-- | map/generation.gbasm | 68 | ||||
| -rw-r--r-- | map/loading.gbasm | 12 | ||||
| -rw-r--r-- | map/objects.gbasm | 32 | ||||
| -rw-r--r-- | utils.gbasm | 10 |
15 files changed, 170 insertions, 170 deletions
diff --git a/animation.gbasm b/animation.gbasm index a75da27..a10b01e 100644 --- a/animation.gbasm +++ b/animation.gbasm @@ -11,7 +11,7 @@ Display_Animation: LD A, (HL) LD BC, =Animation_Jump_table .JUMP_TABLE - + POP HL LD A, L ADD $04 diff --git a/animations/sparkles.gbasm b/animations/sparkles.gbasm index 9560ebf..018cf27 100644 --- a/animations/sparkles.gbasm +++ b/animations/sparkles.gbasm @@ -46,7 +46,7 @@ Sparkle_Animation: LD E, A XOR A CP E - JP Z, =Sparkle_Animation.End_animation + JP Z, =.End_animation LD (HL), E .ADD_MOVING_ANIMATION_OFFSET @@ -98,7 +98,7 @@ Sparkle_Animation: POP HL RET - Sparkle_Animation.End_animation: + .End_animation: LD A, L AND $fc LD L, A 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 diff --git a/buttons.gbasm b/buttons.gbasm index 175f95d..79b0852 100644 --- a/buttons.gbasm +++ b/buttons.gbasm @@ -19,28 +19,28 @@ Pad_Button_Check: LD A, $reg_joypad LD C, A LD A, $00 - - Pad_Button_Check.Right: + + .Right: BIT 0, C - JR NZ =Pad_Button_Check.Left + JR NZ =.Left LD A, $enum_direction_right - Pad_Button_Check.Left: + .Left: BIT 1, C - JR NZ =Pad_Button_Check.Up + JR NZ =.Up LD A, $enum_direction_left - Pad_Button_Check.Up: + .Up: BIT 2, C - JR NZ =Pad_Button_Check.Down + JR NZ =.Down LD A, $enum_direction_up - Pad_Button_Check.Down: + .Down: BIT 3, C - JR NZ =Pad_Button_Check.End + JR NZ =.End LD A, $enum_direction_down - Pad_Button_Check.End: + .End: LD $mem_button_direction, A LD A, $10 diff --git a/entity/bunny.gbasm b/entity/bunny.gbasm index 2e61554..7f274ff 100644 --- a/entity/bunny.gbasm +++ b/entity/bunny.gbasm @@ -1,13 +1,13 @@ Move_Bunny: LD A, $mem_bunny_health CP $00 - JR NZ, =Move_Bunny.not_dead + JR NZ, =.not_dead LD A, $20 LD $mem_bunny_direction, A RET - Move_Bunny.not_dead: + .not_dead: LD A, $mem_bunny_flags LD E, $01 diff --git a/entity/display.gbasm b/entity/display.gbasm index d6899ff..d9baff7 100644 --- a/entity/display.gbasm +++ b/entity/display.gbasm @@ -38,7 +38,7 @@ Display_Entity: LD E, A CP $00 - JP Z, =Display_Entity.skip + JP Z, =.skip LD A, (HL+) ADD $80 @@ -47,10 +47,10 @@ Display_Entity: LD B, A SUB $82 CP D - JP NC, =Display_Entity.skip + JP NC, =.skip ADD $0e CP D - JP C, =Display_Entity.skip + JP C, =.skip LD A, D SUB $80 SUB B @@ -66,10 +66,10 @@ Display_Entity: LD C, A SUB $82 CP D - JP NC, =Display_Entity.skip + JP NC, =.skip ADD $0d CP D - JP C, =Display_Entity.skip + JP C, =.skip LD A, D SUB $80 SUB C @@ -83,18 +83,18 @@ Display_Entity: LD A, (HL+) BIT 3, A LD D, A - Display_Entity.Moving_Animation: - JR Z, =Display_Entity.Moving_Animation.end + .Moving_Animation: + JR Z, =.Moving_Animation.end LD A, $mem_moving_animation_step .ADD_A_TO_DIRECTION_BC - Display_Entity.Moving_Animation.end: + .Moving_Animation.end: - Display_Entity.Blinking_Animation: + .Blinking_Animation: LD A, D AND $f0 CP $50 - JR NZ, =Display_Entity.Blinking_Animation.end + JR NZ, =.Blinking_Animation.end LD A, $mem_moving_animation_step PUSH DE @@ -104,49 +104,49 @@ Display_Entity: POP DE AND $02 CP $00 - JP Z, =Display_Entity.skip + JP Z, =.skip - Display_Entity.Blinking_Animation.end: + .Blinking_Animation.end: - Display_Entity.Action_Animation: + .Action_Animation: LD A, D AND $f0 CP $10 - JR NZ, =Display_Entity.Action_Animation.end + JR NZ, =.Action_Animation.end LD A, $mem_moving_animation_step CP $04 - JR C, =Display_Entity.Action_Animation.Step1 + JR C, =.Action_Animation.Step1 CP $0c - JR C, =Display_Entity.Action_Animation.Step2 - JR =Display_Entity.Action_Animation.end + JR C, =.Action_Animation.Step2 + JR =.Action_Animation.end - Display_Entity.Action_Animation.Step1: + .Action_Animation.Step1: SLA A SLA A - JR =Display_Entity.Action_Animation.Apply + JR =.Action_Animation.Apply - Display_Entity.Action_Animation.Step2: + .Action_Animation.Step2: SUB $04 SLA A XOR $ff INC A ADD $10 - Display_Entity.Action_Animation.Apply: + .Action_Animation.Apply: .ADD_A_TO_DIRECTION_BC - Display_Entity.Action_Animation.end: + .Action_Animation.end: - Display_Entity.SuperJump_Animation: + .SuperJump_Animation: LD A, D AND $f0 CP $30 - JR NZ, =Display_Entity.SuperJump_Animation.end + JR NZ, =.SuperJump_Animation.end LD A, $mem_moving_animation_step CP $00 - JR Z, =Display_Entity.SuperJump_Animation.end + JR Z, =.SuperJump_Animation.end .ADD_A_TO_DIRECTION_BC LD A, $mem_moving_animation_step SUB $08 @@ -159,35 +159,35 @@ Display_Entity: INC A ADD C LD C, A - Display_Entity.SuperJump_Animation.end: + .SuperJump_Animation.end: - Display_Entity.Shaking_Animation: + .Shaking_Animation: LD A, D AND $f0 CP $40 - JR NZ, =Display_Entity.Shaking_Animation.end + JR NZ, =.Shaking_Animation.end LD A, $mem_moving_animation_step CP $00 - JR Z, =Display_Entity.Shaking_Animation.end + JR Z, =.Shaking_Animation.end LD A, $mem_moving_animation_step SRA A AND $03 BIT 1, A RES 1, A - JR NZ, =Display_Entity.Shaking_Animation.skip_invert + JR NZ, =.Shaking_Animation.skip_invert CPL INC A - Display_Entity.Shaking_Animation.skip_invert: + .Shaking_Animation.skip_invert: ADD B LD B, A - Display_Entity.Shaking_Animation.end: + .Shaking_Animation.end: - Display_Entity.Moving_Hops: + .Moving_Hops: LD A, D AND $f8 CP $08 - JR NZ, =Display_Entity.Moving_Hops.end + JR NZ, =.Moving_Hops.end LD A, $mem_moving_animation_step SUB $08 @@ -201,50 +201,50 @@ Display_Entity: INC A ADD C LD C, A - Display_Entity.Moving_Hops.end: + .Moving_Hops.end: LD A, D AND $07 CP $enum_direction_left - JR Z, =Display_Entity.Left_Direction_sprite + JR Z, =.Left_Direction_sprite CP $enum_direction_right - JR Z, =Display_Entity.Right_Direction_sprite + JR Z, =.Right_Direction_sprite CP $enum_direction_up - JR Z, =Display_Entity.Up_Direction_sprite - JP =Display_Entity.Down_Direction_sprite + JR Z, =.Up_Direction_sprite + JP =.Down_Direction_sprite - Display_Entity.Left_Direction_sprite: + .Left_Direction_sprite: CALL =Flags_From_Animation ; Uses and changes HL LD D, A - JP =Display_Entity.Write_OBJ + JP =.Write_OBJ - Display_Entity.Right_Direction_sprite: + .Right_Direction_sprite: LD A, $02 ADD E LD E, A CALL =Flags_From_Animation ; Uses and changes HL OR $20 LD D, A - JP =Display_Entity.Write_OBJ + JP =.Write_OBJ - Display_Entity.Up_Direction_sprite: + .Up_Direction_sprite: LD A, $04 ADD E LD E, A CALL =Flags_From_Animation ; Uses and changes HL LD D, A - JP =Display_Entity.Write_OBJ + JP =.Write_OBJ - Display_Entity.Down_Direction_sprite: + .Down_Direction_sprite: LD A, $08 ADD E LD E, A CALL =Flags_From_Animation ; Uses and changes HL LD D, A - JP =Display_Entity.Write_OBJ + JP =.Write_OBJ - Display_Entity.Write_OBJ: + .Write_OBJ: PUSH HL ; First OBJ (left) LD HL, $mem_oam_buffer @@ -259,7 +259,7 @@ Display_Entity: LD (HL+), A LD A, D LD (HL+), A - + ; Second OBJ LD A, B ADD $08 @@ -279,7 +279,7 @@ Display_Entity: LD $mem_oam_buffer_low, A POP HL - Display_Entity.skip: + .skip: LD A, L AND $f0 ADD $10 @@ -96,24 +96,24 @@ Display_dialogue_cursor: LD DE, $0000 CP $00 - JR NZ, =Display_dialogue_cursor.choice1_false + JR NZ, =.choice1_false LD B, $69 - Display_dialogue_cursor.choice1_false: + .choice1_false: CP $01 - JR NZ, =Display_dialogue_cursor.choice2_false + JR NZ, =.choice2_false LD C, $69 - Display_dialogue_cursor.choice2_false: + .choice2_false: CP $02 - JR NZ, =Display_dialogue_cursor.choice3_false + JR NZ, =.choice3_false LD D, $69 - Display_dialogue_cursor.choice3_false: + .choice3_false: CP $03 - JR NZ, =Display_dialogue_cursor.choice4_false + JR NZ, =.choice4_false LD E, $69 - Display_dialogue_cursor.choice4_false: + .choice4_false: LD A, B LD $dialogue_menu_choice1_cursor, A @@ -140,13 +140,13 @@ Move_dialogue_cursor: DEC A BIT 1, A - JR Z, =Move_dialogue_cursor.Vertical_axis + JR Z, =.Vertical_axis LD A, $mem_menu_cursor_position XOR $02 LD $mem_menu_cursor_position, A RET - Move_dialogue_cursor.Vertical_axis: + .Vertical_axis: LD A, $mem_menu_cursor_position XOR $01 LD $mem_menu_cursor_position, A @@ -14,9 +14,9 @@ Start: .PADTO 0x0104 Nintendo_Logo: ; The Nintendo logo must be stored in bytes 0x104-133 - .DB $CE,$ED,$66,$66,$CC,$0D,$00,$0B,$03,$73,$00,$83,$00,$0C,$00,$0D - .DB $00,$08,$11,$1F,$88,$89,$00,$0E,$DC,$CC,$6E,$E6,$DD,$DD,$D9,$99 - .DB $BB,$BB,$67,$63,$6E,$0E,$EC,$CC,$DD,$DC,$99,$9F,$BB,$B9,$33,$3E + .DB $CE,$ED,$66,$66,$CC,$0D,$00,$0B,$03,$73,$00,$83,$00,$0C,$00,$0D + .DB $00,$08,$11,$1F,$88,$89,$00,$0E,$DC,$CC,$6E,$E6,$DD,$DD,$D9,$99 + .DB $BB,$BB,$67,$63,$6E,$0E,$EC,$CC,$DD,$DC,$99,$9F,$BB,$B9,$33,$3E .PADTO 0x0134 Checksum: ; The bytes 0x134-0x14d need to add up to 0xe7 (= 0xff - 0x19) @@ -29,12 +29,12 @@ LD A, $00 LD $reg_interrupt_enable, A Empty_WRAM: LD HL, $C000 - Empty_WRAM.loop: + .loop: XOR A LD (HL+), A LD A, $D0 CP H - JR NZ, =Empty_WRAM.loop + JR NZ, =.loop CALL =VBlank_Wait @@ -66,14 +66,14 @@ Empty_VRAM: ; (Clear screen) Initialize_Window_GUI: LD HL, $9c20 - Initialize_Window_GUI.top_bar_loop: + .top_bar_loop: LD A, $10 LD (HL+), A LD A, L CP $40 LD $reg_lcd_status, A - JR NZ, =Initialize_Window_GUI.top_bar_loop + JR NZ, =.top_bar_loop LD HL, $9da0 LD BC, $00a0 @@ -92,8 +92,8 @@ OAM_DMA_Transfer_routine_src: LD A, $mem_oam_buffer_high LD ($46), A LD A, $28 ; delay for a total of 4×40 = 160 M-cycles - OAM_DMA_Transfer_routine_src.wait: + .wait: DEC A ; 1 M-cycle - JR NZ, =OAM_DMA_Transfer_routine_src.wait ; 3 M-cycles + JR NZ, =.wait ; 3 M-cycles RET - OAM_DMA_Transfer_routine_src.end: + .end: @@ -175,22 +175,22 @@ STAT_Entrypoint: PUSH AF LD A, $reg_lyc CP $09 - JR Z, =STAT_Entrypoint.End_Top_Bar + JR Z, =STAT_.End_Top_Bar CP $67 - JR Z, =STAT_Entrypoint.Start_dialogue - STAT_Entrypoint.Thin_font: + JR Z, =STAT_.Start_dialogue + STAT_.Thin_font: LD A, $palette_thin_font LD $reg_bg_palette, A - JR =STAT_Entrypoint.skip_dialogue + JR =STAT_.skip_dialogue - STAT_Entrypoint.Start_dialogue: + STAT_.Start_dialogue: LD A, $mem_display_flag BIT 0, A - JR Z, =STAT_Entrypoint.skip_dialogue + JR Z, =STAT_.skip_dialogue .ENABLE_WINDOW LD A, $mem_display_flag BIT 1, A - JR Z, =STAT_Entrypoint.Thin_font + JR Z, =STAT_.Thin_font LD A, $palette_bold_font LD $reg_bg_palette, A LD A, $77 @@ -199,12 +199,12 @@ STAT_Entrypoint: POP AF RETI - STAT_Entrypoint.skip_dialogue: + STAT_.skip_dialogue: .DISABLE_LYC_INTERRUPT POP AF RET - STAT_Entrypoint.End_Top_Bar: + STAT_.End_Top_Bar: .DISABLE_WINDOW LD A, $67 LD $reg_lyc, A diff --git a/map/generation.gbasm b/map/generation.gbasm index dba1678..15a3301 100644 --- a/map/generation.gbasm +++ b/map/generation.gbasm @@ -206,19 +206,19 @@ Dungeon_Generation: LD A, $40 PUSH AF - Dungeon_Generation.Step: + .Step: LD HL, $mem_dungeon_generation_heads - Dungeon_Generation.Head_loop: + .Head_loop: LD B, (HL) LD A, B CP $00 - JR Z, =Dungeon_Generation.Head_loop.end + JR Z, =.Head_loop.end LD A, E CP $00 - JR Z, =Dungeon_Generation.Head_Mitosis.end + JR Z, =.Head_Mitosis.end DEC A LD C, A @@ -227,12 +227,12 @@ Dungeon_Generation: CP $00 CALL Z, =Generation_Head_Mitosis - Dungeon_Generation.Head_Mitosis.end: + .Head_Mitosis.end: CALL =RNG_Step AND $0f - JR NZ, =Dungeon_Generation.Direction_Change.end - Dungeon_Generation.Direction_Change: + JR NZ, =.Direction_Change.end + .Direction_Change: DEC B CALL =RNG_Step AND $01 @@ -241,7 +241,7 @@ Dungeon_Generation: INC A LD B, A LD (HL), B - Dungeon_Generation.Direction_Change.end: + .Direction_Change.end: INC HL @@ -249,23 +249,23 @@ Dungeon_Generation: LD A, B CP $enum_direction_left - JR NZ =Dungeon_Generation.Left.end - Dungeon_Generation.Left: + JR NZ =.Left.end + .Left: DEC C - Dungeon_Generation.Left.end: + .Left.end: CP $enum_direction_right - JR NZ =Dungeon_Generation.Right.end - Dungeon_Generation.Right: + JR NZ =.Right.end + .Right: INC C - Dungeon_Generation.Right.end: - + .Right.end: + LD A, C AND $e0 - JR NZ, =Dungeon_Generation.DonT_Update_X + JR NZ, =.DonT_Update_X LD (HL), C - Dungeon_Generation.DonT_Update_X: + .DonT_Update_X: INC HL @@ -273,51 +273,51 @@ Dungeon_Generation: LD A, B CP $enum_direction_up - JR NZ =Dungeon_Generation.Up.end - Dungeon_Generation.Up: + JR NZ =.Up.end + .Up: DEC C - Dungeon_Generation.Up.end: + .Up.end: CP $enum_direction_down - JR NZ =Dungeon_Generation.Down.end - Dungeon_Generation.Down: + JR NZ =.Down.end + .Down: INC C - Dungeon_Generation.Down.end: - + .Down.end: + LD A, C AND $e0 - JR NZ, =Dungeon_Generation.DonT_Update_Y + JR NZ, =.DonT_Update_Y LD (HL), C - Dungeon_Generation.DonT_Update_Y: + .DonT_Update_Y: - DEC HL + DEC HL LD A, (HL+) LD C, A LD A, (HL+) LD B, A LD A, C CALL =Carve_Map - JP =Dungeon_Generation.Head_loop + JP =.Head_loop - Dungeon_Generation.Head_loop.end: + .Head_loop.end: POP AF DEC A PUSH AF CP $00 - JR NZ, =Dungeon_Generation.Step + JR NZ, =.Step POP AF LD HL, $mem_dungeon_generation_heads - Dungeon_Generation.Head_explosion_loop: + .Head_explosion_loop: LD B, (HL) LD A, B CP $00 - JR Z, =Dungeon_Generation.Head_explosion_loop.end + JR Z, =.Head_explosion_loop.end CALL =Generation_Head_Explosion @@ -328,9 +328,9 @@ Dungeon_Generation: INC HL INC HL INC HL - JR =Dungeon_Generation.Head_explosion_loop + JR =.Head_explosion_loop - Dungeon_Generation.Head_explosion_loop.end: + .Head_explosion_loop.end: RET diff --git a/map/loading.gbasm b/map/loading.gbasm index ca1e3f4..0fa66db 100644 --- a/map/loading.gbasm +++ b/map/loading.gbasm @@ -9,8 +9,8 @@ Load_Map: LD B, A ADD $10 LD D, A - Load_Map.For_Y: - Load_Map.For_X: + .For_Y: + .For_X: LD A, C CALL =Load_Block CALL =Display_Prepared_Block @@ -18,12 +18,12 @@ Load_Map: INC C LD A, C CP E - JR NZ, =Load_Map.For_X + JR NZ, =.For_X INC B LD A, B CP D - JR NZ, =Load_Map.For_Y + JR NZ, =.For_Y RET @@ -258,7 +258,7 @@ Display_Prepared_Block: LD A, $mem_map_loading_flags BIT 2, A - JR Z, =Display_Prepared_Block.End + JR Z, =.End LD A, $mem_map_loading_flags RES 2, A @@ -291,7 +291,7 @@ Display_Prepared_Block: OR $01 LD (DE), A - Display_Prepared_Block.End: + .End: POP DE POP BC diff --git a/map/objects.gbasm b/map/objects.gbasm index d4cfd6d..de34a6d 100644 --- a/map/objects.gbasm +++ b/map/objects.gbasm @@ -12,7 +12,7 @@ Initialize_Objects: Spawn_object_in_random_room: ; Object tile in A, Object jump table id in E LD (HL+), A - + LD A, $mem_number_of_rooms CALL =RNG_Bound SLA A @@ -44,7 +44,7 @@ Spawn_object_in_random_room: ; Object tile in A, Object jump table id in E LD (HL), A DEC HL - + LD BC, $mem_object_list Object_check_collisions.loop: LD A, (BC) @@ -76,7 +76,7 @@ Spawn_object_in_random_room: ; Object tile in A, Object jump table id in E DEC HL RET - Object_check_collisions.loop.next: + Object_check_collisions.loop.next: LD A, L AND $f8 ADD $01 @@ -127,11 +127,11 @@ Stairs_action: DI LD A, $00 LD $reg_interrupt_flags, A - Stairs_action.Wait_VBlank: + .Wait_VBlank: LD A, $reg_lcd_status AND $03 CP $01 - JR NZ, =Stairs_action.Wait_VBlank + JR NZ, =.Wait_VBlank ; LCDC XOR A @@ -145,9 +145,9 @@ Heal_Action: ADD $03 DAA CP $20 - JR C, =Heal_Action.Set_health + JR C, =.Set_health LD A, $20 - Heal_Action.Set_health: + .Set_health: LD $mem_bunny_health, A PUSH BC @@ -268,27 +268,27 @@ Load_Objects: Object_Interactions_Check: LD A, $mem_moving_animation_step CP $00 - JR NZ, =Object_Interactions_Check.End + JR NZ, =.End LD A, $mem_map_loading_flags BIT 1, A - JR Z, =Object_Interactions_Check.End + JR Z, =.End LD HL, $mem_object_list LD A, $mem_bunny_x LD C, A LD A, $mem_bunny_y LD B, A - Object_Interactions_Check.loop: + .loop: LD A, (HL+) CP $00 - JR Z, =Object_Interactions_Check.next + JR Z, =.next LD A, (HL+) CP C - JR NZ, =Object_Interactions_Check.next + JR NZ, =.next LD A, (HL+) CP B - JR NZ, =Object_Interactions_Check.next + JR NZ, =.next LD E, (HL) @@ -306,13 +306,13 @@ Object_Interactions_Check: POP BC - Object_Interactions_Check.next: + .next: LD A, L AND $f8 ADD $08 LD L, A CP $80 - JR NZ, =Object_Interactions_Check.loop + JR NZ, =.loop - Object_Interactions_Check.End: + .End: RET diff --git a/utils.gbasm b/utils.gbasm index 5063f83..8291ac2 100644 --- a/utils.gbasm +++ b/utils.gbasm @@ -135,7 +135,7 @@ Print_8bit: ; Number in A, Memory Tilemap position in HL AND $0f OR $80 LD (HL+), A - + LD A, C AND $0f ; Then the lowest OR $80 @@ -233,12 +233,12 @@ VBlank_Wait: PUSH AF LD A, $reg_lcd_controller BIT 7, A - JR Z, =VBlank_Wait.End - VBlank_Wait.loop: + JR Z, =.End + .loop: LD A, $reg_lcd_status AND $03 CP $01 - JR NZ, =VBlank_Wait.loop - VBlank_Wait.End: + JR NZ, =.loop + .End: POP AF RET |