X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Fvgmtest.c;h=61b1df728c51e44263ee2f48b83fc45d0e5e9a0e;hb=6021fc3f27b895d382fbd30488ead35657e39196;hp=4657000daeb1a887285c5a85e3cfb7c06c4a82a3;hpb=308ed9626917d5ae04dbad550cd74755fcee644a;p=16.git

diff --git a/src/vgmtest.c b/src/vgmtest.c
index 4657000d..61b1df72 100755
--- a/src/vgmtest.c
+++ b/src/vgmtest.c
@@ -1,5 +1,5 @@
 /* Project 16 Source Code~
- * Copyright (C) 2012-2015 sparky4 & pngwen & andrius4669
+ * Copyright (C) 2012-2018 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover
  *
  * This file is part of Project 16.
  *
@@ -24,8 +24,14 @@
  */
 
 #include "src/lib/vgmsnd/vgmSnd.h"
-#include "src/lib/doslib/adlib.h"
-#include "src/lib/16_in.h"
+#include "src/lib/16_snd.h"
+//#include "src/lib/doslib/adlib.h"
+#include "src/lib/16_tail.h"
+#include "src/lib/16_pm.h"
+#include "src/lib/16_ca.h"
+#include "src/lib/16_mm.h"
+#include "src/lib/16_hc.h"
+#include "src/lib/16_dbg.h"
 
 void OPL2_Write(UINT8 reg, UINT8 data);
 UINT8 OPL2_ReadStatus(void);
@@ -34,38 +40,41 @@ void OPL2_Write(UINT8 reg, UINT8 data)
 {
 	//ym3812_w(0, 0, reg);
 	//ym3812_w(0, 1, data);
-	//opl2out(reg, data);
-	adlib_write((word) reg,(byte)data);
+	opl2out((word)reg, (word)data);
 	return;
 }
 
 UINT8 OPL2_ReadStatus(void)
 {
-	//return(inp(ADLIB_FM_ADDRESS));
-	return (UINT8)adlib_read(0);
+	return(inp(ADLIB_FM_ADDRESS));
 	//return ym3812_r(0, 0);
 }
 
 void
 main(int argc, char *argv[])
 {
-	global_game_variables_t gvar;
+	static global_game_variables_t gvar;
 	VGM_FILE pee[9];
-	player_t player[MaxPlayers];
+	char bakapee[64] = "data/02.vgm";
 
-	//opl2out(0x105, 0x00);
+	if(argv[1]) strcpy(bakapee, argv[1]);
+
+//	MM_Startup(&gvar);
+//	PM_Startup(&gvar); PM_UnlockMainMem(&gvar);
+//	CA_Startup(&gvar);
+	StartupCAMMPM(&gvar);
+	printf("%x\n", OpenVGMFile(bakapee, &pee[0], &gvar));
 	InitEngine();
-	OpenVGMFile("data/0.vgm", &pee[0]);
-	IN_Startup();
-	IN_Default(0,&player,ctrl_Joystick);
 	PlayMusic(&pee[0]);
-	while(!IN_KeyDown(sc_Escape))
+	while(!kbhit())
 	{
-		IN_ReadControl(0,&player);
 		UpdateSoundEngine();
 	}
 	StopMusic();
-	FreeVGMFile(&pee[0]);
+	FreeVGMFile(&pee[0], &gvar); printf("ok\n");
 	DeinitEngine();
-	IN_Shutdown();
+//	PM_Shutdown(&gvar);
+//	CA_Shutdown(&gvar);
+//	MM_Shutdown(&gvar);
+	ShutdownCAMMPM(&gvar);
 }