Use new relative label thingy

3 files changed, 56 insertions, 56 deletions

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