From e510dc388c9a721ff187fb1f41be55a908f46c16 Mon Sep 17 00:00:00 2001
From: Vince Weaver <vincent.weaver@maine.edu>
Date: Wed, 17 Oct 2018 14:13:10 -0400
Subject: [PATCH] megademo: mode7: more minor cleanups

---
 megademo/mode7.s | 25 +++++++------------------
 1 file changed, 7 insertions(+), 18 deletions(-)

diff --git a/megademo/mode7.s b/megademo/mode7.s
index e92d170b..2eefc68b 100644
--- a/megademo/mode7.s
+++ b/megademo/mode7.s
@@ -947,7 +947,7 @@ screenx_loop:
 
 nomatch:
 	; Get color to draw in A
-	jsr	island_lookup
+	jsr	lookup_island_map
 match:
 
 mask_label:
@@ -1036,19 +1036,7 @@ done_screeny:
 	; returns color in A
 	; CLOBBERS: A,Y
 	; this is used to check if above water or grass
-	; the high-performance per-pixel version has been inlined
 lookup_island_map:
-;	rts								; 6
-
-
-	;====================
-	; lookup_map
-	;====================
-	; finds value in space_x.i,space_y.i
-	; returns color in A
-	; CLOBBERS: A,Y
-
-island_lookup:
 	lda	SPACEX_I						; 3
 	sta	spacex_label+1	; self modifying code, LAST_SPACEX_I	; 4
 	and	#CONST_MAP_MASK_X	; wrap at 64			; 2
@@ -1072,28 +1060,28 @@ island_lookup:
 								;============
 								;	 39
 
-	bcs	@ocean_color		; bgt 8				; 2nt/3
+	bcs	ocean_color		; bgt 8				; 2nt/3
 	ldy	SPACEY_I						; 3
 	cpy	#$8							; 2
 								;=============
 								;	  7
 
-	bcs	@ocean_color		; bgt 8				; 2nt/3
+	bcs	ocean_color		; bgt 8				; 2nt/3
 
 	tay								; 2
 	lda	flying_map,Y		; load from array		; 4
 
-	bcc	@update_cache						; 3
+	bcc	update_cache						; 3
 								;============
 								;	11
-@ocean_color:
+ocean_color:
 	and	#$1f							; 2
 	tay								; 2
 	lda	water_map,Y		; the color of the sea		; 4
 								;===========
 								;	  8
 
-@update_cache:
+update_cache:
 	sta	map_color_label+1	; self-modifying		; 4
 
 								;===========
@@ -1135,6 +1123,7 @@ water_map:
 	.byte $22,$22,$22,$22,  $22,$22,$22,$22
 	.byte $22,$22,$22,$22,  $ee,$22,$22,$22
 
+
 .include "starry_sky.scroll"
 
 .include "multiply_fast.s"