From 491687d03bdb462b58121e0e94c3b0e3fa99d0bf Mon Sep 17 00:00:00 2001
From: Vince Weaver <vincent.weaver@maine.edu>
Date: Thu, 17 Mar 2022 12:34:14 -0400
Subject: [PATCH] lemm: prepare to separate out the level data

---
 games/lemm/Makefile |  2 +-
 games/lemm/lemm.s   | 49 +++------------------------------------------
 games/lemm/level1.s | 24 ++++++++++++++++++++++
 games/lemm/level5.s | 22 ++++++++++++++++++++
 4 files changed, 50 insertions(+), 47 deletions(-)

diff --git a/games/lemm/Makefile b/games/lemm/Makefile
index d25d84c2..5cbb0648 100644
--- a/games/lemm/Makefile
+++ b/games/lemm/Makefile
@@ -100,5 +100,5 @@ graphics/graphics_test.inc:
 ####
 
 clean:		
-	rm -f *~ *.o *.lst HELLO LEMM LEMM_TEST
+	rm -f *~ *.o *.lst HELLO LEMM LEMM_TEST generate_common
 
diff --git a/games/lemm/lemm.s b/games/lemm/lemm.s
index d3cbac41..4df9e437 100644
--- a/games/lemm/lemm.s
+++ b/games/lemm/lemm.s
@@ -296,8 +296,6 @@ load_song_chunk_good:
 	.include	"keyboard.s"
 	.include	"joystick.s"
 
-	.include	"level1.s"
-	.include	"level5.s"
 
 	.include	"gr_fast_clear.s"
 
@@ -345,51 +343,10 @@ config_string:
 .byte   0,23,"APPLE II?, 48K, MOCKINGBOARD: NO, SSI: N",0
 ;                             MOCKINGBOARD: NONE
 
-
-.include "graphics/graphics_level1.inc"
-.include "graphics/graphics_level5.inc"
 .include "graphics/sprites.inc"
 
-;level5_lzsa:
-;level5_preview_lzsa:
-
-music_parts_h:
-	.byte >lemm5_part1_lzsa,>lemm5_part2_lzsa,>lemm5_part3_lzsa
-	.byte >lemm5_part4_lzsa,>lemm5_part5_lzsa,$00
-
-music_parts_l:
-	.byte <lemm5_part1_lzsa,<lemm5_part2_lzsa,<lemm5_part3_lzsa
-	.byte <lemm5_part4_lzsa,<lemm5_part5_lzsa
-
-lemm5_part1_lzsa:
-.incbin "music/lemm5.part1.lzsa"
-lemm5_part2_lzsa:
-.incbin "music/lemm5.part2.lzsa"
-lemm5_part3_lzsa:
-.incbin "music/lemm5.part3.lzsa"
-lemm5_part4_lzsa:
-.incbin "music/lemm5.part4.lzsa"
-lemm5_part5_lzsa:
-.incbin "music/lemm5.part5.lzsa"
-
-music6_parts_h:
-	.byte >lemm6_part1_lzsa,>lemm6_part2_lzsa,>lemm6_part3_lzsa
-	.byte >lemm6_part4_lzsa,>lemm6_part5_lzsa,$00
-
-music6_parts_l:
-	.byte <lemm6_part1_lzsa,<lemm6_part2_lzsa,<lemm6_part3_lzsa
-	.byte <lemm6_part4_lzsa,<lemm6_part5_lzsa
-
-lemm6_part1_lzsa:
-.incbin "music/lemm6.part1.lzsa"
-lemm6_part2_lzsa:
-.incbin "music/lemm6.part2.lzsa"
-lemm6_part3_lzsa:
-.incbin "music/lemm6.part3.lzsa"
-lemm6_part4_lzsa:
-.incbin "music/lemm6.part4.lzsa"
-lemm6_part5_lzsa:
-.incbin "music/lemm6.part5.lzsa"
-
 letsgo:
 .incbin "sounds/letsgo.btc.lz4"
+
+	.include	"level1.s"
+	.include	"level5.s"
diff --git a/games/lemm/level1.s b/games/lemm/level1.s
index ab2b0cd5..f83cdfb4 100644
--- a/games/lemm/level1.s
+++ b/games/lemm/level1.s
@@ -246,3 +246,27 @@ l1_level_over:
 	rts
 
 
+
+
+.include "graphics/graphics_level1.inc"
+
+
+music_parts_h:
+	.byte >lemm5_part1_lzsa,>lemm5_part2_lzsa,>lemm5_part3_lzsa
+	.byte >lemm5_part4_lzsa,>lemm5_part5_lzsa,$00
+
+music_parts_l:
+	.byte <lemm5_part1_lzsa,<lemm5_part2_lzsa,<lemm5_part3_lzsa
+	.byte <lemm5_part4_lzsa,<lemm5_part5_lzsa
+
+lemm5_part1_lzsa:
+.incbin "music/lemm5.part1.lzsa"
+lemm5_part2_lzsa:
+.incbin "music/lemm5.part2.lzsa"
+lemm5_part3_lzsa:
+.incbin "music/lemm5.part3.lzsa"
+lemm5_part4_lzsa:
+.incbin "music/lemm5.part4.lzsa"
+lemm5_part5_lzsa:
+.incbin "music/lemm5.part5.lzsa"
+
diff --git a/games/lemm/level5.s b/games/lemm/level5.s
index 1fdf9c2d..94e897ff 100644
--- a/games/lemm/level5.s
+++ b/games/lemm/level5.s
@@ -243,3 +243,25 @@ l5_level_over:
 	rts
 
 
+
+.include "graphics/graphics_level5.inc"
+
+music6_parts_h:
+	.byte >lemm6_part1_lzsa,>lemm6_part2_lzsa,>lemm6_part3_lzsa
+	.byte >lemm6_part4_lzsa,>lemm6_part5_lzsa,$00
+
+music6_parts_l:
+	.byte <lemm6_part1_lzsa,<lemm6_part2_lzsa,<lemm6_part3_lzsa
+	.byte <lemm6_part4_lzsa,<lemm6_part5_lzsa
+
+lemm6_part1_lzsa:
+.incbin "music/lemm6.part1.lzsa"
+lemm6_part2_lzsa:
+.incbin "music/lemm6.part2.lzsa"
+lemm6_part3_lzsa:
+.incbin "music/lemm6.part3.lzsa"
+lemm6_part4_lzsa:
+.incbin "music/lemm6.part4.lzsa"
+lemm6_part5_lzsa:
+.incbin "music/lemm6.part5.lzsa"
+