updated to lastest PSGLib

Updated to lastest PSGlib to fix the ringing ch.2 psg tone when playing
pickup.psg

Author: JulianoFlores

README.MD

@@ -14,6 +14,9 @@ levels designed using [Tiled](http://mapeditor.org)
 music done using [Furnace](https://tildearrow.org/furnace/)
 
 
+compiled using [SDCC](https://sdcc.sourceforge.net)
+
+
 To build it, you need a working copy of SDCC and SMSDevkit, with crt0, lib(SMSlib) and PSGlib inside their own folders, relative to main.c, if you're in a windows enviroment, then all you need to do is run build.bat.
 Otherwise you might need to execute the commands yourself. 
 
@@ -23,7 +26,7 @@ There's a PHP companion tool, to convert Tiled's CSV output to C Array used in t
 - Move the ship with the D-Pad
 - Hold Button 1 to use the speed boost.
 
-Your mission, choose you accept it is to recover all the satelittes without getting shot by the turrets, good luck.
+Your mission, choose you accept it is to recover all the sattelites without getting shot by the turrets, good luck.
 Oh yeah, there's a time limit also. oops.
 
 All the assets (code, graphics and music) were created by tibonev. 
@@ -32,6 +35,15 @@ Everything is licensed under the MIT License (check out LICENSE for more info).
 
 ### Version History: 
 
+V0.17 (01/04/24)
+- Updated to lastest version of PSGLib, fixed the ringing tone on Square Channel 2, after an sfx has played.
+- Altered death-loop situation, now the level always fully reset (all sattelites and time resets) at each death.
+- Fixed bug 'not loading "TIME:" tiles upon screen-reload after a death.
+
+V0.16 (28/03/24)
+- Fixed pickup sound bug (line 926 / can't enable channel 2 on that line?)
+- Fixed 'showing lives after fixed world is over' bug.
+
 V0.15 (26/03/24)
 - Added Fixed World Levels.
 - Adjusted player bounderies within the screen.
@@ -107,7 +119,11 @@ V0.01: (20/02/24)
 - Collision detection of both player-pellet / player-enemy shot are working
 
 ### To do:
-- sfx continue playing bug? primary focus, V15 has "pickup_psg" disabled.
 - Re-add Scrolling (how to shift all the collisions without slowing down?)
 - Separate code into files / makefile (will require re-write, not worth the effort?)
-- hi-score sram? (understand how to make sram work)
+- hi-score sram? (understand how to make sram work)
+
+
+
+
+

bank2.h

@@ -55,6 +55,9 @@ extern const unsigned char	en_shot_psg[22];
 extern const unsigned char	menu_tick_psg[21];
 #define				menu_tick_psg_size 21
 #define				menu_tick_psg_bank 2
+extern const unsigned char	pickup_psg[18];
+#define				pickup_psg_size 18
+#define				pickup_psg_bank 2
 extern const unsigned char	level_sprites_bin[16];
 #define				level_sprites_bin_size 16
 #define				level_sprites_bin_bank 2
@@ -64,9 +67,6 @@ extern const unsigned char	title_screen_1_bin[16];
 extern const unsigned char	title_screen_2_bin[16];
 #define				title_screen_2_bin_size 16
 #define				title_screen_2_bin_bank 2
-extern const unsigned char	pickup_psg[12];
-#define				pickup_psg_size 12
-#define				pickup_psg_bank 2
 extern const unsigned char	tiles_bin[10];
 #define				tiles_bin_size 10
 #define				tiles_bin_bank 2

bank2.rel

@@ -9,7 +9,7 @@ A _DABS size 0 flags 8 addr 0
 A _HOME size 0 flags 0 addr 0
 A _GSINIT size 0 flags 0 addr 0
 A _GSFINAL size 0 flags 0 addr 0
-A _BANK2 size 1CD5 flags 0 addr 0
+A _BANK2 size 1CDB flags 0 addr 0
 S _title_screen_psgcompr Def000000
 S _raposa_1_psg Def000902
 S _level_bg_psgcompr Def000D7D
@@ -29,18 +29,18 @@ S _level_bg_stmcompr Def001C07
 S _bg_stmcompr Def001C26
 S _en_shot_psg Def001C40
 S _menu_tick_psg Def001C56
-S _level_sprites_bin Def001C6B
-S _title_screen_1_bin Def001C7B
-S _title_screen_2_bin Def001C8B
-S _pickup_psg Def001C9B
-S _tiles_bin Def001CA7
-S _tiles2_bin Def001CB1
-S _tiles3_bin Def001CBB
-S _tiles4_bin Def001CC4
-S _bg_psgcompr Def001CCD
-S _bg2_bin Def001CD0
-S _level_bg_bin Def001CD2
-S _bg_bin Def001CD4
+S _pickup_psg Def001C6B
+S _level_sprites_bin Def001C7D
+S _title_screen_1_bin Def001C8D
+S _title_screen_2_bin Def001C9D
+S _tiles_bin Def001CAD
+S _tiles2_bin Def001CB7
+S _tiles3_bin Def001CC1
+S _tiles4_bin Def001CCA
+S _bg_psgcompr Def001CD3
+S _bg2_bin Def001CD6
+S _level_bg_bin Def001CD8
+S _bg_bin Def001CDA
 A _INITIALIZER size 0 flags 0 addr 0
 A _CABS size 0 flags 8 addr 0
 T 00 00 00
@@ -1219,55 +1219,57 @@ T 63 1C 00 38 38 38 38 38 38 3D 00
 R 00 00 07 00
 T 6B 1C 00
 R 00 00 07 00
-T 6B 1C 00 3F 0F 3E 2F 2A 15 0B 20 34 2D 27 01 19
+T 6B 1C 00 C9 4A D0 38 C3 4B 38 C9 4A 38 C3 4B 39
 R 00 00 07 00
-T 78 1C 00 2E 03 07
+T 78 1C 00 C7 56 DF 38 00
 R 00 00 07 00
-T 7B 1C 00
+T 7D 1C 00
 R 00 00 07 00
-T 7B 1C 00 00 00 00 01 05 15 02 03 03 06 0A 0B 0F
+T 7D 1C 00 3F 0F 3E 2F 2A 15 0B 20 34 2D 27 01 19
 R 00 00 07 00
-T 88 1C 00 2A 3F 3F
+T 8A 1C 00 2E 03 07
 R 00 00 07 00
-T 8B 1C 00
+T 8D 1C 00
 R 00 00 07 00
-T 8B 1C 00 00 00 00 01 15 02 03 03 06 07 0B 0B 0F
+T 8D 1C 00 00 00 00 01 05 15 02 03 03 06 0A 0B 0F
 R 00 00 07 00
-T 98 1C 00 2A 3F 3F
+T 9A 1C 00 2A 3F 3F
 R 00 00 07 00
-T 9B 1C 00
+T 9D 1C 00
 R 00 00 07 00
-T 9B 1C 00 E7 F0 3B E7 3B E7 3B E7 3B FF 3B 00
+T 9D 1C 00 00 00 00 01 15 02 03 03 06 07 0B 0B 0F
 R 00 00 07 00
-T A7 1C 00
+T AA 1C 00 2A 3F 3F
 R 00 00 07 00
-T A7 1C 00 15 20 2A 2F 2F 3E 00 11 0F 3F
+T AD 1C 00
 R 00 00 07 00
-T B1 1C 00
+T AD 1C 00 15 20 2A 2F 2F 3E 00 11 0F 3F
 R 00 00 07 00
-T B1 1C 00 15 01 2A 2F 2F 3E 00 04 38 3F
+T B7 1C 00
 R 00 00 07 00
-T BB 1C 00
+T B7 1C 00 15 01 2A 2F 2F 3E 00 04 38 3F
 R 00 00 07 00
-T BB 1C 00 15 00 2A 2F 2F 3E 2E 0B 3F
+T C1 1C 00
 R 00 00 07 00
-T C4 1C 00
+T C1 1C 00 15 00 2A 2F 2F 3E 2E 0B 3F
 R 00 00 07 00
-T C4 1C 00 15 10 2A 2F 2F 3E 00 3F 2E
+T CA 1C 00
 R 00 00 07 00
-T CD 1C 00
+T CA 1C 00 15 10 2A 2F 2F 3E 00 3F 2E
 R 00 00 07 00
-T CD 1C 00 01 00 00
+T D3 1C 00
 R 00 00 07 00
-T D0 1C 00
+T D3 1C 00 01 00 00
 R 00 00 07 00
-T D0 1C 00 00 2F
+T D6 1C 00
 R 00 00 07 00
-T D2 1C 00
+T D6 1C 00 00 2F
 R 00 00 07 00
-T D2 1C 00 00 2F
+T D8 1C 00
 R 00 00 07 00
-T D4 1C 00
+T D8 1C 00 00 2F
 R 00 00 07 00
-T D4 1C 00 00
+T DA 1C 00
+R 00 00 07 00
+T DA 1C 00 00
 R 00 00 07 00

bank2/pickup.psg

@@ -3,4 +3,4 @@ sdcc -c -mz80 main.c
 sdcc -c -mz80 vdp.c
 sdcc -o main.ihx -mz80 --no-std-crt0 --data-loc 0xC000 -Wl-b_BANK2=0x8000 crt0\crt0_sms.rel main.rel vdp.rel SMSlib.lib PSGlib\PSGlib.rel bank2.rel
 makesms main.ihx game.sms
-
+c:\smsdev\emulicious\emulicious game.sms

build.bat

@@ -49,9 +49,11 @@ unsigned int level_pellet_num = 0;			// how many pellets are in a level
 unsigned int level_pellet_collected = 0; 	// how many pellets have been collected 
 int level_fixed_current = 1;				// current level of the fixed world
 int pellets_x_y[32][2];						// array used to draw/check collision (max of 32 pellet sprites, 2 coordinates per sprite (x,y))
+int r_pellets_x_y[32][2];					// array used to reset the random level //
 
 unsigned int level_walls_num = 0;
 int walls_x_y[64][2];						// walls position, max of 64 tiles, and 2 coordinates per tile (x,y);
+int r_walls_x_y[64][2];						// used to reset the random level //
 int walls_col_dir = -1;
 
 unsigned int bg_scroll_x = 0;				// used to control the background scroll //
@@ -240,6 +242,13 @@ void level_bg_load(void) {
 	SMS_setTileatXY(1,21,105);
 	SMS_setTileatXY(31,0,106);
 	SMS_setTileatXY(31,21,106);
+
+	// TIME: //
+	SMS_setTileatXY(3,22,210);  
+	SMS_setTileatXY(4,22,211);  
+	SMS_setTileatXY(5,22,212);  
+	SMS_setTileatXY(6,22,213);  
+	SMS_setTileatXY(7,22,214);  
 
 }
 
@@ -765,6 +774,9 @@ void level_load(int level, int seed) {
 	if(level == 0) {
 		srand(seed);  // re-seed the random number generator each time //
 
+		int r_pellet_x = 0;
+		int r_pellet_y = 0;
+		
 		level_pellet_num = rand_num(5,20);
 		level_walls_num = rand_num(5,15);
 		en_l_y = rand_num(en_lim_top, en_lim_bot);
@@ -774,8 +786,13 @@ void level_load(int level, int seed) {
 		level_pellet_collected = 0;
 		// Pellets //
 		for(int i = 0; i < level_pellet_num; i++ ) {
-			pellets_x_y[i][0] = rand_num(pl_lim_left, pl_lim_right);
-			pellets_x_y[i][1] = rand_num(pl_lim_top, pl_lim_bottom);
+			r_pellet_x = rand_num(pl_lim_left, pl_lim_right);
+			r_pellet_y = rand_num(pl_lim_top, pl_lim_bottom);
+			
+			pellets_x_y[i][0] = r_pellet_x;
+			pellets_x_y[i][1] = r_pellet_y;
+			r_pellets_x_y[i][0] = pellets_x_y[i][0];
+			r_pellets_x_y[i][1] = pellets_x_y[i][1];
 		}
 
 		// Walls //
@@ -787,7 +804,8 @@ void level_load(int level, int seed) {
 			if(wall_pellet_col == 0) { 
 				walls_x_y[i][0] = w_x;
 				walls_x_y[i][1] = w_y;
-				
+				r_walls_x_y[i][0] = w_x;
+				r_walls_x_y[i][1] = w_y;
 			}
 			i++;
 		}
@@ -807,6 +825,28 @@ void level_reset(void) {
 	level_counter = 10;
 }
 
+void random_level_reset_arrays(void) {
+	int i;
+
+	
+	for(i = 0; i < level_walls_num; i++) {
+		walls_x_y[i][0] = r_walls_x_y[i][0];
+		walls_x_y[i][1] = r_walls_x_y[i][1];
+	}
+
+	for(i = 0; i < level_pellet_num; i++) {
+		pellets_x_y[i][0] = r_pellets_x_y[i][0];
+		pellets_x_y[i][1] = r_pellets_x_y[i][1];
+	}
+
+	en_l_y = rand_num(en_lim_top, en_lim_bot);
+	en_l_dir = 0;
+	en_r_y = rand_num(en_lim_top+10, en_lim_bot-10);
+	en_r_dir = 1;
+	level_pellet_collected = 0;
+
+}
+
 // Player Related Stuff //
 void player_draw(void) {
 
@@ -923,7 +963,7 @@ void player_pellet_collision(void) {
 				pellets_x_y[i][0] = 200; //remove pellet//
 				pellets_x_y[i][1] = 200;
 				level_pellet_collected++;
-				//PSGSFXPlay(pickup_psg,SFX_CHANNEL3);
+				PSGSFXPlay(pickup_psg,SFX_CHANNEL2);
 				score += 10;
 			}
 	}
@@ -1579,13 +1619,11 @@ void main(void) {
 		// Level Complete // 
 		if(gamestate == 3) {
 			PSGStop();
+			level_fixed_current++;
+			if(gamemode == 1) { if(level_fixed_current > 10) { gamestate = 0; checkHiScore(); doGameEnd(); }}
 			doLivesScreen();
 			level_reset();
-			level_fixed_current++;
-			if(gamemode == 1) { 
-				if(level_fixed_current > 10) { gamestate = 0; checkHiScore(); doGameEnd(); }	
-				level_load(level_fixed_current,c); 
-			}
+			if(gamemode == 1) { level_load(level_fixed_current,c); }
 			if(gamemode == 0) { level_load(0,c); }
 		}
 
@@ -1596,10 +1634,19 @@ void main(void) {
 			reset_enemy_variables();
 			reset_player_variables();
 			doLivesScreen();
-			walls_draw();
-			if(gamemode == 0) { PSGPlay(random_world_psg); }
-			if(gamemode == 1) { PSGPlay(fixed_world_psg); }
-			if(level_counter == 0) { level_counter = 10; }
+			
+			if(gamemode == 0) { 
+				random_level_reset_arrays();
+				walls_draw(); 
+				PSGPlay(random_world_psg); 
+			}
+			if(gamemode == 1) { 
+				level_reset();
+				level_load(level_fixed_current,c);
+				PSGPlay(fixed_world_psg); 
+			}
+			// if(level_counter == 0) { level_counter = 10; }
+			level_counter = 10;
 			frame_counter = 0; 
 			gamestate = 1;
 		}