Add VM variable storage type

Define a dedicated `vmvar_t` type for values stored in variable pages and propagate it through interfaces that expose those values. Keep the type as int for now so this commit does not change runtime behavior. This separates VM storage from ordinary int buffers and makes a later conversion to 16-bit storage mechanically checkable.
2026-09-22 22:48:08 +03:00 · 2026-07-17 08:48:10 +09:00
parent 0cf9c1fe8d
commit a627a8ea3d
79 changed files with 544 additions and 529 deletions
@@ -12,7 +12,7 @@ static void Init() {
 	int p1 = getCaliValue(); /* ISys3x */
 	int p2 = getCaliValue(); /* IWinMsg */
 	int p3 = getCaliValue(); /* ITimer */
-	int *var = getCaliVariable();
+	vmvar_t *var = getCaliVariable();
 	
 	*var = 1;
 	
@@ -15,8 +15,8 @@ static void Init() {

 static void ExistKeyFile() {
 	const char *p1 = sl_getString(0);
-	int *p2 = getCaliVariable();
-	int *var = getCaliVariable();
+	vmvar_t *p2 = getCaliVariable();
+	vmvar_t *var = getCaliVariable();
 	
 	*var = 1;
 	
@@ -25,8 +25,8 @@ static void ExistKeyFile() {

 static void CheckProtectFile() {
 	const char *p1 = sl_getString(0);
-	int *p2 = getCaliVariable();
-	int *var = getCaliVariable();
+	vmvar_t *p2 = getCaliVariable();
+	vmvar_t *var = getCaliVariable();
 	
 	*var = 1;

@@ -35,8 +35,8 @@ static void CheckProtectFile() {

 static void CreateKeyFile() {
 	const char *p1 = sl_getString(0);
-	int *p2 = getCaliVariable();
-	int *var = getCaliVariable();
+	vmvar_t *p2 = getCaliVariable();
+	vmvar_t *var = getCaliVariable();
 	
 	*var = 1;

@@ -135,7 +135,7 @@ static void Create() {
 	   height: surface の高さ
 	   bpp   : surface の深さ(24bppのみサポート)
 	*/
-	int *var   = getCaliVariable();
+	vmvar_t *var   = getCaliVariable();
 	int width  = getCaliValue();
 	int height = getCaliValue();
 	int bpp    = getCaliValue();
@@ -162,7 +162,7 @@ static void CreatePixelOnly() {
 	   height: surface の高さ
 	   bpp   : surface の深さ(24bpp only)
 	*/
-	int *var   = getCaliVariable();
+	vmvar_t *var   = getCaliVariable();
 	int width  = getCaliValue();
 	int height = getCaliValue();
 	int bpp    = getCaliValue();
@@ -188,7 +188,7 @@ static void CreateAMapOnly() {
 	   width : surface の幅
 	   height: surface の高さ
 	*/
-	int *var   = getCaliVariable();
+	vmvar_t *var   = getCaliVariable();
 	int width  = getCaliValue();
 	int height = getCaliValue();
 	surface_t *s;
@@ -214,7 +214,7 @@ static void IsSurface() {
 	   var : 結果を返す変数。surface ならば 1, !surface ならば 0
 	*/
 	int p1   = getCaliValue();
-	int *var = getCaliVariable();
+	vmvar_t *var = getCaliVariable();

 	*var = sf_get(p1) ? 1 : 0;

@@ -229,7 +229,7 @@ static void IsPixel() {
 	   var : 結果を返す変数。pixel ならば 1, !pixel ならば 0
 	*/
 	int p1   = getCaliValue();
-	int *var = getCaliVariable();
+	vmvar_t *var = getCaliVariable();
 	surface_t *s;
 	
 	s = sf_get(p1);
@@ -251,7 +251,7 @@ static void IsAlpha() {
 	   var : 結果を返す変数。alpha ならば 1, !alpha ならば 0
 	*/
 	int p1   = getCaliValue();
-	int *var = getCaliVariable();
+	vmvar_t *var = getCaliVariable();
 	surface_t *s;
 	
 	s = sf_get(p1);
@@ -273,7 +273,7 @@ static void GetWidth() {
 	   var : 結果を返す変数。
 	*/
 	int p1   = getCaliValue();
-	int *var = getCaliVariable();
+	vmvar_t *var = getCaliVariable();
 	surface_t *s;
 	
 	s = sf_get(p1);
@@ -295,7 +295,7 @@ static void GetHeight() {
 	   var : 結果を返す変数。
 	*/
 	int p1   = getCaliValue();
-	int *var = getCaliVariable();
+	vmvar_t *var = getCaliVariable();
 	surface_t *s;
 	
 	s = sf_get(p1);
@@ -310,7 +310,7 @@ static void GetHeight() {
 }

 static void GetCreatedSurface() { /* not used ? */
-	int *var = getCaliVariable();
+	vmvar_t *var = getCaliVariable();
 	
 	TRACE_UNIMPLEMENTED("Gpx.GetCreatedSurface %p:", var);
 }
@@ -322,7 +322,7 @@ static void LoadCG() {
 	   var : 作成した surface の番号を返す変数
 	   p1  : 読み込む CG の番号
 	*/
-	int *var = getCaliVariable();
+	vmvar_t *var = getCaliVariable();
 	int p1   = getCaliValue();
 	
 	*var = load_cg_main(p1 -1);
@@ -331,14 +331,14 @@ static void LoadCG() {
 }

 static void GetCGPosX() { /* not useed ? */
-	int *var = getCaliVariable();
+	vmvar_t *var = getCaliVariable();
 	int p1 = getCaliValue();
 	
 	TRACE_UNIMPLEMENTED("Gpx.GetCgPosX %p,%d:", var, p1);
 }

 static void GetCGPosY() { /* not useed ? */
-	int *var = getCaliVariable();
+	vmvar_t *var = getCaliVariable();
 	int p1 = getCaliValue();
 	
 	TRACE_UNIMPLEMENTED("Gpx.GetCgPosY %p,%d:", var, p1);
@@ -1117,7 +1117,7 @@ static void EffectCopy() {
 	int sw   = getCaliValue();
 	int sh   = getCaliValue();
 	int time = getCaliValue();
-	int *var = getCaliVariable();
+	vmvar_t *var = getCaliVariable();

 	TRACE("Gpx.EffectCopy %d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%p:", no, dx, dy, ss1, sx1, sy1, ss2, sx2, sy2, sw, sh, time, var);

@@ -17,7 +17,7 @@ void gpx_effect(int no,
 		surface_t *src, int sx, int sy,
 		int width, int height,
 		int time,
-		int *endtype) {
+		vmvar_t *endtype) {
 	surface_t *write = nact->ags.dib;
 	if (!gr_clip(dst, &dx, &dy, &width, &height, write, &wx, &wy)) return;
 	if (!gr_clip(src, &sx, &sy, &width, &height, write, &wx, &wy)) return;
@@ -1,6 +1,7 @@
 #ifndef __GLEFFECTCOPY_H__
 #define __GLEFFECTCOPY_H__

+#include "portab.h"
 #include "surface.h"

 extern void gpx_effect(int no,
@@ -9,6 +10,6 @@ extern void gpx_effect(int no,
 		       surface_t *src, int sx, int sy,
 		       int width, int height,
 		       int time,
-		       int *endtype);
+		       vmvar_t *endtype);

 #endif /* __GLEFFECTCOPY_H__ */
@@ -53,7 +53,7 @@ static void RandMTGet() {
 	  var: 結果を返す変数
 	*/
 	int num  = getCaliValue();
-	int *var = getCaliVariable();
+	vmvar_t *var = getCaliVariable();
 	
 	if (num == 0 || num == 1) {
 		*var = num;
@@ -83,7 +83,7 @@ static void RandMTGetNumTable() {

 	  var: 乱数を格納する変数
 	*/
-	int *var = getCaliVariable();
+	vmvar_t *var = getCaliVariable();
 	
 	*var = (int)(genrand() * numtblmax) + 1;
 	
@@ -17,7 +17,7 @@ static bool valid;
 static int action;

 static void Init() {
-	int *p1 = getCaliVariable();
+	vmvar_t *p1 = getCaliVariable();
 	int p2 = getCaliValue(); /* ISys3x */
 	int p3 = getCaliValue();
 	int p4 = getCaliValue();
@@ -30,7 +30,7 @@ static void Init() {
 }

 static void Start() {
-	int *p1 = getCaliVariable();
+	vmvar_t *p1 = getCaliVariable();
 	int p2 = getCaliValue();

 	char *fname_utf8 = sjis2utf(svar_get(p2));
@@ -52,7 +52,7 @@ static void SetValid() {
 }

 static void GetValid() {
-	int *p1 = getCaliVariable();
+	vmvar_t *p1 = getCaliVariable();

 	*p1 = valid;

@@ -68,7 +68,7 @@ static void SetAction() {
 }

 static void GetAction() {
-	int *p1 = getCaliVariable();
+	vmvar_t *p1 = getCaliVariable();

 	*p1 = action;

@@ -22,7 +22,7 @@ night_t nightprv;


 static void Init(void) { /* 0 */
-	int *var = getCaliVariable();
+	vmvar_t *var = getCaliVariable();
 	int p1 = getCaliValue();  /* ISys3xCG */
 	int p2 = getCaliValue();  /* ISys3xDIB */
 	int p3 = getCaliValue();  /* ISys3xMsgString */
@@ -213,7 +213,7 @@ static void SetSelMode(void) { /* 18 */

 // キー入力待ち後、改ページ
 static void AnalyzeMessage(void) { /* 19 */
-	int *var = getCaliVariable(); // 入力されたキー
+	vmvar_t *var = getCaliVariable(); // 入力されたキー

 	*var = ntmsg_ana();
 	
@@ -297,7 +297,7 @@ static void ScreenCG(void) { /* 27 */
 }

 static void RunGameMain(void) { /* 28 */
-	int *p1 = getCaliVariable(); // result
+	vmvar_t *p1 = getCaliVariable(); // result
 	int p2 = getCaliValue();     // month
 	int p3 = getCaliValue();     // day
 	int p4 = getCaliValue();     // day of week
@@ -313,7 +313,7 @@ static void RunGameMain(void) { /* 28 */
 }

 static void CheckNewGame(void) { /* 29 */
-	int *p1 = getCaliVariable();
+	vmvar_t *p1 = getCaliVariable();
 	
 	*p1 = 0;
 	
@@ -347,9 +347,9 @@ static void SetDate(void) { /* 33 */
 }

 static void GetDate(void) { /* 34 */
-	int *p1 = getCaliVariable(); // month
-	int *p2 = getCaliVariable(); // day
-	int *p3 = getCaliVariable(); // day of weeek
+	vmvar_t *p1 = getCaliVariable(); // month
+	vmvar_t *p2 = getCaliVariable(); // day
+	vmvar_t *p3 = getCaliVariable(); // day of weeek

 	*p1 = night.Month;
 	*p2 = night.Day;
@@ -363,7 +363,7 @@ static void SelectGameLevel(void) { /* 35 */
 }

 static void RunEventDungeon(void) { /* 36 */
-	int *p1 = getCaliVariable();
+	vmvar_t *p1 = getCaliVariable();
 	int p2 = getCaliValue();

 	*p1 = 1;
@@ -478,7 +478,7 @@ static void RunSoundMode(void) { /* 48 */
 }

 static void RunMapEditor(void) { /* 49 */
-	int *p1 = getCaliVariable();
+	vmvar_t *p1 = getCaliVariable();
 	
 	TRACE_UNIMPLEMENTED("NIGHTDLL.RunMapEditor %p:", p1);
 }
@@ -495,21 +495,21 @@ static void VisualListAdd(void) { /* 51 */
 }

 static void GetLocalCountCG(void) { /* 52 */
-	int *p1 = getCaliVariable();
+	vmvar_t *p1 = getCaliVariable();
 	int p2 = getCaliValue();
 	
 	TRACE_UNIMPLEMENTED("NIGHTDLL.GetLocalCountCG %p,%d:", p1, p2);
 }

 static void PlayMemory(void) { /* 53 */
-	int *p1 = getCaliVariable(); // 回想ページ
-	int *p2 = getCaliVariable(); // 回想RESULT
+	vmvar_t *p1 = getCaliVariable(); // 回想ページ
+	vmvar_t *p2 = getCaliVariable(); // 回想RESULT
 	
 	TRACE_UNIMPLEMENTED("NIGHTDLL.PlayMemory %p,%p:", p1, p2);
 }

 static void GetEventFlagTotal(void) { /* 54 */
-	int *p1 = getCaliVariable();
+	vmvar_t *p1 = getCaliVariable();
 	int p2 = getCaliValue();
 	
 	TRACE_UNIMPLEMENTED("NIGHTDLL.GetEventFlagTotal %p,%d:", p1, p2);
@@ -528,25 +528,25 @@ static void GetPlayerName(void) { /* 56 */
 }

 static void SaveGame(void) { /* 57 */
-	int *p1 = getCaliVariable();
+	vmvar_t *p1 = getCaliVariable();
 	
 	TRACE_UNIMPLEMENTED("NIGHTDLL.SaveGame %p:", p1);
 }

 static void LoadGame(void) { /* 58 */
-	int *p1 = getCaliVariable();
+	vmvar_t *p1 = getCaliVariable();
 	
 	TRACE_UNIMPLEMENTED("NIGHTDLL.LoadGame %p:", p1);
 }

 static void ExistSaveData(void) { /* 59 */
-	int *p1 = getCaliVariable();
+	vmvar_t *p1 = getCaliVariable();
 	
 	TRACE_UNIMPLEMENTED("NIGHTDLL.ExistSaveData %p:", p1);
 }

 static void ExistStartData(void) { /* 60 */
-	int *p1 = getCaliVariable();
+	vmvar_t *p1 = getCaliVariable();

 	TRACE_UNIMPLEMENTED("NIGHTDLL.ExistStartData %p:", p1);
 }
@@ -580,13 +580,13 @@ static void DebugScenario(void) { /* 66 */
 }

 static void GetDLLTime(void) { /* 67 */
-	int *p1 = getCaliVariable();
-	int *p2 = getCaliVariable();
-	int *p3 = getCaliVariable();
-	int *p4 = getCaliVariable();
-	int *p5 = getCaliVariable();
-	int *p6 = getCaliVariable();
-	int *p7 = getCaliVariable();
+	vmvar_t *p1 = getCaliVariable();
+	vmvar_t *p2 = getCaliVariable();
+	vmvar_t *p3 = getCaliVariable();
+	vmvar_t *p4 = getCaliVariable();
+	vmvar_t *p5 = getCaliVariable();
+	vmvar_t *p6 = getCaliVariable();
+	vmvar_t *p7 = getCaliVariable();

 	TRACE_UNIMPLEMENTED("NIGHTDLL.GetDLLTime %p,%p,%p,%p,%p,%p,%p:", p1, p2, p3, p4, p5, p6, p7);
 }
@@ -90,7 +90,7 @@ static void Init() {
 	int p1 = getCaliValue(); /* ISys3x */
 	int p2 = getCaliValue(); /* IWinMsg */
 	int p3 = getCaliValue(); /* ITimer */
-	int *var = getCaliVariable();
+	vmvar_t *var = getCaliVariable();
 	
 	*var = 1;
 	
@@ -51,7 +51,7 @@ static void Get() {
 	  var: 結果を返す変数
 	*/
 	int num  = getCaliValue();
-	int *var = getCaliVariable();
+	vmvar_t *var = getCaliVariable();
 	
 	if (num == 0 || num == 1) {
 		*var = num;
@@ -65,7 +65,7 @@ static void Get() {
 static void GetNoOverlap() {
 	int min  = getCaliValue();
 	int n    = getCaliValue();
-	int *var = getCaliVariable();
+	vmvar_t *var = getCaliVariable();

 	*var = (int)(genrand() * n) + min;

@@ -42,7 +42,7 @@ static void CreateChannel(void) {
 static void Prepare(void) {
 	int ch = getCaliValue();
 	int no = getCaliValue();
-	int *result = getCaliVariable();
+	vmvar_t *result = getCaliVariable();

 	if (ch == 0) {
 		current_no = no;
@@ -97,7 +97,7 @@ static void PlayPosSample(void) {

 static void IsPlay(void) {
 	int ch = getCaliValue();
-	int *result = getCaliVariable();
+	vmvar_t *result = getCaliVariable();

 	if (ch == 0) {
 		*result = current_no && musbgm_isplaying(current_no);
@@ -127,10 +127,10 @@ static void Restart(void) {

 static void GetPlayPos(void) {
 	int ch = getCaliValue();
-	int *hour = getCaliVariable();
-	int *min = getCaliVariable();
-	int *sec = getCaliVariable();
-	int *msec = getCaliVariable();
+	vmvar_t *hour = getCaliVariable();
+	vmvar_t *min = getCaliVariable();
+	vmvar_t *sec = getCaliVariable();
+	vmvar_t *msec = getCaliVariable();
 	if (ch == 0) {
 		int time = musbgm_getpos(current_no);
 		*hour = time / 360000;
@@ -149,8 +149,8 @@ static void GetPlayPos(void) {

 static void GetPlayPosSample(void) {
 	int p1 = getCaliValue();
-	int *var1 = getCaliVariable();
-	int *var2 = getCaliVariable();
+	vmvar_t *var1 = getCaliVariable();
+	vmvar_t *var2 = getCaliVariable();
 	TRACE_UNIMPLEMENTED("S3xMusic.GetPlayPosSample %d, %p, %p:", p1, var1, var2);
 }

@@ -192,7 +192,7 @@ static void FadeVolume(void) {

 static void IsFade(void) {
 	int ch = getCaliValue();
-	int *result = getCaliVariable();
+	vmvar_t *result = getCaliVariable();
 	*result = 0;
 	TRACE_UNIMPLEMENTED("S3xMusic.IsFade %d => %d:", ch, *result);
 }
@@ -636,7 +636,7 @@ static void QuakeSprite() {
 */
 static void QuerySpriteIsExist() {
 	int wNum = getCaliValue();
-	int *var = getCaliVariable();
+	vmvar_t *var = getCaliVariable();

 	*var = sp_exists(wNum) ? 1 : 0;
 	
@@ -654,10 +654,10 @@ static void QuerySpriteIsExist() {
 */
 static void QuerySpriteInfo() {
 	int wNum   = getCaliValue();
-	int *vType = getCaliVariable();
-	int *vCG1  = getCaliVariable();
-	int *vCG2  = getCaliVariable();
-	int *vCG3  = getCaliVariable();
+	vmvar_t *vType = getCaliVariable();
+	vmvar_t *vCG1  = getCaliVariable();
+	vmvar_t *vCG2  = getCaliVariable();
+	vmvar_t *vCG3  = getCaliVariable();
 	
 	sp_query_info(wNum, vType, vCG1, vCG2, vCG3);
 	
@@ -672,7 +672,7 @@ static void QuerySpriteInfo() {
 */
 static void QuerySpriteShow() {
 	int wNum = getCaliValue();
-	int *vShow = getCaliVariable();
+	vmvar_t *vShow = getCaliVariable();

 	sp_query_show(wNum, vShow);
 	
@@ -688,8 +688,8 @@ static void QuerySpriteShow() {
 */
 static void QuerySpritePos() {
 	int wNum = getCaliValue();
-	int *vX  = getCaliVariable();
-	int *vY  = getCaliVariable();
+	vmvar_t *vX  = getCaliVariable();
+	vmvar_t *vY  = getCaliVariable();
 	
 	sp_query_pos(wNum, vX, vY);
 	
@@ -705,8 +705,8 @@ static void QuerySpritePos() {
 */
 static void QuerySpriteSize() {
 	int wNum     = getCaliValue();
-	int *vWidth  = getCaliVariable();
-	int *vHeight = getCaliVariable();
+	vmvar_t *vWidth  = getCaliVariable();
+	vmvar_t *vHeight = getCaliVariable();
 	
 	sp_query_size(wNum, vWidth, vHeight);
 	
@@ -722,8 +722,8 @@ static void QuerySpriteSize() {
 */
 static void QueryTextPos() {
 	int wNum = getCaliValue();
-	int *vX  = getCaliVariable();
-	int *vY  = getCaliVariable();
+	vmvar_t *vX  = getCaliVariable();
+	vmvar_t *vY  = getCaliVariable();
 	
 	sp_query_textpos(wNum, vX, vY);
 	
@@ -762,7 +762,7 @@ static void CG_Reset() {
 */
 static void CG_QueryType() {
 	int wNumCG = getCaliValue();
-	int *vType = getCaliVariable();
+	vmvar_t *vType = getCaliVariable();
 	
 	*vType = scg_querytype(wNumCG);
 	
@@ -778,8 +778,8 @@ static void CG_QueryType() {
 */
 static void CG_QuerySize() {
 	int wNumCG   = getCaliValue();
-	int *vWidth  = getCaliVariable();
-	int *vHeight = getCaliVariable();
+	vmvar_t *vWidth  = getCaliVariable();
+	vmvar_t *vHeight = getCaliVariable();
 	
 	scg_querysize(wNumCG, vWidth, vHeight);
 	
@@ -794,7 +794,7 @@ static void CG_QuerySize() {
 */
 static void CG_QueryBpp() {
 	int wNumCG = getCaliValue();
-	int *vBpp  = getCaliVariable();
+	vmvar_t *vBpp  = getCaliVariable();
 	
 	*vBpp = scg_querybpp(wNumCG);
 	
@@ -809,7 +809,7 @@ static void CG_QueryBpp() {
 */
 static void CG_ExistAlphaMap() {
 	int wNumCG = getCaliValue();
-	int *vMask = getCaliVariable();
+	vmvar_t *vMask = getCaliVariable();
 	
 	*vMask = scg_existalphamap(wNumCG) ? 1 : 0;
 	
@@ -1021,7 +1021,7 @@ static void CG_PartCopy() {
 *   @param vKey: 入力されたキー
 */
 static void WaitKeySimple() {
-	int *vKey = getCaliVariable();
+	vmvar_t *vKey = getCaliVariable();

 	TRACE("SACT.WaitKeySimple %d:", vKey);

@@ -1071,10 +1071,10 @@ static void WaitKeyMessage() {
 *   @param vRsv2: 予約
 */
 static void WaitKeySprite() {
-	int *vOK = getCaliVariable();
-	int *vRND = getCaliVariable();
-	int *vRsv1 = getCaliVariable();
-	int *vRsv2 = getCaliVariable();
+	vmvar_t *vOK = getCaliVariable();
+	vmvar_t *vRND = getCaliVariable();
+	vmvar_t *vRsv1 = getCaliVariable();
+	vmvar_t *vRsv2 = getCaliVariable();
 	
 	TRACE("SACT.WaitKeySprite %p,%p,%p,%p:", vOK, vRND, vRsv1, vRsv2);
 	
@@ -1092,7 +1092,7 @@ static void WaitKeySprite() {
 static void PeekKey() {
 	static int prevKeyCode = NUM_KEYCODES;
 	int nKeyCode = getCaliValue();
-	int *vResult = getCaliVariable();
+	vmvar_t *vResult = getCaliVariable();

 	// This function is called successively with different nKeyCodes.
 	// Only the first call hits the scheduler.
@@ -1121,8 +1121,8 @@ static void WaitMsgSkipKeyUp() {
 *   @param wTime: タイムアウト時間 (1/100sec)
 */
 static void WaitKeySimpleTimeOut() {
-	int *vRND = getCaliVariable();
-	int *vD03 = getCaliVariable();
+	vmvar_t *vRND = getCaliVariable();
+	vmvar_t *vD03 = getCaliVariable();
 	int wTime = getCaliValue();

 	sact.waittype = KEYWAIT_SIMPLE;
@@ -1153,11 +1153,11 @@ static void WaitKeySimpleTimeOut() {
 *   @param wTime: タイムアウト時間 (1/100sec)
 */
 static void WaitKeySpriteTimeOut() {
-	int *vOK = getCaliVariable();
-	int *vRND = getCaliVariable();
-	int *vD01 = getCaliVariable();
-	int *vD02 = getCaliVariable();
-	int *vD03 = getCaliVariable();
+	vmvar_t *vOK = getCaliVariable();
+	vmvar_t *vRND = getCaliVariable();
+	vmvar_t *vD01 = getCaliVariable();
+	vmvar_t *vD02 = getCaliVariable();
+	vmvar_t *vD03 = getCaliVariable();
 	int wTime = getCaliValue();
 	
 	sp_keywait(vOK, vRND, vD01, vD02, vD03, wTime);
@@ -1171,7 +1171,7 @@ static void WaitKeySpriteTimeOut() {
 *   @param vSkip:
 */
 static void QueryMessageSkip() {
-	int *vSkip = getCaliVariable();
+	vmvar_t *vSkip = getCaliVariable();

 	*vSkip = msgskip_isSkipping() ? 1 : 0;
 	
@@ -1219,7 +1219,7 @@ static void MessageOutput() {
 	int wMessageSpeed  = getCaliValue();
 	int wMessageLineSpace = getCaliValue();
 	int wMessageAlign   = 0;
-	int *vMessageLength  = NULL;
+	vmvar_t *vMessageLength  = NULL;
 	
 	if (sact.version >= 110) {
 		wMessageAlign  = getCaliValue();
@@ -1266,7 +1266,7 @@ static void MessageOutputEx() {
 	int wRubySize      = getCaliValue();
 	int wRubyFont      = getCaliValue();
 	int wRubyLineSpace = getCaliValue();
-	int *vLength = NULL;
+	vmvar_t *vLength = NULL;
 	
 	if (sact.version >= 120) {
 		vLength = getCaliVariable();
@@ -1311,7 +1311,7 @@ static void MessageClear() {
 *   @param wResult: 結果を返す変数
 */
 static void MessageIsEmpty() {
-	int *wResult = getCaliVariable();
+	vmvar_t *wResult = getCaliVariable();

 	*wResult = smsg_is_empty() ? 1 : 0;
 	
@@ -1325,7 +1325,7 @@ static void MessageIsEmpty() {
 *   @param nTopStringNum: バッファを取得する文字列変数の最初
 */
 static void MessagePeek() {
-	int *vCount = getCaliVariable();
+	vmvar_t *vCount = getCaliVariable();
 	int nTopStringNum = getCaliValue();

 	*vCount = smsg_peek(nTopStringNum);
@@ -1388,7 +1388,7 @@ static void MenuAdd() {
 *   @param nAlign: 行そろえ (0:左, 1:中央, 2: 右) (1.1~)
 */
 static void MenuOpen() {
-	int *wMenuResult = getCaliVariable();
+	vmvar_t *wMenuResult = getCaliVariable();
 	int wNum         = getCaliValue();
 	int wChoiceSize  = getCaliValue();
 	int wMenuOutSpc  = getCaliValue();
@@ -1464,7 +1464,7 @@ static void Numeral_SetCG() {
 static void Numeral_GetCG() {
 	int nNum = getCaliValue();
 	int nIndex = getCaliValue();
-	int *vCG = getCaliVariable();
+	vmvar_t *vCG = getCaliVariable();
 	
 	sp_num_getcg(nNum, nIndex, vCG);
 	
@@ -1497,8 +1497,8 @@ static void Numeral_SetPos() {
 */
 static void Numeral_GetPos() {
 	int nNum = getCaliValue();
-	int *vX = getCaliVariable();
-	int *vY = getCaliVariable();
+	vmvar_t *vX = getCaliVariable();
+	vmvar_t *vY = getCaliVariable();
 	
 	sp_num_getpos(nNum, vX, vY);
 	
@@ -1528,7 +1528,7 @@ static void Numeral_SetSpan() {
 */
 static void Numeral_GetSpan() {
 	int nNum = getCaliValue();
-	int *vSpan = getCaliVariable();
+	vmvar_t *vSpan = getCaliVariable();

 	sp_num_getspan(nNum, vSpan);
 	
@@ -1596,7 +1596,7 @@ static void TimerSet() {
 */
 static void TimerGet() {
 	int wTimerID = getCaliValue();
-	int *vRND = getCaliVariable();
+	vmvar_t *vRND = getCaliVariable();

 	*vRND = stimer_get(wTimerID);
 	
@@ -1696,7 +1696,7 @@ static void SoundWait() {
 */
 static void SoundWaitKey() {
 	int wNum = getCaliValue();
-	int *vKey = getCaliVariable();
+	vmvar_t *vKey = getCaliVariable();
 	
 	ssnd_waitkey(wNum, vKey);
 	
@@ -1797,7 +1797,7 @@ static void SpriteSoundOB() {
 */
 static void MusicCheck() {
 	int wNum = getCaliValue();
-	int *vRND = getCaliVariable();
+	vmvar_t *vRND = getCaliVariable();
 	
 	*vRND = ald_exists(DRIFILE_BGM, wNum - 1) ? 1 : 0;
 	
@@ -1812,7 +1812,7 @@ static void MusicCheck() {
 */
 static void MusicGetLength() {
 	int wNum = getCaliValue();
-	int *vRND = getCaliVariable();
+	vmvar_t *vRND = getCaliVariable();
 	
 	*vRND = musbgm_getlen(wNum);
 	
@@ -1827,7 +1827,7 @@ static void MusicGetLength() {
 */
 static void MusicGetPos() {
 	int wNum = getCaliValue();
-	int *vRND = getCaliVariable();
+	vmvar_t *vRND = getCaliVariable();
 	
 	*vRND = musbgm_getpos(wNum);
 	
@@ -1937,7 +1937,7 @@ static void MusicWaitPos() {
 */
 static void SoundGetLinkNum() {
 	int wNum = getCaliValue();
-	int *vRND = getCaliVariable();
+	vmvar_t *vRND = getCaliVariable();

 	*vRND = ssnd_getlinknum(wNum);
 	
@@ -1957,7 +1957,7 @@ static void SoundGetLinkNum() {
 *     pos = ((pos2-pos1) / (val2-val1)) * (val-val1) + pos1
 */
 static void ChartPos() {
-	int *pos = getCaliVariable();
+	vmvar_t *pos = getCaliVariable();
 	int pos1 = getCaliValue();
 	int pos2 = getCaliValue();
 	int val1 = getCaliValue();
@@ -2002,7 +2002,7 @@ static void Maze_Create() {
 * SACT.Maze_Get (1.0~)
 */
 static void Maze_Get() {
-	int *p1 = getCaliVariable();
+	vmvar_t *p1 = getCaliVariable();
 	int p2 = getCaliValue();
 	int p3 = getCaliValue();

@@ -2013,7 +2013,7 @@ static void Maze_Get() {
 * SACT.EncryptWORD (1.0~)
 */
 static void EncryptWORD() {
-	int *array = getCaliVariable();
+	vmvar_t *array = getCaliVariable();
 	int num = getCaliValue();
 	int key = getCaliValue();

@@ -2026,7 +2026,7 @@ static void EncryptWORD() {
 * SACT.DecryptWORD (1.0~)
 */
 static void DecryptWORD() {
-	int *array = getCaliVariable();
+	vmvar_t *array = getCaliVariable();
 	int num = getCaliValue();
 	int key = getCaliValue();

@@ -2092,7 +2092,7 @@ static void XMenuRegister() {
 */
 static void XMenuGetNum() {
 	int nRegiNum = getCaliValue();
-	int *vMenuID = getCaliVariable();
+	vmvar_t *vMenuID = getCaliVariable();
 	
 	*vMenuID = spxm_getnum(nRegiNum);
 	
@@ -25,7 +25,7 @@
 #include "portab.h"

 // グラフ用チャート作成
-void schart_pos(int *pos, int pos1, int pos2, int val1, int val2, int val) {
+void schart_pos(vmvar_t *pos, int pos1, int pos2, int val1, int val2, int val) {
 	if (val1 == val2) {
 		*pos = 0;
 	} else {
@@ -24,6 +24,8 @@
 #ifndef __SACTCHART_H__
 #define __SACTCHART_H__

-void schart_pos(int *pos, int pos1, int pos2, int val1, int val2, int val);
+#include "portab.h"
+
+void schart_pos(vmvar_t *pos, int pos1, int pos2, int val1, int val2, int val);

 #endif
@@ -31,7 +31,7 @@
  適当でいいとおもう
 */

-void scryp_encrypt_word(int *array, int num, int key) {
+void scryp_encrypt_word(vmvar_t *array, int num, int key) {
 	WARNING("NOT IMPLEMENTED");
 }

@@ -24,7 +24,9 @@
 #ifndef __SACTCRYPT_H__
 #define __SACTCRYPT_H__

-void scryp_encrypt_word(int *array, int num, int key);
+#include "portab.h"
+
+void scryp_encrypt_word(vmvar_t *array, int num, int key);
 void scryp_decrypt_word(int *array, int num, int key);
 void scryp_encrypt_str(int strno, int key);
 void scryp_decrypt_str(int strno, int key);
@@ -112,7 +112,7 @@ void ssnd_wait(int no) {
 }

 // 指定の効果音が終了するか、キーが押されるまで待つ
-void ssnd_waitkey(int no, int *res) {
+void ssnd_waitkey(int no, vmvar_t *res) {
 	int slot = slt_find(no);
 	
 	if (slot == -1) {
@@ -24,11 +24,13 @@
 #ifndef __SACTSOUND_H__
 #define __SACTSOUND_H__

+#include "portab.h"
+
 void ssnd_init(void);
 void ssnd_play(int no);
 void ssnd_stop(int no, int fadetime);
 void ssnd_wait(int no);
-void ssnd_waitkey(int no, int *res);
+void ssnd_waitkey(int no, vmvar_t *res);
 void ssnd_prepare(int no);
 void ssnd_prepareLRrev(int no);
 void ssnd_playLRrev(int no);
@@ -455,7 +455,7 @@ bool sp_exists(int wNum) {
 }

 // スプライトのタイプと何番のCGがセットされているかの取得
-bool sp_query_info(int wNum, int *vtype, int *vcg1, int *vcg2, int *vcg3) {
+bool sp_query_info(int wNum, vmvar_t *vtype, vmvar_t *vcg1, vmvar_t *vcg2, vmvar_t *vcg3) {
 	sprite_t *sp;
 	
 	if (wNum >= SPRITEMAX) goto errexit;
@@ -479,7 +479,7 @@ bool sp_query_info(int wNum, int *vtype, int *vcg1, int *vcg2, int *vcg3) {
 }

 // スプライトの表示状態の取得
-bool sp_query_show(int wNum, int *vShow) {
+bool sp_query_show(int wNum, vmvar_t *vShow) {
 	if (wNum >= SPRITEMAX) goto errexit;
 	if (sact.sp[wNum]->type == SPRITE_NONE) goto errexit;

@@ -492,7 +492,7 @@ bool sp_query_show(int wNum, int *vShow) {
 }

 // スプライトの表示位置の取得
-bool sp_query_pos(int wNum, int *vx, int *vy) {
+bool sp_query_pos(int wNum, vmvar_t *vx, vmvar_t *vy) {
 	if (wNum >= SPRITEMAX) goto errexit;
 	if (sact.sp[wNum]->type == SPRITE_NONE) goto errexit;

@@ -507,7 +507,7 @@ bool sp_query_pos(int wNum, int *vx, int *vy) {
 }

 // スプライトの大きさの取得
-bool sp_query_size(int wNum, int *vw, int *vh) {
+bool sp_query_size(int wNum, vmvar_t *vw, vmvar_t *vh) {
 	sprite_t *sp;
 	
 	if (wNum >= SPRITEMAX) goto errexit;
@@ -528,7 +528,7 @@ bool sp_query_size(int wNum, int *vw, int *vh) {
 }

 // テキストスプライトの現在の文字表示位置の取得
-bool sp_query_textpos(int wNum, int *vx, int *vy) {
+bool sp_query_textpos(int wNum, vmvar_t *vx, vmvar_t *vy) {
 	if (wNum >= SPRITEMAX) goto errexit;
 	sprite_t *sp = sact.sp[wNum];
 	if (sp->type != SPRITE_MSG) goto errexit;
@@ -551,7 +551,7 @@ void sp_num_setcg(int nNum, int nIndex, int nCG) {
 }

 // NumeralXXXのCGの取得
-void sp_num_getcg(int nNum, int nIndex, int *vCG) {
+void sp_num_getcg(int nNum, int nIndex, vmvar_t *vCG) {
 	SP_ASSERT_NO(nNum);
 	
 	*vCG = sact.sp[nNum]->numeral.cg[nIndex];
@@ -566,7 +566,7 @@ void sp_num_setpos(int nNum, int nX, int nY) {
 }

 // NumeralXXXの位置の取得
-void sp_num_getpos(int nNum, int *vX, int *vY) {
+void sp_num_getpos(int nNum, vmvar_t *vX, vmvar_t *vY) {
 	SP_ASSERT_NO(nNum);
 	
 	*vX = sact.sp[nNum]->numeral.pos.x;
@@ -581,7 +581,7 @@ void sp_num_setspan(int nNum, int nSpan) {
 }

 // NumeralXXXのスパンの取得
-void sp_num_getspan(int nNum, int *vSpan) {
+void sp_num_getspan(int nNum, vmvar_t *vSpan) {
 	SP_ASSERT_NO(nNum);

 	*vSpan = sact.sp[nNum]->numeral.span;
@@ -24,6 +24,7 @@
 #ifndef __SPRITE_H__
 #define __SPRITE_H__

+#include "portab.h"
 #include "sact.h"

 #define DEFAULT_UPDATE sp_draw
@@ -51,17 +52,17 @@ void sp_set_animeinterval(int wNum, int wTime);
 bool sp_is_insprite(sprite_t *sp, int x, int y);
 void sp_set_blendrate(int wNum, int wCount, int rate);
 bool sp_exists(int wNum);
-bool sp_query_info(int wNum, int *vtype, int *vcg1, int *vcg2, int *vcg3);
-bool sp_query_show(int wNum, int *vShow);
-bool sp_query_pos(int wNum, int *vx, int *vy);
-bool sp_query_size(int wNum, int *vw, int *vh);
-bool sp_query_textpos(int wNum, int *vx, int *vy);
+bool sp_query_info(int wNum, vmvar_t *vtype, vmvar_t *vcg1, vmvar_t *vcg2, vmvar_t *vcg3);
+bool sp_query_show(int wNum, vmvar_t *vShow);
+bool sp_query_pos(int wNum, vmvar_t *vx, vmvar_t *vy);
+bool sp_query_size(int wNum, vmvar_t *vw, vmvar_t *vh);
+bool sp_query_textpos(int wNum, vmvar_t *vx, vmvar_t *vy);
 void sp_num_setcg(int nNum, int nIndex, int nCG);
-void sp_num_getcg(int nNum, int nIndex, int *vCG);
+void sp_num_getcg(int nNum, int nIndex, vmvar_t *vCG);
 void sp_num_setpos(int nNum, int nX, int nY);
-void sp_num_getpos(int nNum, int *vX, int *vY);
+void sp_num_getpos(int nNum, vmvar_t *vX, vmvar_t *vY);
 void sp_num_setspan(int nNum, int nSpan);
-void sp_num_getspan(int nNUm, int *vSpan);
+void sp_num_getspan(int nNUm, vmvar_t *vSpan);
 void sp_exp_clear(void);
 void sp_exp_add(int nNumSP1, int nNumSP2);
 void sp_exp_del(int wNum);
@@ -85,7 +86,7 @@ void sp_draw_dmap(void* data, void* userdata);
 // in sprite_msg.c
 void smsg_add(const char *msg);
 void smsg_newline(int wNum, int size);
-void smsg_out(int wNum, int wSize, int wColorR, int wColorG, int wColorB, int wFont, int wSpeed, int wLineSpace, int wAlign, int wRSize, int wRFont, int wRLineSpace, int *wLength);
+void smsg_out(int wNum, int wSize, int wColorR, int wColorG, int wColorB, int wFont, int wSpeed, int wLineSpace, int wAlign, int wRSize, int wRFont, int wRLineSpace, vmvar_t *wLength);
 void smsg_clear(int wNum);
 bool smsg_is_empty();
 int smsg_peek(int nTopStringNum);
@@ -133,7 +134,7 @@ void sp_eupdate(int type, int time, int key);
 void sp_quake_sprite(int wType, int wAmplitudeX, int wAmplitude, int wCount, int cancel);

 // in sprite_keywait.c
-void sp_keywait(int *vOK, int *vRND, int *vRsv1, int *vRsv2, int *vRsv3, int timeout);
+void sp_keywait(vmvar_t *vOK, vmvar_t *vRND, vmvar_t *vRsv1, vmvar_t *vRsv2, vmvar_t *vRsv3, int timeout);

 // in screen_quake.c
 void sp_quake_screen(int type, int p1, int p2, int time, int cancel);
@@ -113,7 +113,7 @@ static bool waitcond(int endtime) {
  @param vD03: タイムアウトした場合=1, しない場合=0
  @param wTime: タイムアウト時間 (1/100sec)
 */
-void sp_keywait(int *vOK, int *vRND, int *vD01, int *vD02, int *vD03, int timeout) {
+void sp_keywait(vmvar_t *vOK, vmvar_t *vRND, vmvar_t *vD01, vmvar_t *vD02, vmvar_t *vD03, int timeout) {
 	int curtime, endtime;
 	
 	// とりあえず全更新
@@ -171,4 +171,3 @@ void sp_keywait(int *vOK, int *vRND, int *vD01, int *vD02, int *vD03, int timeou
 	sact.waittype = KEYWAIT_NONE;
 }

-
@@ -236,7 +236,7 @@ void smsg_newline(int wNum, int size) {
  @param wRLineSpace: ルビと本文の文字間隔
  @param vLength: ???
 */
-void smsg_out(int wNum, int wSize, int wColorR, int wColorG, int wColorB, int wFont, int wSpeed, int wLineSpace, int wAlign, int wRSize, int wRFont, int wRLineSpace, int *wLength) {
+void smsg_out(int wNum, int wSize, int wColorR, int wColorG, int wColorB, int wFont, int wSpeed, int wLineSpace, int wAlign, int wRSize, int wRFont, int wRLineSpace, vmvar_t *wLength) {
 	char *msg;
 	sprite_t *sp;
 	int len = 0; // 処理した文字数?
@@ -43,10 +43,10 @@ static void GetAtArray(void) { /* 0 */
 	  type: 演算の種類
 	  vResult: 演算結果を返す変数
 	*/
-	int *vAry    = getCaliVariable();
+	vmvar_t *vAry    = getCaliVariable();
 	int cnt      = getCaliValue();
 	int type     = getCaliValue();
-	int *vResult = getCaliVariable();
+	vmvar_t *vResult = getCaliVariable();
 	int i, j;

 	TRACE("ShArray.GetAtArray %p,%d,%d,%p:", vAry, cnt, type, vResult);
@@ -88,8 +88,8 @@ static void AddAtArray(void) { /* 1 */
 	  vAry2: 配列２
 	  cnt  : 個数
 	*/
-	int *vAry1 = getCaliVariable();
-	int *vAry2 = getCaliVariable();
+	vmvar_t *vAry1 = getCaliVariable();
+	vmvar_t *vAry2 = getCaliVariable();
 	int cnt    = getCaliValue();
 	int i;
 	
@@ -114,8 +114,8 @@ static void SubAtArray(void) { /* 2 */
 	  vAry2: 配列２
 	  cnt  : 個数
 	*/
-	int *vAry1 = getCaliVariable();
-	int *vAry2 = getCaliVariable();
+	vmvar_t *vAry1 = getCaliVariable();
+	vmvar_t *vAry2 = getCaliVariable();
 	int cnt    = getCaliValue();
 	int i;
 	
@@ -140,8 +140,8 @@ static void MulAtArray(void) { /* 3 */
 	  vAry2: 配列２
 	  cnt  : 個数
 	*/
-	int *vAry1 = getCaliVariable();
-	int *vAry2 = getCaliVariable();
+	vmvar_t *vAry1 = getCaliVariable();
+	vmvar_t *vAry2 = getCaliVariable();
 	int cnt    = getCaliValue();
 	int i;
 	
@@ -166,8 +166,8 @@ static void DivAtArray(void) { /* 4 */
 	  vAry2: 配列２
 	  cnt  : 個数
 	*/
-	int *vAry1 = getCaliVariable();
-	int *vAry2 = getCaliVariable();
+	vmvar_t *vAry1 = getCaliVariable();
+	vmvar_t *vAry2 = getCaliVariable();
 	int cnt    = getCaliValue();
 	int i;
 	
@@ -196,8 +196,8 @@ static void MinAtArray(void) { /* 5 */
 	  vAry2: 配列２
 	  cnt  : 個数
 	*/
-	int *vAry1 = getCaliVariable();
-	int *vAry2 = getCaliVariable();
+	vmvar_t *vAry1 = getCaliVariable();
+	vmvar_t *vAry2 = getCaliVariable();
 	int cnt    = getCaliValue();
 	int i;
 	
@@ -219,8 +219,8 @@ static void MaxAtArray(void) { /* 6 */
 	  vAry2: 配列２
 	  cnt  : 個数
 	*/
-	int *vAry1 = getCaliVariable();
-	int *vAry2 = getCaliVariable();
+	vmvar_t *vAry1 = getCaliVariable();
+	vmvar_t *vAry2 = getCaliVariable();
 	int cnt    = getCaliValue();
 	int i;
 	
@@ -242,7 +242,7 @@ static void AndNumArray(void) { /* 7 */
 	  cnt : 個数
 	  val : ANDをとる値
 	*/
-	int *vAry = getCaliVariable();
+	vmvar_t *vAry = getCaliVariable();
 	int cnt   = getCaliValue();
 	int val   = getCaliValue();
 	int i;
@@ -263,7 +263,7 @@ static void OrNumArray(void) { /* 8 */
 	  cnt : 個数
 	  val : ORをとる値
 	*/
-	int *vAry = getCaliVariable();
+	vmvar_t *vAry = getCaliVariable();
 	int cnt   = getCaliValue();
 	int val   = getCaliValue();
 	int i;
@@ -284,7 +284,7 @@ static void XorNumArray(void) { /* 9 */
 	  cnt : 個数
 	  val : XORをとる値
 	*/
-	int *vAry = getCaliVariable();
+	vmvar_t *vAry = getCaliVariable();
 	int cnt   = getCaliValue();
 	int val   = getCaliValue();
 	int i;
@@ -307,10 +307,10 @@ static void SetEquArray(void) { /* 10 */
 	  val : 比較する値
 	  vResults  : 結果を格納する配列
 	*/
-	int *vAry = getCaliVariable();
+	vmvar_t *vAry = getCaliVariable();
 	int cnt   = getCaliValue();
 	int val   = getCaliValue();
-	int *vResults = getCaliVariable();
+	vmvar_t *vResults = getCaliVariable();
 	int i;
 	
 	TRACE("ShArray.SetEquArray %p,%d,%d,%p:", vAry, cnt, val, vResults);
@@ -331,10 +331,10 @@ static void SetNotArray(void) { /* 11 */
 	  val : 比較する値
 	  vResults  : 結果を格納する配列
 	*/
-	int *vAry = getCaliVariable();
+	vmvar_t *vAry = getCaliVariable();
 	int cnt   = getCaliValue();
 	int val   = getCaliValue();
-	int *vResults = getCaliVariable();
+	vmvar_t *vResults = getCaliVariable();
 	int i;
 	
 	TRACE("ShArray.SetNotArray %p,%d,%d,%p:", vAry, cnt, val, vResults);
@@ -354,10 +354,10 @@ static void SetLowArray(void) { /* 12 */
 	  val : 閾値
 	  vResult: 結果を返す変数
 	*/
-	int *vAry = getCaliVariable();
+	vmvar_t *vAry = getCaliVariable();
 	int cnt   = getCaliValue();
 	int val   = getCaliValue();
-	int *vResults = getCaliVariable();
+	vmvar_t *vResults = getCaliVariable();
 	int i;
 	
 	TRACE("ShArray.SetLowArray %p,%d,%d,%p:", vAry, cnt, val, vResults);
@@ -377,10 +377,10 @@ static void SetHighArray(void) { /* 13 */
 	  val : 閾値
 	  vResults: 結果を返す変数
 	*/
-	int *vAry = getCaliVariable();
+	vmvar_t *vAry = getCaliVariable();
 	int cnt   = getCaliValue();
 	int val   = getCaliValue();
-	int *vResults = getCaliVariable();
+	vmvar_t *vResults = getCaliVariable();
 	int i;
 	
 	TRACE("ShArray.SetHighArray %p,%d,%d,%p:", vAry, cnt, val, vResults);
@@ -403,11 +403,11 @@ static void SetRangeArray(void) { /* 14 */
 	     min < vAry < max の時 vResults = 1;
             それ以外              vResults = 0;
 	 */
-	int *vAry = getCaliVariable();
+	vmvar_t *vAry = getCaliVariable();
 	int cnt   = getCaliValue();
 	int min   = getCaliValue();
 	int max   = getCaliValue();
-	int *vResults = getCaliVariable();
+	vmvar_t *vResults = getCaliVariable();
 	int i;
 	
 	TRACE("ShArray.SetRangeArray %p,%d,%d,%d,%p:", vAry, cnt, min, max, vResults);
@@ -430,11 +430,11 @@ static void SetAndEquArray(void) { /* 15 */
 	   vResults  : 結果を代入する配列

 	*/
-	int *vAry = getCaliVariable();
+	vmvar_t *vAry = getCaliVariable();
 	int mask   = getCaliValue();
 	int cnt    = getCaliValue();
 	int val    = getCaliValue();
-	int *vResults = getCaliVariable();
+	vmvar_t *vResults = getCaliVariable();
 	int i;
 	
 	TRACE("ShArray.SetAndEquArray: %p,%d,%d,%d,%p:", vAry, mask, cnt, val, vResults);
@@ -455,10 +455,10 @@ static void AndEquArray(void) { /* 16 */
 	   val : 比較する値
 	   vResults  : 結果を代入する配列
 	*/
-	int *vAry = getCaliVariable();
+	vmvar_t *vAry = getCaliVariable();
 	int cnt   = getCaliValue();
 	int val   = getCaliValue();
-	int *vResults = getCaliVariable();
+	vmvar_t *vResults = getCaliVariable();
 	int i;
 	
 	TRACE("ShArray.AndEquArray %p,%d,%d,%p:", vAry, cnt, val, vResults);
@@ -479,10 +479,10 @@ static void AndNotArray(void) { /* 17 */
 	   val : 比較する値
 	   vResults  : 結果を代入する配列
 	*/
-	int *vAry = getCaliVariable();
+	vmvar_t *vAry = getCaliVariable();
 	int cnt   = getCaliValue();
 	int val   = getCaliValue();
-	int *vResults = getCaliVariable();
+	vmvar_t *vResults = getCaliVariable();
 	int i;
 	
 	TRACE("ShArray.AndNotArray %p,%d,%d,%p:", vAry, cnt, val, vResults);
@@ -503,10 +503,10 @@ static void AndLowArray(void) { /* 18 */
 	   min : 最小値
 	   vResults  : 結果を代入する配列
 	*/
-	int *vAry = getCaliVariable();
+	vmvar_t *vAry = getCaliVariable();
 	int cnt   = getCaliValue();
 	int min   = getCaliValue();
-	int *vResults = getCaliVariable();
+	vmvar_t *vResults = getCaliVariable();
 	int i;
 	
 	TRACE("ShArray.AndLowArray: %d,%d,%d,%d:", vAry, cnt, min, vResults);
@@ -527,10 +527,10 @@ static void AndHighArray(void) { /* 19 */
 	   max : 最小値
 	   vResults  : 結果を代入する配列
 	*/
-	int *vAry     = getCaliVariable();
+	vmvar_t *vAry     = getCaliVariable();
 	int cnt       = getCaliValue();
 	int max       = getCaliValue();
-	int *vResults = getCaliVariable();
+	vmvar_t *vResults = getCaliVariable();
 	int i;
 	
 	TRACE("ShArray.AndHighArray: %p,%d,%d,%p:", vAry, cnt, max, vResults);
@@ -552,11 +552,11 @@ static void AndRangeArray(void) { /* 20 */
 	  max:  最大値
 	  vResults:   結果を返す配列
 	*/
-	int *vAry = getCaliVariable();
+	vmvar_t *vAry = getCaliVariable();
 	int cnt   = getCaliValue();
 	int min   = getCaliValue();
 	int max   = getCaliValue();
-	int *vResults = getCaliVariable();
+	vmvar_t *vResults = getCaliVariable();
 	int i;
 	
 	TRACE("ShArray.AndRangeArray %d,%d,%d,%d,%d:", vAry, cnt, min, max, vResults);
@@ -579,11 +579,11 @@ static void AndAndEquArray(void) { /* 21 */
 	   vResults  : 結果を代入する配列

 	*/
-	int *vAry = getCaliVariable();
+	vmvar_t *vAry = getCaliVariable();
 	int mask  = getCaliValue();
 	int cnt   = getCaliValue();
 	int val   = getCaliValue();
-	int *vResults = getCaliVariable();
+	vmvar_t *vResults = getCaliVariable();
 	int i;
 	
 	TRACE("ShArray.AndAndEquArray: %d,%d,%d,%d,%d:", vAry, mask, cnt, val, vResults);
@@ -612,10 +612,10 @@ static void OrNotArray(void) { /* 23 */
 	  val : 比較する値
 	  vResults: 結果を書き込む変数
 	*/
-	int *vAry = getCaliVariable();
+	vmvar_t *vAry = getCaliVariable();
 	int cnt   = getCaliValue();
 	int val   = getCaliValue();
-	int *vResults = getCaliVariable();
+	vmvar_t *vResults = getCaliVariable();
 	int i;
 	
 	TRACE("ShArray.OrNotArray %p,%d,%d,%p:", vAry, cnt, val, vResults);
@@ -674,10 +674,10 @@ static void EnumEquArray(void) { /* 28 */
 	  val : 比較する値
 	  vResult: 一致する個数を返す変数
 	*/
-	int *vAry = getCaliVariable();
+	vmvar_t *vAry = getCaliVariable();
 	int cnt   = getCaliValue();
 	int val   = getCaliValue();
-	int *vResult = getCaliVariable();
+	vmvar_t *vResult = getCaliVariable();
 	int i;
 	
 	TRACE("ShArray.EnumEquArray %p,%d,%d,%p:", vAry, cnt, val, vResult);
@@ -713,12 +713,12 @@ static void EnumEquNotArray2(void) { /* 30 */
 	  val2: 配列２と比較する値
 	  vResult: 条件に一致する数を返す変数
 	*/
-	int *vAry1 = getCaliVariable();
-	int *vAry2 = getCaliVariable();
+	vmvar_t *vAry1 = getCaliVariable();
+	vmvar_t *vAry2 = getCaliVariable();
 	int cnt    = getCaliValue();
 	int val1   = getCaliValue();
 	int val2   = getCaliValue();
-	int *vResult = getCaliVariable();
+	vmvar_t *vResult = getCaliVariable();
 	int i;
 	
 	TRACE("ShArray.EnumEquNotArray2 %p,%p,%d,%d,%d,%p:", vAry1, vAry2, cnt, val1, val2, vResult);
@@ -742,10 +742,10 @@ static void EnumNotArray(void) { /* 31 */
 	  val: 比較する値
 	  vResult: 等しくないものの数
 	*/
-	int *vAry  = getCaliVariable();
+	vmvar_t *vAry  = getCaliVariable();
 	int cnt    = getCaliValue();
 	int val    = getCaliValue();
-	int *vResult = getCaliVariable();
+	vmvar_t *vResult = getCaliVariable();
 	int i;

 	TRACE("ShArray.EnumNotArray %p, %d, %d, %p:", vAry, cnt, val, vResult);
@@ -799,11 +799,11 @@ static void EnumRangeArray(void) { /* 35 */
 	  max : 最大値
 	  vResult: 一致した数を返す変数
 	*/
-	int *vAry  = getCaliVariable();
+	vmvar_t *vAry  = getCaliVariable();
 	int cnt    = getCaliValue();
 	int min    = getCaliValue();
 	int max    = getCaliValue();
-	int *vResult = getCaliVariable();
+	vmvar_t *vResult = getCaliVariable();
 	int i;
 	
 	TRACE("ShArray.EnumRangeArray %d,%d,%d,%d,%d:", vAry, cnt, min, max, vResult);
@@ -830,11 +830,11 @@ static void GrepEquArray(void) { /* 36 */
 	  vMatch: 一致したインデックス
 	  vResult: 一つでも val と同じ値があれば 1
 	*/
-	int *vAry  = getCaliVariable();
+	vmvar_t *vAry  = getCaliVariable();
 	int cnt    = getCaliValue();
 	int val    = getCaliValue();
-	int *vMatch  = getCaliVariable();
-	int *vResult = getCaliVariable();
+	vmvar_t *vMatch  = getCaliVariable();
+	vmvar_t *vResult = getCaliVariable();
 	int i;

 	TRACE("ShArray.GrepEquArray  %p,%d,%d,%p,%p:", vAry, cnt, val, vMatch, vResult);
@@ -862,11 +862,11 @@ static void GrepNotArray(void) { /* 37 */
 	  vMatch: 一致するindex
 	  vResult: 一つでも val と同じ値があれば 1
 	*/
-	int *vAry  = getCaliVariable();
+	vmvar_t *vAry  = getCaliVariable();
 	int cnt    = getCaliValue();
 	int val    = getCaliValue();
-	int *vMatch  = getCaliVariable();
-	int *vResult = getCaliVariable();
+	vmvar_t *vMatch  = getCaliVariable();
+	vmvar_t *vResult = getCaliVariable();
 	int i;
 	
 	TRACE("ShArray.GrepNotArray %p,%d,%d,%p,%p:", vAry, cnt, val, vMatch, vResult);
@@ -930,11 +930,11 @@ static void GrepLowArray(void) { /* 41 */
 	  vMatch: 一致したインデックス
 	  vResult: 一つでも val と同じ値があれば 1
 	*/
-	int *vAry = getCaliVariable();
+	vmvar_t *vAry = getCaliVariable();
 	int cnt   = getCaliValue();
 	int min   = getCaliValue();
-	int *vMatch  = getCaliVariable();
-	int *vResult = getCaliVariable();
+	vmvar_t *vMatch  = getCaliVariable();
+	vmvar_t *vResult = getCaliVariable();
 	int i;
 	
 	TRACE("ShArray.GrepLowArray: %p,%d,%d,%p,%p:", vAry, cnt, min, vMatch, vResult);
@@ -962,11 +962,11 @@ static void GrepHighArray(void) { /* 42 */
 	  vMatch: 一致したインデックス
 	  vResult: 一つでも val と同じ値があれば 1
 	*/
-	int *vAry = getCaliVariable();
+	vmvar_t *vAry = getCaliVariable();
 	int cnt   = getCaliValue();
 	int max   = getCaliValue();
-	int *vMatch  = getCaliVariable();
-	int *vResult = getCaliVariable();
+	vmvar_t *vMatch  = getCaliVariable();
+	vmvar_t *vResult = getCaliVariable();
 	int i;
 	
 	TRACE("ShArray.GrepHighArray: %p,%d,%d,%p,%p:", vAry, cnt, max, vMatch, vResult);
@@ -995,12 +995,12 @@ static void GrepRangeArray(void) { /* 43 */
 	  vMatch: 一致したインデックス
 	  vResult: 一つでも val と同じ値があれば 1
 	*/
-	int *vAry  = getCaliVariable();
+	vmvar_t *vAry  = getCaliVariable();
 	int cnt    = getCaliValue();
 	int min    = getCaliValue();
 	int max    = getCaliValue();
-	int *vMatch = getCaliVariable();
-	int *vResult    = getCaliVariable();
+	vmvar_t *vMatch = getCaliVariable();
+	vmvar_t *vResult    = getCaliVariable();
 	int i;
 	
 	TRACE("ShArray.GrepRangeArray %p,%d,%d,%d,%p,%p:", vAry, cnt, max, min, vMatch, vResult);
@@ -1031,13 +1031,13 @@ static void GrepLowOrderArray(void) { /* 44 */
 	  vLastMatch: 最小値を示す配列のindex
 	  vResult: 最小値が見つかれば 1, 見つからなければ 0
 	*/
-	int *vAry  = getCaliVariable();
+	vmvar_t *vAry  = getCaliVariable();
 	int cnt    = getCaliValue();
 	int min    = getCaliValue();
 	int max    = getCaliValue();
-	int *v1    = getCaliVariable();
-	int *vLastMatch = getCaliVariable();
-	int *vResult    = getCaliVariable();
+	vmvar_t *v1    = getCaliVariable();
+	vmvar_t *vLastMatch = getCaliVariable();
+	vmvar_t *vResult    = getCaliVariable();
 	int i, j, k = 0;
 	
 	TRACE("ShArray.GrepLowOrderArray %p,%d,%d,%d,%p,%p,%p:", vAry, cnt, min, max, v1, vLastMatch, vResult);
@@ -1082,13 +1082,13 @@ static void GrepHighOrderArray(void) { /* 45 */
 	  vLastMatch: 最大値を示す配列のindex
 	  vResult: 最大値が見つかれば 1, 見つからなければ 0
 	*/
-	int *vAry  = getCaliVariable();
+	vmvar_t *vAry  = getCaliVariable();
 	int cnt    = getCaliValue();
 	int min    = getCaliValue();
 	int max    = getCaliValue();
-	int *v1    = getCaliVariable();
-	int *vLastMatch = getCaliVariable();
-	int *vResult    = getCaliVariable();
+	vmvar_t *v1    = getCaliVariable();
+	vmvar_t *vLastMatch = getCaliVariable();
+	vmvar_t *vResult    = getCaliVariable();
 	int i, j, k = 0;
 	
 	TRACE("ShArray.GrepHighOrderArray %p,%d,%d,%d,%p,%p,%p:", vAry, cnt, min, max, v1, vLastMatch, vResult);
@@ -1119,7 +1119,7 @@ static void GrepHighOrderArray(void) { /* 45 */
 }

 static void ChangeEquArray(void) { /* 46 */
-	int *vAry = getCaliVariable();
+	vmvar_t *vAry = getCaliVariable();
 	int cnt = getCaliValue();
 	int src = getCaliValue();
 	int dst = getCaliValue();
@@ -1172,7 +1172,7 @@ static void ChangeRangeArray(void) { /* 50 */
 	  max : 最大値
 	  val : 置き換える値
 	*/
-	int *vAry = getCaliVariable();
+	vmvar_t *vAry = getCaliVariable();
 	int cnt   = getCaliValue();
 	int min   = getCaliValue();
 	int max   = getCaliValue();
@@ -1202,12 +1202,12 @@ static void CopyArrayToRect(void) { /* 51 */
 	  dw  : コピー先 width
 	  dh  : コピー先 height
 	*/
-	int *vSrc = getCaliVariable();
+	vmvar_t *vSrc = getCaliVariable();
 	int sw    = getCaliValue();
 	int sh    = getCaliValue();
 	int sx    = getCaliValue();
 	int sy    = getCaliValue();
-	int *vDst = getCaliVariable();
+	vmvar_t *vDst = getCaliVariable();
 	int dw    = getCaliValue();
 	int dh    = getCaliValue();
 	int x, y;
@@ -1236,10 +1236,10 @@ static void CopyRectToArray(void) { /* 52 */
 	  dx  : コピー先 x
 	  dy  : コピー先 y
 	*/
-	int *vSrc = getCaliVariable();
+	vmvar_t *vSrc = getCaliVariable();
 	int sw    = getCaliValue();
 	int sh    = getCaliValue();
-	int *vDst = getCaliVariable();
+	vmvar_t *vDst = getCaliVariable();
 	int dw    = getCaliValue();
 	int dh    = getCaliValue();
 	int dx    = getCaliValue();
@@ -1266,10 +1266,10 @@ static void ChangeSecretArray(void) { /* 53 */
 	  type: 機能番号
 	  vResult: 結果を返す変数
 	*/
-	int *vAry    = getCaliVariable();
+	vmvar_t *vAry    = getCaliVariable();
 	int cnt      = getCaliValue();
 	int type     = getCaliValue();
-	int *vResult = getCaliVariable();
+	vmvar_t *vResult = getCaliVariable();
 	static uint16_t key[4] = { 0x7A7A, 0xADAD, 0xBCBC, 0xCECE }; /* key */
 	
 	TRACE("ShArray.ChangeSecretArray %p,%d,%d,%p:", vAry, cnt, type, vResult);
@@ -50,7 +50,7 @@ static int64_t div64(int64_t a1, int64_t a2) {
 	return a1 / a2;
 }

-static int64_t get32(int *var) {
+static int64_t get32(vmvar_t *var) {
 	return var[0] + mul64(var[1], 0x10000);
 }

@@ -74,7 +74,7 @@ static void SetIntNum16(void) { /* 1 */

 	  var: 数値の入った変数
 	*/
-	int *var = getCaliVariable();
+	vmvar_t *var = getCaliVariable();
 	
 	accumulator = mul64(*var, numbase);
 	
@@ -82,7 +82,7 @@ static void SetIntNum16(void) { /* 1 */
 }

 static void SetIntNum32(void) { /* 2 */
-	int *var = getCaliVariable();
+	vmvar_t *var = getCaliVariable();

 	accumulator = mul64(get32(var), numbase);
 	
@@ -95,7 +95,7 @@ static void GetIntNum16(void) { /* 3 */

 	  var: 数値をいれる変数
 	 */
-	int *var = getCaliVariable();
+	vmvar_t *var = getCaliVariable();
 	int64_t i;
 	
 	i = div64(accumulator, numbase);
@@ -110,7 +110,7 @@ static void GetIntNum16(void) { /* 3 */
 }

 static void GetIntNum32(void) { /* 4 */
-	int *var = getCaliVariable();
+	vmvar_t *var = getCaliVariable();
 	int64_t i = div64(accumulator, numbase);
 	
 	var[0] = i & 0xFFFF;
@@ -126,7 +126,7 @@ static void AddIntNum16(void) { /* 5 */

 	  var: 足す数の入った変数
 	 */
-	int *var = getCaliVariable();
+	vmvar_t *var = getCaliVariable();
 	
 	accumulator += mul64(*var, numbase);
 	
@@ -134,7 +134,7 @@ static void AddIntNum16(void) { /* 5 */
 }

 static void AddIntNum32(void) { /* 6 */
-	int *var = getCaliVariable();
+	vmvar_t *var = getCaliVariable();

 	accumulator += mul64(get32(var), numbase);

@@ -148,7 +148,7 @@ static void SubIntNum16(void) { /* 7 */
 }

 static void SubIntNum32(void) { /* 8 */
-	int *var = getCaliVariable();
+	vmvar_t *var = getCaliVariable();

 	accumulator -= mul64(get32(var), numbase);

@@ -161,7 +161,7 @@ static void MulIntNum16(void) {  /* 9 */
 	  
 	  var: 掛ける数の入った変数
 	 */
-	int *var = getCaliVariable();
+	vmvar_t *var = getCaliVariable();
 	
 	accumulator *= mul64(*var, numbase);
 	
@@ -180,7 +180,7 @@ static void DivIntNum16(void) { /* 11 */

 	   var: 足す数の入った変数
 	 */
-	int *var = getCaliVariable();
+	vmvar_t *var = getCaliVariable();
 	int64_t i;
 	
 	i = mul64(*var, numbase);
@@ -204,9 +204,9 @@ static void CmpIntNum16(void) { /* 13 */
 }

 static void CmpIntNum32(void) { /* 14 */
-	int *var = getCaliVariable();
+	vmvar_t *var = getCaliVariable();
 	int op = getCaliValue();
-	int *result = getCaliVariable();
+	vmvar_t *result = getCaliVariable();

 	int64_t val = mul64(get32(var), numbase);

@@ -230,8 +230,8 @@ static void GetLengthNum16(void) { /* 15 */
 	   var: 数値
 	   vResult: 数値の桁数を返す変数
 	 */
-	int *var     = getCaliVariable();
-	int *vResult = getCaliVariable();
+	vmvar_t *var     = getCaliVariable();
+	vmvar_t *vResult = getCaliVariable();
 	
 	if (*var >= 10000) {
 		*vResult = 5;
@@ -270,7 +270,7 @@ static void NumToRate(void) { /* 17 */
 	int p2 = getCaliValue();
 	int p3 = getCaliValue();
 	int flag = getCaliValue();
-	int *vResult = getCaliVariable();
+	vmvar_t *vResult = getCaliVariable();
 	int i;
 	
 	i = (p1 * p3) / p2;
@@ -302,7 +302,7 @@ static void NumToRateNum(void) { /* 18 */
 	int p2 = getCaliValue();
 	int p3 = getCaliValue();
 	int flag = getCaliValue();
-	int *vResult = getCaliVariable();
+	vmvar_t *vResult = getCaliVariable();
 	int i;
 	
 	i = (p1 * p2) / p3;
@@ -333,7 +333,7 @@ static void SetRandomSeed() {

 static void GetRandomNumA() {
 	int num  = getCaliValue();
-	int *var = getCaliVariable();
+	vmvar_t *var = getCaliVariable();

 	if (num == 0 || num == 1) {
 		*var = num;
@@ -351,7 +351,7 @@ static void NumToBit() {
 	  var: 値を返す変数
 	*/
 	int beki = getCaliValue();
-	int *var = getCaliVariable();
+	vmvar_t *var = getCaliVariable();
 	int i, j = 1;
 	
 	if (beki < 17) {
@@ -379,7 +379,7 @@ static void BitToNum() {
 	  var: 値を返す変数
 	*/
 	int val = getCaliValue();
-	int *var = getCaliVariable();
+	vmvar_t *var = getCaliVariable();
 	int i;
 	
 	TRACE("ShCalc.BitToNum %d,%p:", val, var);
@@ -59,8 +59,8 @@ struct animsrc {
 static struct animsrc src[SLOT];  /* アニメーション各コマ転送元 */
 	
 struct _s0 {
-	int *dst_p1;
-	int *dst_p2;
+	vmvar_t *dst_p1;
+	vmvar_t *dst_p2;
 	int dw_1000A188;
 };
 static struct _s0 s0[SLOT];
@@ -84,7 +84,7 @@ struct _s2 {
 };
 static struct _s2 s2[SLOT];

-static int* add_p5[SLOT]; /* どこまでアニメーションのコマが進んだか */
+static vmvar_t *add_p5[SLOT]; /* どこまでアニメーションのコマが進んだか */

 static void copy_sprite(int sx, int sy, int width, int height, int dx, int dy, int r, int g, int b) {
 	SDL_Surface *sf = nact->ags.dib->sdl_surface;
@@ -115,8 +115,8 @@ static void ChangeEquColor() {
 	int p2 = getCaliValue();
 	int p3 = getCaliValue();
 	int p4 = getCaliValue();
-	int *p5 = getCaliVariable();
-	int *p6 = getCaliVariable();
+	vmvar_t *p5 = getCaliVariable();
+	vmvar_t *p6 = getCaliVariable();
 	int p7 = getCaliValue(); /* ISurface */
 	
 	TRACE_UNIMPLEMENTED("ShGraph.ChangeEquColor %d,%d,%d,%d,%p,%p,%d:", p1, p2, p3, p4, p5, p6, p7);
@@ -137,8 +137,8 @@ static void ChangeNotColor() {
 	int y0 = getCaliValue();
 	int width  = getCaliValue();
 	int height = getCaliValue();
-	int *src = getCaliVariable(); /* r, g, b */
-	int *dst = getCaliVariable(); /* r, g, b */
+	vmvar_t *src = getCaliVariable(); /* r, g, b */
+	vmvar_t *dst = getCaliVariable(); /* r, g, b */
 	int p7 = getCaliValue(); /* ISurface */
 	surface_t *dib;
 	int x, y;
@@ -216,7 +216,7 @@ static void ResetAnimeData() {
 	}
 	
 	memset(s1, 0, sizeof(struct _s1) * SLOT);
-	memset(add_p5, 0, sizeof(int *) * SLOT);
+	memset(add_p5, 0, sizeof(vmvar_t *) * SLOT);
 	
 }

@@ -240,7 +240,7 @@ static void SetAnimeSrc() {
 	int h = getCaliValue();
 	int uw = getCaliValue();
 	int uh = getCaliValue();
-	int *pal = getCaliVariable();
+	vmvar_t *pal = getCaliVariable();
 	int r, g, b;
 	
 	TRACE("ShGraph.SetAnimeSrc %d,%d,%d,%d,%d,%d,%d,%p:", no, x0, y0, w, h, uw, uh, pal);
@@ -276,8 +276,8 @@ static void SetAnimeDst() {
 	  p6: 描画先オフセット追加分 (h) 10000が中央
 	*/
 	int no = getCaliValue();
-	int *p1 = getCaliVariable();
-	int *p2 = getCaliVariable();
+	vmvar_t *p1 = getCaliVariable();
+	vmvar_t *p2 = getCaliVariable();
 	int p3 = getCaliValue();
 	int p4 = getCaliValue();
 	int p5 = getCaliValue();
@@ -313,7 +313,7 @@ static void AddAnimeData() {
 	int p2 = getCaliValue();
 	int p3 = getCaliValue();
 	int p4 = getCaliValue();
-	int *p5 = getCaliVariable();
+	vmvar_t *p5 = getCaliVariable();
 	int p6 = getCaliValue();
 	int i;
 	
@@ -47,7 +47,7 @@ static void OutputMessageBox(void) { /* 0 */
 	int p2 = getCaliValue();
 	int title = getCaliValue();
 	int msg = getCaliValue();
-	int *res = getCaliVariable();
+	vmvar_t *res = getCaliVariable();
 	int ISys3xSystem = getCaliValue();

 	char *title_utf8 = toUTF8(svar_get(title));
@@ -64,10 +64,10 @@ static void OutputMessageBox(void) { /* 0 */
 static void InputListNum(void) { /* 1 */
 	int flags = getCaliValue();
 	int title = getCaliValue();
-	int *val = getCaliVariable();
+	vmvar_t *val = getCaliVariable();
 	int minval = getCaliValue();
 	int maxval = getCaliValue();
-	int *res = getCaliVariable();
+	vmvar_t *res = getCaliVariable();
 	int ISys3xSystem = getCaliValue();

 	INPUTNUM_PARAM ni_param = {
@@ -151,7 +151,7 @@ static void SetKeyStatus(void) {
 */
 static void GetKeyStatus(void) {
 	int no   = getCaliValue();
-	int *var = getCaliVariable();
+	vmvar_t *var = getCaliVariable();
 	int i;
 	
 	if (no >= KEYMAP_MAX) {
@@ -268,7 +268,7 @@ static void wavPlayRing() {
 	*/
 	int start = getCaliValue();
 	int cnt   = getCaliValue();
-	int *cur  = getCaliVariable();
+	vmvar_t *cur  = getCaliVariable();
 	
 	mus_wav_play(start + (*cur % cnt), 1);
 	*cur = (*cur + 1) % cnt;
@@ -321,7 +321,7 @@ static void wavIsPlay() {
 	  *result: 0なら停止中、!0なら再生中
 	*/ 
 	int slot = getCaliValue();
-	int *result = getCaliVariable();
+	vmvar_t *result = getCaliVariable();
 	
 	*result = mus_wav_get_playposition(slot);
 	
@@ -338,7 +338,7 @@ static void wavIsPlayRange() {
 	*/
 	int slot  = getCaliValue();
 	int range = getCaliValue();
-	int *result = getCaliVariable();
+	vmvar_t *result = getCaliVariable();
 	int i, ret = 0;
 	
 	for (i = slot; i < (slot + range); i++) {
@@ -127,7 +127,7 @@ static void SetStringNum16(void) {
 	  p2: 変換された数値を格納する変数
 	*/
 	int st = getCaliValue();
-	int *var = getCaliVariable();
+	vmvar_t *var = getCaliVariable();
 	const char *str = svar_get(st);
 	char _dst[100];
 	char *dst = _dst;
@@ -160,7 +160,7 @@ static void SetStringNum16(void) {

 static void SetStringNum32(void) {
 	int p1 = getCaliValue();
-	int *p2 = getCaliVariable();
+	vmvar_t *p2 = getCaliVariable();
 	
 	TRACE_UNIMPLEMENTED("ShString.SetStringNum32: %d,%p:", p1, p2);
 }
@@ -94,7 +94,7 @@ static void Init() {
 	int p1 = getCaliValue();
 	int p2 = getCaliValue();
 	int p3 = getCaliValue();
-	int *var = getCaliVariable();
+	vmvar_t *var = getCaliVariable();
 	
 	if (!nact->files.alk[0]) {
 		WARNING("dDEMO.alk not found");
@@ -13,7 +13,7 @@ static void Init() {
        int p1 = getCaliValue();
        int p2 = getCaliValue();
        int p3 = getCaliValue();
-        int *var = getCaliVariable();
+        vmvar_t *var = getCaliVariable();
        
        *var = 1;
        
@@ -13,7 +13,7 @@ static void Init() {
        int p1 = getCaliValue();
        int p2 = getCaliValue();
        int p3 = getCaliValue();
-        int *var = getCaliVariable();
+        vmvar_t *var = getCaliVariable();
        
        *var = 1;
        
@@ -331,7 +331,7 @@ int scg_querytype(int wNumCG) {
 }

 // CGの大きさを取得
-bool scg_querysize(int wNumCG, int *w, int *h) {
+bool scg_querysize(int wNumCG, vmvar_t *w, vmvar_t *h) {
 	if (wNumCG >= (CGMAX -1)) goto errexit;
 	if (!cg_store || !cg_store[wNumCG]) goto errexit;
 	if (cg_store[wNumCG]->sf == NULL) goto errexit;
@@ -55,7 +55,7 @@ void scg_partcopy(int wNumDstCG, int wNumSrcCG, int wX, int wY, int wWidth, int
 void scg_freeall(void);
 void scg_free(int cg);
 int scg_querytype(int wNumCG);
-bool scg_querysize(int wNumCG, int *w, int *h);
+bool scg_querysize(int wNumCG, vmvar_t *w, vmvar_t *h);
 int scg_querybpp(int wNumCG);
 bool scg_existalphamap(int wNumCG);

@@ -12,7 +12,7 @@ static void Init() {
 	int p1 = getCaliValue(); /* ISys3x  */
 	int p2 = getCaliValue(); /* IWinMsg */
 	int p3 = getCaliValue(); /* ITimer  */
-	int *var = getCaliVariable();
+	vmvar_t *var = getCaliVariable();
 	
 	*var = 0;
 	
@@ -12,7 +12,7 @@ static void Init() {
 	int p1 = getCaliValue();
 	int p2 = getCaliValue();
 	int p3 = getCaliValue();
-	int *var = getCaliVariable();
+	vmvar_t *var = getCaliVariable();
 	
 	TRACE_UNIMPLEMENTED("nDEMOE.Init %p:", var);
 }
@@ -13,7 +13,7 @@ static void Init() {
 	int p1 = getCaliValue();
 	int p2 = getCaliValue();
 	int p3 = getCaliValue();
-	int *var = getCaliVariable();
+	vmvar_t *var = getCaliVariable();
 	
 	*var = 1;
 	
@@ -83,9 +83,9 @@ static void MakeMapDraw() {
 	int dstY = getCaliValue();
 	int posX = getCaliValue();
 	int posY = getCaliValue();
-	int *a1 = getCaliVariable();
-	int *a2 = getCaliVariable();
-	int *a3 = getCaliVariable();
+	vmvar_t *a1 = getCaliVariable();
+	vmvar_t *a2 = getCaliVariable();
+	vmvar_t *a3 = getCaliVariable();

 	for (int y = 0; y < window_height; y++) {
 		for (int x = 0; x < window_width; x++) {
@@ -178,9 +178,9 @@ static void TempMapLoadToShadow() {
 		WARNING("non-array destination variable");
 		return;
 	}
-	int *a1 = v_resolveRef(&r1);
-	int *a2 = v_resolveRef(&r2);
-	int *a3 = v_resolveRef(&r3);
+	vmvar_t *a1 = v_resolveRef(&r1);
+	vmvar_t *a2 = v_resolveRef(&r2);
+	vmvar_t *a3 = v_resolveRef(&r3);
 	uint16_t *p = mapdata[map];
 	for (int i = 0; i < size; i++)
 		*a1++ = SDL_SwapLE16(*p++);
@@ -207,9 +207,9 @@ static void TempMapSaveToShadow() {
 		WARNING("non-array source variable");
 		return;
 	}
-	int *a1 = v_resolveRef(&r1);
-	int *a2 = v_resolveRef(&r2);
-	int *a3 = v_resolveRef(&r3);
+	vmvar_t *a1 = v_resolveRef(&r1);
+	vmvar_t *a2 = v_resolveRef(&r2);
+	vmvar_t *a3 = v_resolveRef(&r3);
 	uint16_t *p = mapdata[map];
 	for (int i = 0; i < size; i++)
 		*p++ = SDL_SwapLE16(*a1++);
@@ -296,13 +296,13 @@ static void TempMapFileLoad() {
 }

 static void CalcMoveDiffer() {
-	int *dx = getCaliVariable();
-	int *dy = getCaliVariable();
+	vmvar_t *dx = getCaliVariable();
+	vmvar_t *dy = getCaliVariable();
 	int moveL = getCaliValue();
 	int moveU = getCaliValue();
 	int moveR = getCaliValue();
 	int moveD = getCaliValue();
-	int *pt = getCaliVariable();
+	vmvar_t *pt = getCaliVariable();
 	int duration = getCaliValue();

 	int t = min(*pt, duration);
@@ -41,7 +41,7 @@ static void Init() {
 	int p1 = getCaliValue();
 	int p2 = getCaliValue();
 	int p3 = getCaliValue();
-	int *var = getCaliVariable();
+	vmvar_t *var = getCaliVariable();
 	
 	*var = 1;
 	
@@ -579,7 +579,7 @@ void ags_alpha_copyArea(int sx, int sy, int w, int h, int dx, int dy) {
 	alpha_copy_area(nact->ags.dib, sx, sy, w, h, dx, dy);
 }

-void ags_alpha_getPixel(int x, int y, int *pic) {
+void ags_alpha_getPixel(int x, int y, vmvar_t *pic) {
 	if (nact->ags.world_depth == 8) return;
 	
 	if (!ags_check_param_xy(&x, &y)) {
@@ -199,7 +199,7 @@ extern void ags_alpha_uppercut(int sx, int sy, int w, int h, int s, int d);
 extern void ags_alpha_lowercut(int sx, int sy, int w, int h, int s, int d);
 extern void ags_alpha_setLevel(int x, int y, int w, int h, int lv);
 extern void ags_alpha_copyArea(int sx, int sy, int w, int h, int dx, int dy);
-extern void ags_alpha_getPixel(int x, int y, int *pic);
+extern void ags_alpha_getPixel(int x, int y, vmvar_t *pic);
 extern void ags_alpha_setPixel(int x, int y, int w, int h, uint8_t *b);

 /* fader */
@@ -49,7 +49,7 @@

 #define CALI_DEPTH_MAX 256

-static int *getVar(int c0, struct VarRef *ref) {
+static vmvar_t *getVar(int c0, struct VarRef *ref) {
 	int addr = sl_getIndex();
 	int var;
 	if ((c0 & 0x40) == 0) {
@@ -63,7 +63,7 @@ static int *getVar(int c0, struct VarRef *ref) {
 			c1 = sl_getc();
 			var = c0 << 8 | c1;
 			int index = getCaliValue();
-			int *store = v_ref_indexed(var, index, ref);
+			vmvar_t *store = v_ref_indexed(var, index, ref);
 			if (!store)
 				WARNING("%03d:%05x: Out of bounds index access: %s[%d]", sl_getPage(), addr, v_name(var), index);
 			return store;
@@ -74,15 +74,15 @@ static int *getVar(int c0, struct VarRef *ref) {
 			return NULL;
 		}
 	}
-	int *store = v_ref(var, ref);
+	vmvar_t *store = v_ref(var, ref);
 	if (!store)
 		WARNING("%03d:%05x: Out of bounds array access: %s", sl_getPage(), addr, v_name(var));
 	return store;
 }

 // Returns a pointer to the variable
-int *getCaliVariable(void) {
-	int *c0 = getVar(sl_getc(), NULL);
+vmvar_t *getCaliVariable(void) {
+	vmvar_t *c0 = getVar(sl_getc(), NULL);
 	if (sl_getc() != OP_END) {
 		SYSERROR("Invalid variable expression at %03d:%05x", sl_getPage(), sl_getIndex());
 	}
@@ -98,7 +98,7 @@ bool getCaliArray(struct VarRef *ref) {
 }

 // For variable assignment commands
-int *getVariable(void) {
+vmvar_t *getVariable(void) {
 	return getVar(sl_getc(), NULL);
 }

@@ -112,7 +112,7 @@ int getCaliValue(void) {
 	while ((c0 = sl_getc()) != OP_END) {
 		if (c0 & 0x80) { // variable
 			int c1 = sl_getcAt(sl_getIndex());
-			int *t;
+			vmvar_t *t;
 			if (c0 == 0xc0) {
 				if (c1 == OP_C0_INDEX || c1 >= 0x34) goto l_var;
 				c1 = sl_getc();
@@ -28,8 +28,8 @@
 struct VarRef;

 int getCaliValue(void);
-int *getCaliVariable(void);
+vmvar_t *getCaliVariable(void);
 bool getCaliArray(struct VarRef *ref);
-int *getVariable(void);
+vmvar_t *getVariable(void);

 #endif /* !__CALI_H__ */
@@ -54,7 +54,7 @@ int cg_vspPB;
 /* cg,palette 展開フラグ (funciotn flag) */
 int cg_fflg;
 /* CGをロードした回数を書き込む変数 */
-int *cg_loadCountVar;
+vmvar_t *cg_loadCountVar;
 /* Brightness (PD command) */
 int cg_brightness;

@@ -89,7 +89,7 @@ extern void load_censor_list(const char *path);

 extern int cg_vspPB;
 extern int cg_fflg;
-extern int *cg_loadCountVar;
+extern vmvar_t *cg_loadCountVar;
 extern int cg_brightness;

 static inline uint32_t rgb565_to_rgb888(uint16_t rgb) {
@@ -96,7 +96,7 @@ void commands2F0D() {

 void commands2F0E() {
 	int eCh = getCaliValue();
-	int *vResult = getCaliVariable();
+	vmvar_t *vResult = getCaliVariable();
 	int pos = mus_wav_get_playposition(eCh);
 	
 	*vResult = ((pos == 0 || pos == 65535) ? 0 : 1);
@@ -117,7 +117,7 @@ void commands2F0F() {

 void commands2F10() {
 	int eCh = getCaliValue();
-	int *vResult = getCaliVariable();
+	vmvar_t *vResult = getCaliVariable();
 	
 	*vResult = (mus_wav_fadeout_get_state(eCh) ? 1 : 0);
 	
@@ -154,9 +154,9 @@ void commands2F14() {

 void commands2F15() {
 	int eCh = getCaliValue();
-	int *eX = getCaliVariable();
-	int *eY = getCaliVariable();
-	int *eZ = getCaliVariable();
+	vmvar_t *eX = getCaliVariable();
+	vmvar_t *eY = getCaliVariable();
+	vmvar_t *eZ = getCaliVariable();

 	*eX = 0;
 	*eY = 0;
@@ -173,9 +173,9 @@ void commands2F16() {
 }

 void commands2F17() {
-	int *vX = getCaliVariable();
-	int *vY = getCaliVariable();
-	int *vZ = getCaliVariable();
+	vmvar_t *vX = getCaliVariable();
+	vmvar_t *vY = getCaliVariable();
+	vmvar_t *vZ = getCaliVariable();
 	
 	*vX = 0;
 	*vY = 0;
@@ -195,7 +195,7 @@ void commands2F18() {

 void commands2F19() {
 	int eCh = getCaliValue();
-	int *vResult = getCaliVariable();
+	vmvar_t *vResult = getCaliVariable();

 	*vResult = 0;
 	TRACE_UNIMPLEMENTED("wav3DIsFadePos %d, %d:", eCh, *vResult);
@@ -217,7 +217,7 @@ void commands2F1B() {
 }

 void commands2F1C() {
-	int *vResult = getCaliVariable();
+	vmvar_t *vResult = getCaliVariable();
 	
 	*vResult = 0;
 	TRACE_UNIMPLEMENTED("wav3DIsFadePosL %d:", *vResult);
@@ -245,7 +245,7 @@ void commands2F1F() {
 }

 void commands2F20() {
-	int *vResult = getCaliVariable();
+	vmvar_t *vResult = getCaliVariable();
 	
 	mus_pcm_get_playposition(vResult);
 	
@@ -270,7 +270,7 @@ void commands2F2D() {

 void commands2F2E() {
 	int eCh = getCaliValue();
-	int *vTime = getCaliVariable();
+	vmvar_t *vTime = getCaliVariable();
 	
 	*vTime = mus_wav_get_playposition(eCh);
 	
@@ -289,7 +289,7 @@ void commands2F2F() {

 void commands2F30() {
 	int eCh = getCaliValue();
-	int *vTime = getCaliVariable();
+	vmvar_t *vTime = getCaliVariable();
 	
 	*vTime = mus_wav_wavtime(eCh);
 	
@@ -366,22 +366,22 @@ void commands2F38() {
 }

 void commands2F39() {
-	int *vForward = getCaliVariable();
-	int *vBack = getCaliVariable();
+	vmvar_t *vForward = getCaliVariable();
+	vmvar_t *vBack = getCaliVariable();
 	
 	sys_getWheelInfo(vForward, vBack);
 	TRACE("iptGetWheelCount %d, %d:", *vForward, *vBack);
 }

 void commands2F3A() {
-	int *vSize = getCaliVariable();
+	vmvar_t *vSize = getCaliVariable();

 	*vSize = nact->sel.MsgFontSize;
 	TRACE("menuGetFontSize %d:", *vSize);
 }

 void commands2F3B() {
-	int *vSize = getCaliVariable();
+	vmvar_t *vSize = getCaliVariable();
 	
 	*vSize = nact->msg.MsgFontSize;
 	TRACE("msgGetFontSize %d:", *vSize);
@@ -390,7 +390,7 @@ void commands2F3B() {
 void commands2F3C() {
 	int eNum = getCaliValue();
 	int ePos = getCaliValue();
-	int *vResult = getCaliVariable();
+	vmvar_t *vResult = getCaliVariable();
 	
 	*vResult = svar_getCharType(eNum, ePos);
 	
@@ -399,7 +399,7 @@ void commands2F3C() {

 void commands2F3D() {
 	int eNum = getCaliValue();
-	int *vResult = getCaliVariable();
+	vmvar_t *vResult = getCaliVariable();
 	
 	*vResult = svar_width(eNum);

@@ -417,10 +417,10 @@ void commands2F3F() {
 }

 void commands2F40() {
-	int *vAry = getCaliVariable();
+	vmvar_t *vAry = getCaliVariable();
 	int eCount = getCaliValue();
 	int eNum = getCaliValue();
-	int *vResult = getCaliVariable();
+	vmvar_t *vResult = getCaliVariable();
 	int cnt = 0;
 	
 	TRACE("aryCmpCount %d, %d, %d, %d:", *vAry, eCount, eNum, *vResult);
@@ -433,12 +433,12 @@ void commands2F40() {
 }

 void commands2F41() {
-	int *vAry = getCaliVariable();
+	vmvar_t *vAry = getCaliVariable();
 	int eNumof = getCaliValue();
 	int eNum = getCaliValue();
 	int eTransNum = getCaliValue();
 	int eMaxTrans = getCaliValue();
-	int *vResult = getCaliVariable();
+	vmvar_t *vResult = getCaliVariable();
 	int cnt = 0;
 	
 	TRACE("aryCmpTrans %d, %d, %d, %d, %d, %d:", 
@@ -527,7 +527,7 @@ void commands2F4A() {
 }

 void commands2F4B() {
-	int *vTime = getCaliVariable();
+	vmvar_t *vTime = getCaliVariable();
 	
 	*vTime = ags_getCursorMoveTime();
 	TRACE("iptGetMoveCursorTime %d:", *vTime);
@@ -582,12 +582,12 @@ void commands2F54() {
 }

 void commands2F55() {
-	int *vDx = getCaliVariable();
-	int *vDy = getCaliVariable();
-	int *vSx = getCaliVariable();
-	int *vSy = getCaliVariable();
-	int *vWidth  = getCaliVariable();
-	int *vHeight = getCaliVariable();
+	vmvar_t *vDx = getCaliVariable();
+	vmvar_t *vDy = getCaliVariable();
+	vmvar_t *vSx = getCaliVariable();
+	vmvar_t *vSy = getCaliVariable();
+	vmvar_t *vWidth  = getCaliVariable();
+	vmvar_t *vHeight = getCaliVariable();

 	TRACE("mathClip %d, %d, %d, %d, %d, %d:", *vDx, *vDy, *vSx, *vSy, *vWidth, *vHeight);

@@ -609,7 +609,7 @@ void commands2F57() {
 	const char *sTitle = sl_getString(0);
 	int eStrVar = getCaliValue();
 	int eLength = getCaliValue();
-	int *vResult = getCaliVariable();
+	vmvar_t *vResult = getCaliVariable();

 	char *t1, *t2, *t3;
 	INPUTSTRING_PARAM p;
@@ -637,7 +637,7 @@ void commands2F57() {

 void commands2F58() {
 	int eNum = getCaliValue();
-	int *vResult = getCaliVariable();
+	vmvar_t *vResult = getCaliVariable();
 	
 	*vResult = sjis_has_hankaku(svar_get(eNum)) ? 1 : 0;
 	
@@ -646,7 +646,7 @@ void commands2F58() {

 void commands2F59() {
 	int eNum = getCaliValue();
-	int *vResult = getCaliVariable();
+	vmvar_t *vResult = getCaliVariable();
 	
 	*vResult = sjis_has_zenkaku(svar_get(eNum)) ? 1 : 0;
 	
@@ -745,7 +745,7 @@ void commands2F62() {
 }

 void commands2F63() {
-	int *vSelect = getCaliVariable();
+	vmvar_t *vSelect = getCaliVariable();
 	
 	*vSelect = sel_getLastElement();

@@ -755,7 +755,7 @@ void commands2F63() {
 void commands2F64() {
 	int eType = getCaliValue();
 	int eNum  = getCaliValue();
-	int *vResult = getCaliVariable();
+	vmvar_t *vResult = getCaliVariable();
 	DRIFILETYPE t = DRIFILE_DATA;

 	switch(eType) {
@@ -787,7 +787,7 @@ void commands2F64() {
 void commands2F65() {
 	int eType = getCaliValue();
 	int eNum  = getCaliValue();
-	int *vResult = getCaliVariable();
+	vmvar_t *vResult = getCaliVariable();
 	
 	DRIFILETYPE t = DRIFILE_DATA;

@@ -836,7 +836,7 @@ void commands2F66() {
 void commands2F67() {
 	int eNum = getCaliValue();
 	int eStrNum = getCaliValue();
-	int *vResult = getCaliVariable();
+	vmvar_t *vResult = getCaliVariable();
 	int i;

 	for (i = 0; i < nact->ain.fncnum; i++) {
@@ -892,7 +892,7 @@ void commands2F6A() {
 }

 void commands2F6B() {
-	int *vNum = getCaliVariable();
+	vmvar_t *vNum = getCaliVariable();
 	
 	*vNum = nact->fnc_return_value;
 	
@@ -909,7 +909,7 @@ void commands2F6C() {

 void commands2F6D() {
 	int eNum = getCaliValue();
-	int *vResult = getCaliVariable();
+	vmvar_t *vResult = getCaliVariable();

 	*vResult = save_delete_file(eNum -1);
 	
@@ -950,13 +950,13 @@ void commands2F71() {
 }

 void commands2F72() {
-	int *vFlag = getCaliVariable();
+	vmvar_t *vFlag = getCaliVariable();
 	
 	TRACE_UNIMPLEMENTED("winGetFlipFlag %p:", vFlag);
 }

 void commands2F73() {
-	int *vTrack = getCaliVariable();
+	vmvar_t *vTrack = getCaliVariable();
 	
 	*vTrack = muscd_get_maxtrack();
 	
@@ -965,7 +965,7 @@ void commands2F73() {

 void commands2F74() {
 	const char *str1 = sl_getString(0);
-	int *var   = getCaliVariable();
+	vmvar_t *var   = getCaliVariable();
 	
 	TRACE_UNIMPLEMENTED("dlgErrorOkCancel %s,%d:", str1, *var);
 }
@@ -979,7 +979,7 @@ void commands2F75() {
 }

 void commands2F76() {
-	int *var   = getCaliVariable();
+	vmvar_t *var   = getCaliVariable();

 	*var = sel_getnumberof();
 	
@@ -1084,7 +1084,7 @@ void commands2F80() {
 }

 void commands2F81() {
-	int *vData = getCaliVariable();
+	vmvar_t *vData = getCaliVariable();
 	int eNumof = getCaliValue();
 	int i;
 	uint16_t *p = (uint16_t *)nact->datatbl_addr;
@@ -1142,7 +1142,7 @@ void commands2F84() {
 }

 void commands2F85() {
-	int *vResult = getCaliVariable();
+	vmvar_t *vResult = getCaliVariable();
 	
 	*vResult = nact->ain.varnum;
 	
@@ -1161,7 +1161,7 @@ void commands2F87() {
 	int eSubKeyStrNum = getCaliValue();
 	int eBaneStrNum   = getCaliValue();
 	int eResultStrNum = getCaliValue();
-	int *vResult      = getCaliVariable();
+	vmvar_t *vResult      = getCaliVariable();

 	// This command is used to check if the game is installed, so we always
 	// return 1 with the dummy string REGREADSTRING_RESULT.
@@ -1174,7 +1174,7 @@ void commands2F87() {

 void commands2F88() {
 	int eFileNameStrNum = getCaliValue();
-	int *vResult        = getCaliVariable();
+	vmvar_t *vResult        = getCaliVariable();

 	const char *fname = svar_get(eFileNameStrNum);
 	if (strcmp(fname, REGREADSTRING_RESULT) == 0) {
@@ -1194,7 +1194,7 @@ void commands2F89() {
 	int eYear = getCaliValue();
 	int eMonth = getCaliValue();
 	int eData = getCaliValue();
-	int *vResult = getCaliVariable();
+	vmvar_t *vResult = getCaliVariable();
 	
 	TRACE_UNIMPLEMENTED("timeCheckCurDate %d,%d,%d,%p:", eYear, eMonth, eData, vResult);
 }
@@ -1211,7 +1211,7 @@ void commands2F8B() {
 	int c3 = getCaliValue();
 	int c4 = getCaliValue();
 	const char *s6 = sl_getConstString();
-	int *c7 = getCaliVariable();
+	vmvar_t *c7 = getCaliVariable();

 	*c7 = 1;
 	
@@ -37,18 +37,18 @@
 static void undeferr();

 static void commandsINC() {
-        int *var = getCaliVariable();
+        vmvar_t *var = getCaliVariable();
        if (*var < 65535) (*var)++;
 }

 static void commandsDEC() {
-        int *var = getCaliVariable();
+        vmvar_t *var = getCaliVariable();
        if (*var > 0) (*var)--;
 }

 /* 変数の代入 */
 static void letVar(int type) {
-	int *varno = getVariable();
+	vmvar_t *varno = getVariable();
 	int val    = getCaliValue();

 	if (varno == NULL) {
@@ -102,7 +102,7 @@ static void getDataTableAdr() {
 static void loopStart() {
 	int p1 = sl_getc();
 	int exitadr, limit, direction, step;
-	int *var;
+	vmvar_t *var;
 	
 	if (p1 == 0) {
 		sl_getc();
@@ -135,8 +135,8 @@ void commandB4() {

 void commandB10() {
 	SDL_Point p;
-	int *x_var = getCaliVariable();
-	int *y_var = getCaliVariable();
+	vmvar_t *x_var = getCaliVariable();
+	vmvar_t *y_var = getCaliVariable();
 	
 	msg_getMessageLocation(&p);
 	*x_var = p.x;
@@ -145,8 +145,8 @@ void commandB10() {
 }

 void commandB11() {
-	int *sel_no_var = getCaliVariable();
-	int *msg_no_var = getCaliVariable();
+	vmvar_t *sel_no_var = getCaliVariable();
+	vmvar_t *msg_no_var = getCaliVariable();
 	
 	*sel_no_var = nact->sel.winno;
 	*msg_no_var = nact->msg.winno;
@@ -155,21 +155,21 @@ void commandB11() {
 }

 void commandB12() {
-	int *var = getCaliVariable();
+	vmvar_t *var = getCaliVariable();
 	
 	*var = sel_getRegistoredElementNumber();
 	TRACE("B12 %d:", *var);
 }

 void commandB13() {
-	int *var = getCaliVariable();
+	vmvar_t *var = getCaliVariable();
 	
 	*var = sel_getRegistoredElementWidth(); 
 	TRACE("B13 %d:", *var);
 }

 void commandB14() {
-	int *var = getCaliVariable();
+	vmvar_t *var = getCaliVariable();
 	
 	*var = sel_getRegistoredElement_strlen(); 
 	TRACE("B14 %d:", *var);
@@ -177,8 +177,8 @@ void commandB14() {

 void commandB21() {
 	int no = getCaliValue();
-	int *x_var = getCaliVariable();
-	int *y_var = getCaliVariable();
+	vmvar_t *x_var = getCaliVariable();
+	vmvar_t *y_var = getCaliVariable();
 	
 	*x_var = nact->sel.win->x;
 	*y_var = nact->sel.win->y;
@@ -188,8 +188,8 @@ void commandB21() {

 void commandB22() {
 	int no = getCaliValue();
-	int *x_var = getCaliVariable();
-	int *y_var = getCaliVariable();
+	vmvar_t *x_var = getCaliVariable();
+	vmvar_t *y_var = getCaliVariable();
 	
 	*x_var = nact->sel.win->width;
 	*y_var = nact->sel.win->height;
@@ -199,8 +199,8 @@ void commandB22() {

 void commandB23() {
 	int no = getCaliValue();
-	int *x_var = getCaliVariable();
-	int *y_var = getCaliVariable();
+	vmvar_t *x_var = getCaliVariable();
+	vmvar_t *y_var = getCaliVariable();
 	
 	*x_var = nact->msg.win->x;
 	*y_var = nact->msg.win->y;
@@ -210,8 +210,8 @@ void commandB23() {

 void commandB24() {
 	int no = getCaliValue();
-	int *x_var_size = getCaliVariable();
-	int *y_var_size = getCaliVariable();
+	vmvar_t *x_var_size = getCaliVariable();
+	vmvar_t *y_var_size = getCaliVariable();
 	
 	*x_var_size = nact->msg.win->width;
 	*y_var_size = nact->msg.win->height;
@@ -222,8 +222,8 @@ void commandB24() {
 void commandB31() {
 	/* 設定されてある選択肢ウィンドウの左上座標を取得する */
 	int no = getCaliValue();
-	int *x_var = getCaliVariable();
-	int *y_var = getCaliVariable();
+	vmvar_t *x_var = getCaliVariable();
+	vmvar_t *y_var = getCaliVariable();
 	
 	*x_var = nact->sel.wininfo[no].x;
 	*y_var = nact->sel.wininfo[no].y;
@@ -233,8 +233,8 @@ void commandB31() {

 void commandB32() {
 	int no = getCaliValue();
-	int *x_var_size = getCaliVariable();
-	int *y_var_size = getCaliVariable();
+	vmvar_t *x_var_size = getCaliVariable();
+	vmvar_t *y_var_size = getCaliVariable();
 	
 	*x_var_size = nact->sel.wininfo[no].width;
 	*y_var_size = nact->sel.wininfo[no].height;
@@ -244,8 +244,8 @@ void commandB32() {

 void commandB33() {
 	int no = getCaliValue();
-	int *x_var = getCaliVariable();
-	int *y_var = getCaliVariable();
+	vmvar_t *x_var = getCaliVariable();
+	vmvar_t *y_var = getCaliVariable();

 	*x_var = nact->msg.wininfo[no].x;
 	*y_var = nact->msg.wininfo[no].y;
@@ -254,8 +254,8 @@ void commandB33() {

 void commandB34() {
 	int no = getCaliValue();
-	int *x_var_size = getCaliVariable();
-	int *y_var_size = getCaliVariable();
+	vmvar_t *x_var_size = getCaliVariable();
+	vmvar_t *y_var_size = getCaliVariable();

 	*x_var_size = nact->msg.wininfo[no].width;
 	*y_var_size = nact->msg.wininfo[no].height;
@@ -274,7 +274,7 @@ void commandCP() {

 void commandCT() {
 	/* (24bitのみ) 影データを取得する。*/
-	int *var  = getCaliVariable();
+	vmvar_t *var  = getCaliVariable();
 	int x     = getCaliValue();
 	int y     = getCaliValue();

@@ -39,8 +39,8 @@ void commandDC() {

 void commandDI() {
 	int page      = getCaliValue();
-	int *var_use  = getCaliVariable();
-	int *var_size = getCaliVariable();
+	vmvar_t *var_use  = getCaliVariable();
+	vmvar_t *var_size = getCaliVariable();
 	
 	v_getPageStatus(page, var_use, var_size);

@@ -49,7 +49,7 @@ void commandDI() {

 void commandDS() {
 	struct VarRef data_var;
-	int *point_var = getCaliVariable();
+	vmvar_t *point_var = getCaliVariable();
 	getCaliArray(&data_var);
 	int offset     = getCaliValue();
 	int page       = getCaliValue();
@@ -86,7 +86,7 @@ void commandDF() {
 		}
 	}

-	int *p = v_resolveRef(&data_var);
+	vmvar_t *p = v_resolveRef(&data_var);
 	while (cnt--)
 		*p++ = data;
 }
@@ -71,10 +71,10 @@ void commandEC() {

 void commandEG() {
 	int num     = getCaliValue();
-	int *x      = getCaliVariable();
-	int *y      = getCaliVariable();
-	int *width  = getCaliVariable();
-	int *height = getCaliVariable();
+	vmvar_t *x      = getCaliVariable();
+	vmvar_t *y      = getCaliVariable();
+	vmvar_t *width  = getCaliVariable();
+	vmvar_t *height = getCaliVariable();
 	
 	*x      = tbl[num -1].r.x;
 	*y      = tbl[num -1].r.y;
@@ -86,7 +86,7 @@ void commandEG() {

 void commandEM() {
 	int num  = getCaliValue();
-	int *var = getCaliVariable();
+	vmvar_t *var = getCaliVariable();
 	int x    = getCaliValue();
 	int y    = getCaliValue();

@@ -101,7 +101,7 @@ void commandEM() {
 }

 void commandEN() {
-	int *var = getCaliVariable();
+	vmvar_t *var = getCaliVariable();
 	int min  = getCaliValue();
 	int max  = getCaliValue();
 	int x    = getCaliValue();
@@ -43,7 +43,7 @@ static void commandF10();
 static void commandF11();

 /* F6/7 用変数 */
-static int *F6Index[256];
+static vmvar_t *F6Index[256];

 void commandF() {
 	switch (sl_getc()) {
@@ -93,7 +93,7 @@ static void commandF1() {
 }

 static void commandF2() {
-	int *read_var = getCaliVariable();
+	vmvar_t *read_var = getCaliVariable();
 	int skip      = getCaliValue();
 	uint16_t *p = (uint16_t *)nact->datatbl_addr;
 	
@@ -108,7 +108,7 @@ static void commandF2() {
 }

 static void commandF3() {
-	int *read_var = getCaliVariable();
+	vmvar_t *read_var = getCaliVariable();
 	int skip      = getCaliValue();
 	
 	*read_var = LittleEndian_getW(nact->datatbl_addr, skip *2);
@@ -117,7 +117,7 @@ static void commandF3() {
 }

 static void commandF4() {
-	int *read_var = getCaliVariable();
+	vmvar_t *read_var = getCaliVariable();
 	int count     = getCaliValue();
 	int i;
 	uint16_t *p = (uint16_t *)nact->datatbl_addr;
@@ -134,7 +134,7 @@ static void commandF4() {
 }

 static void commandF5() {
-	int *read_var = getCaliVariable();
+	vmvar_t *read_var = getCaliVariable();
 	int count     = getCaliValue();
 	int i;
 	
@@ -147,7 +147,7 @@ static void commandF5() {
 }

 static void commandF6() {
-	int *var  = getCaliVariable();
+	vmvar_t *var  = getCaliVariable();
 	int index = getCaliValue();
 	
 	F6Index[index] = var;
@@ -59,7 +59,7 @@ void commandGS() {
        /* num 番にリンクされているＣＧの座標とサイズを取得する */
 	SDL_Rect r;
 	int num = getCaliValue();
-	int *var = getCaliVariable();
+	vmvar_t *var = getCaliVariable();

 	if (num == 0) {
 		WARNING("GS num: num = 0!!");
@@ -99,8 +99,8 @@ void commandIK() {

 void commandIM() {
 	/* マウスカーソルの座標取得 */
-	int *x_var = getCaliVariable();
-	int *y_var = getCaliVariable();
+	vmvar_t *x_var = getCaliVariable();
+	vmvar_t *y_var = getCaliVariable();
 	SDL_Point p;
 	
 	sysVar[0] = sys_getMouseInfo(&p, false);
@@ -113,7 +113,7 @@ void commandIC() {
 	/* マウスカーソルの形状変更 */
 	static int pre = 1;
 	int cursor_num = getCaliValue();
-	int *oldcursor  = getCaliVariable();
+	vmvar_t *oldcursor  = getCaliVariable();
 	*oldcursor = pre;
 	pre = cursor_num;
 	
@@ -132,7 +132,7 @@ void commandIZ() {

 void commandIX() {
 	/* 「次の選択肢まで進む」の状態取得 */
-	int *var = getCaliVariable();
+	vmvar_t *var = getCaliVariable();
 	
 	*var = msgskip_isSkipping() ? 1 : 0;
 	TRACE("IX %p:",var);
@@ -155,7 +155,7 @@ void commandIY() {
 }

 void commandIG() { /* T2 */
-	int *var = getCaliVariable();
+	vmvar_t *var = getCaliVariable();
 	int code = getCaliValue();
 	int cnt  = getCaliValue();
 	int rsv  = getCaliValue();
@@ -28,7 +28,7 @@

 void commandKI() {
 	/* ネットワークのチャンネルを新規作成する／ネットワークのチャンネルに接続する */
-	int *var     = getCaliVariable();
+	vmvar_t *var     = getCaliVariable();
 	int port_num = getCaliValue();
 	int user_max = getCaliValue();
 	
@@ -50,7 +50,7 @@ void commandKK() {

 void commandKN() {
 	/* 自分自身の接続番号を取得する */
-	int *var = getCaliVariable();
+	vmvar_t *var = getCaliVariable();

 	*var = network_get_channel();
 	
@@ -60,7 +60,7 @@ void commandKN() {

 void commandKP() {
 	/* データ受信バッファにデータがあるか調べる */
-	int *var = getCaliVariable();
+	vmvar_t *var = getCaliVariable();
 	
 	*var = network_check_buffer();
 	
@@ -70,7 +70,7 @@ void commandKP() {

 void commandKQ() {
 	/* ユーザーが接続されているかどうか確認する */
-	int *var = getCaliVariable();
+	vmvar_t *var = getCaliVariable();
 	int user_num = getCaliValue();
 	
 	*var = network_get_user_state(user_num);
@@ -81,7 +81,7 @@ void commandKQ() {

 void commandKR() {
 	/* データ受信バッファからデータを取得する */
-	int *var = getCaliVariable();
+	vmvar_t *var = getCaliVariable();
 	
 	network_read_buffer(var);
 	
@@ -91,7 +91,7 @@ void commandKR() {

 void commandKW() {
 	/* データを送信する */
-	int *var = getCaliVariable();
+	vmvar_t *var = getCaliVariable();
 	int num  = getCaliValue();

 	network_write_buffer(var, num);
@@ -68,7 +68,7 @@ void commandLP() {
 void commandLT() {
 	/* タイムスタンプの読み込み */
 	int num  = getCaliValue();
-	int *var = getCaliVariable();
+	vmvar_t *var = getCaliVariable();
 	int status;
 	struct stat buf;
 	struct tm *lc;
@@ -156,7 +156,8 @@ void commandLE(char terminator) {
 void commandLL() {
 	int type = sl_getc();
 	int link_no = getCaliValue();
-	int *var, _var = 0;
+	vmvar_t *var;
+	int _var = 0;
 	int num, i;
 	dridata *dfile = ald_getdata(DRIFILE_DATA, link_no - 1);
 	uint16_t *data;
@@ -321,8 +322,8 @@ void commandLXL() {
 void commandLXS() {
 	/* ファイルサイズ(バイト数)を取得する */
 	int num = getCaliValue();
-	int *hi = getCaliVariable();
-	int *lo = getCaliVariable();
+	vmvar_t *hi = getCaliVariable();
+	vmvar_t *lo = getCaliVariable();
 	
 	TRACE_UNIMPLEMENTED("LXS %d,%d,%d:", num, *hi, *lo);
 }
@@ -339,7 +340,7 @@ void commandLXP() {
 void commandLXR() {
 	/* ファイルからデータを読み取る */
 	int num  = getCaliValue();
-	int *var = getCaliVariable();
+	vmvar_t *var = getCaliVariable();
 	int size = getCaliValue();
 	
 	TRACE_UNIMPLEMENTED("LXR %d,%d,%d:",num,*var,size);
@@ -348,7 +349,7 @@ void commandLXR() {
 void commandLXW() {
 	/* ファイルにデータを書き込む */
 	int num  = getCaliValue();
-	int *var = getCaliVariable();
+	vmvar_t *var = getCaliVariable();
 	int size = getCaliValue();
 	
 	TRACE_UNIMPLEMENTED("LXW %d,%d,%d:",num,*var,size);
@@ -358,7 +359,7 @@ void commandLXX() {
 	/* Gets file timestamp to [var, var+6] */
 	int type = getCaliValue();
 	int num = getCaliValue();
-	int *var = getCaliVariable();
+	vmvar_t *var = getCaliVariable();

 	struct stat buf;
 	struct tm *lc;
@@ -208,7 +208,7 @@ void commandMV() {

 void commandML() {
 	/* 文字列の長さを取得する */
-	int *var   = getCaliVariable();
+	vmvar_t *var   = getCaliVariable();
 	int str_no = getCaliValue();
 	
 	*var = svar_length(str_no);
@@ -242,7 +242,7 @@ void commandME() {

 void commandMF() {
 	/* 文字列中から指定文字列の位置を探す */
-	int *var      = getCaliVariable();
+	vmvar_t *var      = getCaliVariable();
 	int dst_no    = getCaliValue();
 	int key_no    = getCaliValue();
 	int start_pos = getCaliValue();
@@ -272,7 +272,8 @@ void commandMZ0() {

 void commandMG() {
 	int no = sl_getc();
-	int sw = 0, *var;
+	int sw = 0;
+	vmvar_t *var;
 	
 	switch(no) {
 	case 0:
@@ -353,7 +354,7 @@ void commandMJ() {
 void commandMN() {
 	int no   = sl_getc();
 	int num  = getCaliValue();
-	int *var = getCaliVariable();
+	vmvar_t *var = getCaliVariable();
 	
 	switch(no) {
 	case 0:
@@ -38,8 +38,8 @@ static INPUTNUM_PARAM ni_param;
 void commandNB() {
 	/* var1 から始まるcount個の変数へ
 	   var2 から始まるcount個の変数をコピーする */
-	int *var1 = getCaliVariable();
-	int *var2 = getCaliVariable();
+	vmvar_t *var1 = getCaliVariable();
+	vmvar_t *var2 = getCaliVariable();
 	int cnt   = getCaliValue();
 	
 	if (var1 == NULL) {
@@ -60,7 +60,7 @@ void commandNB() {

 void commandNC() {
 	/* var1から始まるcount個の変数を0でクリアする */
-	int *var1 = getCaliVariable();
+	vmvar_t *var1 = getCaliVariable();
 	int cnt   = getCaliValue();
 	
 	TRACE("NC %d,%d:", *var1, cnt);
@@ -74,7 +74,7 @@ void commandNR() {
 	/* var1にvar2のルートを求める (間違い)*/
 	/* NR 100,D01:         ; < D01にルート100(10)が返る */
 	int var1  = getCaliValue();
-	int *var2 = getCaliVariable();
+	vmvar_t *var2 = getCaliVariable();
 	
 	*var2 = (int)sqrtf(var1);
 	TRACE("NR %d,%d:", var1, *var2);
@@ -82,7 +82,7 @@ void commandNR() {

 void commandN_ADD() {
 	/* var1から始まるcount個の変数にnumを足す */
-	int *var1 = getCaliVariable();
+	vmvar_t *var1 = getCaliVariable();
 	int num   = getCaliValue();
 	int cnt   = getCaliValue();
 	
@@ -95,7 +95,7 @@ void commandN_ADD() {

 void commandN_SUB() {
 	/* var1から始まるcount個の変数からnumを引く */
-	int *var1 = getCaliVariable();
+	vmvar_t *var1 = getCaliVariable();
 	int num  = getCaliValue();
 	int cnt  = getCaliValue();
 	
@@ -108,7 +108,7 @@ void commandN_SUB() {

 void commandN_MUL() {
 	/* var1から始まるcount個の変数にnumを掛ける */
-	int *var1 = getCaliVariable();
+	vmvar_t *var1 = getCaliVariable();
 	int num   = getCaliValue();
 	int cnt   = getCaliValue();
 	
@@ -121,7 +121,7 @@ void commandN_MUL() {

 void commandN_DIV() {
 	/* var1から始まるcount個の変数をnumで割る */
-	int *var1 = getCaliVariable();
+	vmvar_t *var1 = getCaliVariable();
 	int num   = getCaliValue();
 	int cnt   = getCaliValue();
 	
@@ -136,10 +136,10 @@ void commandN_GT() {
 	/* var1 から始まるcount個の変数からnumより大きいければ1を、以下ならば0を
 	   var2から始まる変数列に返す
 	*/
-	int *var1 = getCaliVariable();
+	vmvar_t *var1 = getCaliVariable();
 	int num   = getCaliValue();
 	int cnt   = getCaliValue();
-	int *var2 = getCaliVariable();
+	vmvar_t *var2 = getCaliVariable();
 	
 	TRACE("N> %d,%d,%d,%d:", *var1, num, cnt, *var2);
 	while (cnt--) {
@@ -151,10 +151,10 @@ void commandN_LT() {
 	/* var1から始まるcount個の変数からnumより小さければ1を、以上ならば0を
 	   var2から始まる変数列に返す
 	 */
-	int *var1 = getCaliVariable();
+	vmvar_t *var1 = getCaliVariable();
 	int num   = getCaliValue();
 	int cnt   = getCaliValue();
-	int *var2 = getCaliVariable();
+	vmvar_t *var2 = getCaliVariable();
 	
 	TRACE("N< %p,%d,%d,%p:", var1, num, cnt, var2);
 	while(cnt--) {
@@ -166,10 +166,10 @@ void commandN_EQ() {
 	/* var1から始まるcount個の変数からnumに等しければ1を、等しくなければ0を
 	   var2から始まる変数列に返す
 	 */
-	int *var1 = getCaliVariable();
+	vmvar_t *var1 = getCaliVariable();
 	int num   = getCaliValue();
 	int cnt   = getCaliValue();
-	int *var2 = getCaliVariable();
+	vmvar_t *var2 = getCaliVariable();
 	
 	TRACE("N= %p,%d,%d,%p:", var1, num, cnt, var2);
 	while(cnt--) {
@@ -179,7 +179,7 @@ void commandN_EQ() {

 void commandN_NE() {
 	/* var1から始まるcount個の変数の0,1を反転する */
-	int *var1 = getCaliVariable();
+	vmvar_t *var1 = getCaliVariable();
 	int cnt   = getCaliValue();
 	
 	TRACE("N\\ %p,%d:", var1, cnt);
@@ -190,9 +190,9 @@ void commandN_NE() {

 void commandN_AND() {
 	/* var1,var2のcount個の変数のANDをとる */
-	int *var1 = getCaliVariable();
+	vmvar_t *var1 = getCaliVariable();
 	int cnt   = getCaliValue();
-	int *var2 = getCaliVariable();
+	vmvar_t *var2 = getCaliVariable();
 	
 	TRACE("N& %p,%d,%p:", var1, cnt, var2);
 	while(cnt--) {
@@ -202,9 +202,9 @@ void commandN_AND() {

 void commandN_OR() {
 	/* var1,var2のcount個の変数のORをとる */
-	int *var1 = getCaliVariable();
+	vmvar_t *var1 = getCaliVariable();
 	int cnt   = getCaliValue();
-	int *var2 = getCaliVariable();
+	vmvar_t *var2 = getCaliVariable();
 	
 	TRACE("N| %p,%d,%p:", var1, cnt, var2);
 	while(cnt--) {
@@ -214,9 +214,9 @@ void commandN_OR() {

 void commandN_XOR() {
 	/* var1,var2のcount個の変数のXORをとる */
-	int *var1 = getCaliVariable();
+	vmvar_t *var1 = getCaliVariable();
 	int cnt   = getCaliValue();
-	int *var2 = getCaliVariable();
+	vmvar_t *var2 = getCaliVariable();
 	
 	TRACE("N^ %p,%d,%p:", var1, cnt, var2);
 	while(cnt--) {
@@ -226,7 +226,7 @@ void commandN_XOR() {

 void commandN_NOT() {
 	/* ビット反転する */
-	int *var = getCaliVariable();
+	vmvar_t *var = getCaliVariable();
 	int cnt  = getCaliValue();
 	
 	TRACE("N~ %p,%d", var, cnt);
@@ -237,8 +237,8 @@ void commandN_NOT() {

 void commandNO() { /* T2 */
 	int p1 = sl_getc();
-	int *dst_var = getCaliVariable();
-	int *src_var = getCaliVariable();
+	vmvar_t *dst_var = getCaliVariable();
+	vmvar_t *src_var = getCaliVariable();
 	int cnt      = getCaliValue();
 	int i, tmp = 0;
 	
@@ -277,7 +277,7 @@ void commandNDC() {

 void commandNDD() {
 	/* varにw64nをコピーする*/
-	int *var = getCaliVariable();
+	vmvar_t *var = getCaliVariable();
 	int w64n = getCaliValue();
 	*var = (int)longVar[w64n];
 	
@@ -354,7 +354,7 @@ void commandND_DIV() {

 void commandNI() { /* From Panyo */
 	/* 数値入力 */
-	int *var  = getCaliVariable();
+	vmvar_t *var  = getCaliVariable();
 	int def   = getCaliValue();
 	int _min  = getCaliValue();
 	int _max  = getCaliValue();
@@ -387,10 +387,10 @@ void commandNT(char terminator) {

 void commandNP() {
 	/* 配列比較 */
-	int *var1   = getCaliVariable();
-	int *var2   = getCaliVariable();
+	vmvar_t *var1   = getCaliVariable();
+	vmvar_t *var2   = getCaliVariable();
 	int count   = getCaliValue();
-	int *result = getCaliVariable();
+	vmvar_t *result = getCaliVariable();
 	
 	TRACE("NP %d,%d,%d,%d:", *var1, *var2, count, *result);

@@ -106,7 +106,7 @@ void commandPS() {

 void commandPG() { /* T2 */
 	/* パレットデータを変数列に取得する */
-	int *var = getCaliVariable();
+	vmvar_t *var = getCaliVariable();
 	int num1 = getCaliValue();
 	int num2 = getCaliValue();
 	int i;
@@ -121,7 +121,7 @@ void commandPG() { /* T2 */

 void commandPP() { /* T2 */
 	/* パレットデータを変数列から書き込み */
-	int *var = getCaliVariable();
+	vmvar_t *var = getCaliVariable();
 	int num1 = getCaliValue();
 	int num2 = getCaliValue();
 	int i;
@@ -153,7 +153,7 @@ void commandPD() {

 void commandPT0() {
 	/* 指定座標に描かれているパレット番号を取得する */
-	int *var = getCaliVariable();
+	vmvar_t *var = getCaliVariable();
 	int x = getCaliValue();
 	int y = getCaliValue();
 	PixelColor cell;
@@ -166,9 +166,9 @@ void commandPT0() {

 void commandPT1() {
 	/* 指定座標に描かれている色を取得する */
-	int *r_var = getCaliVariable();
-	int *g_var = getCaliVariable();
-	int *b_var = getCaliVariable();
+	vmvar_t *r_var = getCaliVariable();
+	vmvar_t *g_var = getCaliVariable();
+	vmvar_t *b_var = getCaliVariable();
 	int x = getCaliValue();
 	int y = getCaliValue();
 	PixelColor cell;
@@ -183,8 +183,8 @@ void commandPT1() {

 void commandPT2() {
 	/* 指定座標に描かれている色を取得する */
-	int *hi_var  = getCaliVariable();
-	int *low_var = getCaliVariable();
+	vmvar_t *hi_var  = getCaliVariable();
+	vmvar_t *low_var = getCaliVariable();
 	int x = getCaliValue();
 	int y = getCaliValue();
 	PixelColor cell;
@@ -50,7 +50,7 @@ void commandSS() {

 void commandSC() {
 	/* ＣＤのプレイ中のタイムを取得する */
-	int *var = getCaliVariable();
+	vmvar_t *var = getCaliVariable();
 	int t, m, s, f;
 	
 	if (muscd_getpos(&t, &m, &s, &f)) {
@@ -85,7 +85,8 @@ void commandSR() {
 	   var+3 = フェードイン／アウト中
 	*/
 	/* Hushaby から SR,c,P:に変更か？ */
-	int num, *var;
+	int num;
+	vmvar_t *var;
 	int c = sl_getcAt(sl_getIndex());
 	if (c < 0x40) {
 		num = sl_getc();
@@ -127,7 +128,7 @@ void commandSL() {
 void commandSI() {
 	/* 指定した音源の接続状態を var に取得 */
 	int type = sl_getc();
-	int *var = getCaliVariable();
+	vmvar_t *var = getCaliVariable();
 	
 	if (type == 0) {        /* MIDI */
 		*var = mus_midi_get_state() ? 1 : 0;
@@ -144,7 +145,8 @@ void commandSG() {
 	/* MIDI演奏 */
 	static int loopcnt = 0;
 	int sw  = sl_getc();
-	int num, fnum, *var;
+	int num, fnum;
+	vmvar_t *var;
 	midiplaystate st;
 	
 	switch(sw) {
@@ -255,8 +257,8 @@ void commandST() {

 void commandSU() {
 	/* ＰＣＭの演奏状態を変数 var1 , var2 に返す */
-	int *var1 = getCaliVariable();
-	int *var2 = getCaliVariable();
+	vmvar_t *var1 = getCaliVariable();
+	vmvar_t *var2 = getCaliVariable();

 	if (!mus_pcm_get_state()) {
 		*var1 = dummy_pcm_in_play ? 1 : 0;
@@ -311,14 +313,14 @@ void commandSQ() {

 void commandSO() {
 	// ＰＣＭデバイスのサポート情報を取得
-	int *var = getCaliVariable();
+	vmvar_t *var = getCaliVariable();
 	
 	TRACE_UNIMPLEMENTED("SO %p:",var);
 }

 void commandSW() {
 	/* 指定データ形式が演奏出来るかチェックする．*/
-	int *var    = getCaliVariable();
+	vmvar_t *var    = getCaliVariable();
 	int channel = getCaliValue();
 	int Srate   = getCaliValue();
 	int bit     = getCaliValue();
@@ -352,7 +354,7 @@ void commandSX() {
 	}
 	case 2: {
 		/* フェード終了確認 */
-		int *var   = getCaliVariable();
+		vmvar_t *var   = getCaliVariable();
 		bool st;
 		st = mus_mixer_fadeout_get_state(device);
 		*var = (st ? 0 : 1);
@@ -367,7 +369,7 @@ void commandSX() {
 	}
 	case 4: {
 		/* ボリューム取得 */
-		int *var   = getCaliVariable();
+		vmvar_t *var   = getCaliVariable();
 		*var = mus_mixer_get_level(device);
 		TRACE("SX %d,%d:", device, sw);
 		break;
@@ -95,7 +95,7 @@ void commandTAA() {

 void commandTAB() {
 	/* アンチエイリアシング付きテキスト描画のフラグ取得 */
-	int *var = getCaliVariable();
+	vmvar_t *var = getCaliVariable();

 	*var = ags_getAntialiasedStringMode() ? 1 : 0;

@@ -65,7 +65,7 @@ void commandUD() {

 void commandUR() {
 	/* 最後に積まれたスタックの属性をリード */
-	int *var = getCaliVariable();
+	vmvar_t *var = getCaliVariable();

 	struct stack_info info;
 	sl_getStackInfo(&info);
@@ -457,7 +457,7 @@ void commandVV() { /* from T2 */
 void commandVR() { /* from Rance4 */
 	int nPage = getCaliValue();
 	int nType = getCaliValue();
-	int *var  = getCaliVariable();
+	vmvar_t *var  = getCaliVariable();
 	int *dst;
 	
 	TRACE("VR %d,%d,%p:",nPage, nType, var);
@@ -487,7 +487,7 @@ void commandVR() { /* from Rance4 */
 void commandVW() { /* from Rance4 */
 	int nPage = getCaliValue();
 	int nType = getCaliValue();
-	int *var  = getCaliVariable();
+	vmvar_t *var  = getCaliVariable();
 	int *src;
 	
 	TRACE("VW %d,%d,%p:",nPage, nType, var);
@@ -720,7 +720,7 @@ void commandVA() { /* from Panyo */
 	int no = sl_getc();
 	int p1 = getCaliValue();
 	int p2, p3;
-	int *var1, *var2;
+	vmvar_t *var1, *var2;
 	
 	if (no >= 10) {
 		var1 = getCaliVariable();
@@ -178,7 +178,8 @@ void commandZF() {

 void commandZD() {
 	int c0 = sl_getc();
-	int sw = 0, *var;
+	int sw = 0;
+	vmvar_t *var;
 	char *msg;
 	
 	switch(c0) {
@@ -209,7 +210,7 @@ void commandZT0() {
 	struct tm *lc;
 	int       sv = sl_getIndex();
 	int       c1, c2;
-	int       *var;
+	vmvar_t   *var;

 	/* ZT 0,1対策 for DALK */
 	c1 = sl_getc();
@@ -245,7 +246,7 @@ void commandZT1() {

 void commandZT2() {
 	/* タイマーを var に取得する 1/10 sec */
-	int *var = getCaliVariable();
+	vmvar_t *var = getCaliVariable();
 	int val = get_counter(0) / 100;
 	
 	*var = val & 0xffff;
@@ -255,7 +256,7 @@ void commandZT2() {

 void commandZT3() {
 	/* タイマーを var に取得する 1/30 sec */
-	int *var = getCaliVariable();
+	vmvar_t *var = getCaliVariable();
 	int val = get_counter(0) * 3 / 100;
 	
 	*var = val & 0xffff;
@@ -265,7 +266,7 @@ void commandZT3() {

 void commandZT4() {
 	/* タイマーを var に取得する 1/60 sec */
-	int *var = getCaliVariable();
+	vmvar_t *var = getCaliVariable();
 	int val = get_counter(0) * 3 / 50;
 	
 	*var = val & 0xffff;
@@ -275,7 +276,7 @@ void commandZT4() {

 void commandZT5() {
 	/* タイマーを var に取得する */
-	int *var = getCaliVariable();
+	vmvar_t *var = getCaliVariable();
 	int val = get_counter(0) / 10;
 	
 	*var = val & 0xffff;
@@ -304,7 +305,7 @@ void commandZT10() {
 void commandZT11() {
 	/* 高精度タイマー取得 */
 	int num  = getCaliValue();
-	int *var = getCaliVariable();
+	vmvar_t *var = getCaliVariable();

 	int divisor = counters[num].divisor ? counters[num].divisor : 1;
 	if (num > 256)
@@ -352,7 +353,7 @@ void commandZZ0() {

 void commandZZ1() {
 	/* 現在の動作機種コードを var に返す */
-	int *var = getCaliVariable();
+	vmvar_t *var = getCaliVariable();
 #if 1
 	*var = 1;
 #else
@@ -392,7 +393,7 @@ void commandZZ2() {

 void commandZZ3() {
 	/* WINDOWSの全画面サイズや表示色数を変数列に返す */
-	int *var = getCaliVariable();
+	vmvar_t *var = getCaliVariable();
 	DispInfo info;
 	
 	ags_getWindowInfo(&info);
@@ -405,7 +406,7 @@ void commandZZ3() {

 void commandZZ4() {
 	/* ＤＩＢ の全画面 サイズや色数を変数列に返す */
-	int *var = getCaliVariable();
+	vmvar_t *var = getCaliVariable();
 	DispInfo info;
 	
 	ags_getDIBInfo(&info);
@@ -418,7 +419,7 @@ void commandZZ4() {

 void commandZZ5() {
 	/* ＳＹＳＴＥＭ３．５用表示画面 の サイズや色数を変数列に返す */
-	int *var = getCaliVariable();
+	vmvar_t *var = getCaliVariable();
 	DispInfo info;

 	ags_getViewAreaInfo(&info);
@@ -431,7 +432,7 @@ void commandZZ5() {

 void commandZZ7() {
 	// セーブドライブの残りディスク容量を得る
-	int *var = getCaliVariable();
+	vmvar_t *var = getCaliVariable();
 	
 	*var = 65535;
 	
@@ -440,14 +441,14 @@ void commandZZ7() {

 void commandZZ8() {
 	// メモリオンバッファの残り容量を得る
-	int *var = getCaliVariable();
+	vmvar_t *var = getCaliVariable();
 	
 	TRACE_UNIMPLEMENTED("ZZ8 %p:",var);
 }

 void commandZZ9() {
 	/* 起動時のスクリーンサイズを取得する */
-	int *var = getCaliVariable();
+	vmvar_t *var = getCaliVariable();
 	DispInfo info;
 	
 	ags_getWindowInfo(&info);
@@ -460,7 +461,7 @@ void commandZZ9() {

 void commandZZ10() {
 	/* スクリーンモードを取得する */
-	int *var = getCaliVariable();
+	vmvar_t *var = getCaliVariable();

 	*var = gfx_isFullscreen() ? 1 : 0;
 	
@@ -500,7 +501,7 @@ void commandZZ14() {

 void commandZG() {
 	/* ＣＧのロードした回数をリンク番号毎に配列に書き込む配列を設定 */
-	int *var = getCaliVariable();
+	vmvar_t *var = getCaliVariable();
 	
 	cg_loadCountVar = var;
 	
@@ -549,7 +550,7 @@ void commandZK() {
 void commandZR() {
 	/* 1 〜 num までの乱数を発生して変数に返す。 */
 	int num  = getCaliValue();
-	int *var = getCaliVariable();
+	vmvar_t *var = getCaliVariable();
 	
 	if (num == 0 || num == 1) {
 		*var = num;
@@ -142,7 +142,7 @@ static int eval_variable(void) {
 	int var = dbg_lookup_var(buf);
 	if (var < 0)
 		eval_error("unknown variable \"%s\"", buf);
-	int *store;
+	vmvar_t *store;
 	if (consume('[')) {
 		int index = eval_expr();
 		expect(']');
@@ -376,7 +376,7 @@ static void cmd_variables(cJSON *args, cJSON *resp) {
 			cJSON_AddItemToArray(variables, var);
 			cJSON_AddStringToObject(var, "name", dsym_variable_name(symbols, i));
 			char value[20];
-			int *store = v_ref(i, NULL);
+			vmvar_t *store = v_ref(i, NULL);
 			if (store)
 				sprintf(value, "%d", *store);
 			else
@@ -432,7 +432,7 @@ static void cmd_setVariable(cJSON *args, cJSON *resp) {
 			cJSON_AddStringToObject(resp, "message", "syntax error");
 			return;
 		}
-		int *store = v_ref(var, NULL);
+		vmvar_t *store = v_ref(var, NULL);
 		if (!store) {
 			cJSON_AddBoolToObject(resp, "success", false);
 			cJSON_AddStringToObject(resp, "message", "out of bounds array access");
@@ -617,7 +617,7 @@ int event_get_mouse(SDL_Point *p) {
 	return m1 | m2;
 }

-void event_get_wheel(int *forward, int *back) {
+void event_get_wheel(vmvar_t *forward, vmvar_t *back) {
 	*forward = mouse_wheel_up;
 	*back = mouse_wheel_down;

@@ -31,7 +31,7 @@ void event_set_mouse_location(int x, int y);
 void event_set_mouse_internal_location(int x, int y);
 int event_get_key(void);
 int event_get_mouse(SDL_Point *p);
-void event_get_wheel(int *forward, int *back);
+void event_get_wheel(vmvar_t *forward, vmvar_t *back);
 void event_clear_wheel(void);
 int event_get_joy(void);
 void event_reset_input_state(void);
@@ -66,7 +66,7 @@ int sys_getMouseInfo(SDL_Point *p, bool is_dibgeo) {
 	return key;
 }

-void sys_getWheelInfo(int *forward, int *back) {
+void sys_getWheelInfo(vmvar_t *forward, vmvar_t *back) {
 	event_get_wheel(forward, back);
 }

@@ -165,7 +165,7 @@ extern int sys_getMouseInfo(struct SDL_Point *p, bool is_dibgeo);
 extern int sys_getInputInfo(void);
 extern int sys_getKeyInfo(void);
 extern int sys_getJoyInfo(void);
-extern void sys_getWheelInfo(int *forward, int *back);
+extern void sys_getWheelInfo(vmvar_t *forward, vmvar_t *back);
 extern void sys_clearWheelInfo(void);
 extern void sys_key_releasewait(int key, bool zi_mask_enabled);
 extern void sys_hit_any_key();
@@ -171,7 +171,7 @@ bool mus_pcm_load(int no) {
 *        停止している場合は 0 が入る
 *        loopしている場合は合計時間
 */
-bool mus_pcm_get_playposition(int *pos) {
+bool mus_pcm_get_playposition(vmvar_t *pos) {
 	if (!prv.pcm_valid) return false;

 	*pos = muspcm_getpos(0);
@@ -60,7 +60,7 @@ bool mus_pcm_start(int no, int loop);
 bool mus_pcm_mix(int noL, int noR, int loop);
 void mus_pcm_stop(int msec);
 bool mus_pcm_load(int no);
-bool mus_pcm_get_playposition(int *pos);
+bool mus_pcm_get_playposition(vmvar_t *pos);
 bool mus_pcm_get_state(void);

 /* fader/mixer related function */
@@ -45,10 +45,10 @@ int network_check_buffer() {
 	return 0;
 }

-void network_read_buffer(int *var) {
+void network_read_buffer(vmvar_t *var) {
 	
 }

-void network_write_buffer(int *var, int cnt) {
+void network_write_buffer(vmvar_t *var, int cnt) {
 	
 }
@@ -23,12 +23,14 @@
 #ifndef __NETWORK_H__
 #define __NETWORK_H__

+#include "portab.h"
+
 int  network_create_channel(int portnum, int use_max);
 void network_close(int user_num);
 int  network_get_channel();
 int  network_get_user_state(int num);
 int  network_check_buffer();
-void network_read_buffer(int *var);
-void network_write_buffer(int *var, int cnt);
+void network_read_buffer(vmvar_t *var);
+void network_write_buffer(vmvar_t *var, int cnt);

 #endif  /* __NETWORK_H__ */
@@ -28,6 +28,8 @@
 #include <stdint.h>
 #include "config.h"

+typedef int vmvar_t;
+
 #ifdef _WIN32
 # ifdef min
 #  undef min
@@ -190,7 +190,7 @@ static int saveVarPage(int page, FILE *fp) {
 	if (!varPage[page].saveflag)
 		return 0;
 	int cnt = varPage[page].size;
-	int *var = varPage[page].value;
+	vmvar_t *var = varPage[page].value;
 	if (!var)
 		return 0;
 	asd_varPageHdr head = {
@@ -215,7 +215,7 @@ static int loadVarPage(char *buf) {
 			return SAVE_LOADERR;
 		}
 	}
-	int *var = varPage[page].value;
+	vmvar_t *var = varPage[page].value;
 	uint16_t *data = (uint16_t *)(buf + sizeof(asd_varPageHdr));
 	for (int i = 0; i < cnt; i++)
 		*var++ = *data++;
@@ -367,7 +367,7 @@ int save_vars_to_file(char *fname_utf8, struct VarRef *src, int cnt) {
 		cnt = v_sliceSize(src);
 	}

-	int *p = v_resolveRef(src);
+	vmvar_t *p = v_resolveRef(src);
 	while (cnt--)
 		fputw(*p++, fp);

@@ -400,7 +400,7 @@ int load_vars_from_file(char *fname_utf8, struct VarRef *dest, int cnt) {
 		cnt = v_sliceSize(dest);
 	}

-	int *start = v_resolveRef(dest);
+	vmvar_t *start = v_resolveRef(dest);
 	for (int i = 0; i < cnt; i++)
 		start[i] = SDL_SwapLE16(tmp[i]);

@@ -483,7 +483,7 @@ int save_loadPartial(int no, struct VarRef *vref, int cnt) {
 		return SAVE_SAVEERR;

 	cnt = min(cnt, v_sliceSize(vref));
-	int *var = v_resolveRef(vref);
+	vmvar_t *var = v_resolveRef(vref);
 	
 	int status, filesize;
 	char *saveTop = loadGameData(no, &status, &filesize);
@@ -523,7 +523,7 @@ int save_savePartial(int no, struct VarRef *vref, int cnt) {
 		return SAVE_SAVEERR;

 	cnt = min(cnt, v_sliceSize(vref));
-	int *var = v_resolveRef(vref);
+	vmvar_t *var = v_resolveRef(vref);
 	
 	int status, filesize;
 	char *saveTop = loadGameData(no, &status, &filesize);
@@ -725,4 +725,3 @@ int save_saveAll(int no) {
 	fclose(fp);
 	return SAVE_SAVEERR;
 }
-
@@ -335,7 +335,7 @@ void sl_dropLabelCalls(int cnt) {
 /* US */
 void sl_pushVar(struct VarRef *vref, int cnt) {
 	stack_reserve((2 + 2 + 2 + 1) * cnt);
-	int *val = v_resolveRef(vref);
+	vmvar_t *val = v_resolveRef(vref);
 	for (int i = 0; i < cnt; i++) {
 		stack_push_word(vref->index + i);
 		stack_push_word(vref->page);
@@ -346,7 +346,7 @@ void sl_pushVar(struct VarRef *vref, int cnt) {

 /* UG */
 void sl_popVar(struct VarRef *vref, int cnt) {
-	int *val = v_resolveRef(vref) + cnt;
+	vmvar_t *val = v_resolveRef(vref) + cnt;
 	while (cnt-- > 0) {
 		if (stack_pop_byte() != STACK_VARIABLE)
 			SYSERROR("stack top is not a variable push");
@@ -37,13 +37,13 @@
 #define PAGE_MAX 256

 typedef struct {
-	int *pointvar;
+	vmvar_t *pointvar;
 	int page;
 	int offset;
 } VariableAttributes;

 /* システム変数 */
-int sysVar[SYSVAR_MAX];
+vmvar_t sysVar[SYSVAR_MAX];
 /* 配列変数の情報 */
 static VariableAttributes attributes[SYSVAR_MAX];
 /* 配列本体 */
@@ -85,7 +85,7 @@ static char *advance(const char *s, int n) {
 	return (char *)s;
 }

-int *v_ref_indexed(int var, int index, struct VarRef *ref) {
+vmvar_t *v_ref_indexed(int var, int index, struct VarRef *ref) {
 	VariableAttributes *attr = &attributes[var];
 	int page = attr->page;

@@ -126,9 +126,9 @@ bool v_allocatePage(int page, int size, bool saveflag) {
 	if (page != 0) {
 		void *buf = varPage[page].value;
 		if (buf != NULL)
-			buf = realloc(buf, size * sizeof(int));
+			buf = realloc(buf, size * sizeof(vmvar_t));
 		else
-			buf = calloc(size, sizeof(int));
+			buf = calloc(size, sizeof(vmvar_t));
 		if (!buf)
 			NOMEMERR();
 		varPage[page].value = buf;
@@ -141,7 +141,7 @@ bool v_allocatePage(int page, int size, bool saveflag) {
 }

 // DS command
-bool v_bindArray(int datavar, int *pointvar, int offset, int page) {
+bool v_bindArray(int datavar, vmvar_t *pointvar, int offset, int page) {
 	if (datavar <  0 || datavar >= SYSVAR_MAX)         { return false; }
 	if (page    <= 0 || page    >= PAGE_MAX)           { return false; }
 	if (offset  <  0 || offset  >= varPage[page].size) { return false; }
@@ -159,7 +159,7 @@ bool v_unbindArray(int datavar) {
 }

 // DI command
-void v_getPageStatus(int page, int *in_use, int *size) {
+void v_getPageStatus(int page, vmvar_t *in_use, vmvar_t *size) {
 	if (page == 0) {
 		*in_use = false;
 		*size = 1;  // why...
@@ -320,20 +320,20 @@ int svar_find(int no, int start, const char *str) {
 	return n;
 }

-void svar_fromVars(int no, const int *vars) {
+void svar_fromVars(int no, const vmvar_t *vars) {
 	if ((unsigned)no >= strvar_cnt) {
 		WARNING("string index out of range: %d", no);
 		return;
 	}
 	int len = 0;
-	for (const int *c = vars; *c; c++)
+	for (const vmvar_t *c = vars; *c; c++)
 		len += (*c < 256) ? 1 : 2;

 	if (strVar[no])
 		free(strVar[no]);
 	char *p = strVar[no] = malloc(len + 1);

-	for (const int *v = vars; *v; v++) {
+	for (const vmvar_t *v = vars; *v; v++) {
 		if (*v < 256) {
 			*p++ = *v;
 		} else {
@@ -344,7 +344,7 @@ void svar_fromVars(int no, const int *vars) {
 	*p = '\0';
 }

-int svar_toVars(int no, int *vars) {
+int svar_toVars(int no, vmvar_t *vars) {
 	if ((unsigned)no >= strvar_cnt) {
 		WARNING("string index out of range: %d", no);
 		return 0;
@@ -31,7 +31,7 @@
 struct VarPage {
 	int size;
 	bool saveflag;
-	int *value;
+	vmvar_t *value;
 };

 struct VarRef {
@@ -40,11 +40,11 @@ struct VarRef {
 	int index;
 };

-extern int sysVar[];
+extern vmvar_t sysVar[];
 extern struct VarPage varPage[];
 extern double longVar[];

-static inline int *v_resolveRef(struct VarRef *r) {
+static inline vmvar_t *v_resolveRef(struct VarRef *r) {
 	return varPage[r->page].value + r->index;
 }
 static inline int v_sliceSize(struct VarRef *r) {
@@ -54,15 +54,15 @@ static inline int v_sliceSize(struct VarRef *r) {
 void v_set_encoding(CharacterEncoding encoding);
 void v_set_names(int count, char **names);
 const char *v_name(int var);
-int *v_ref_indexed(int var, int index, struct VarRef *ref);
+vmvar_t *v_ref_indexed(int var, int index, struct VarRef *ref);
 bool v_allocatePage(int page, int size, bool saveflag);
-bool v_bindArray(int datavar, int *pointvar, int offset, int page);
+bool v_bindArray(int datavar, vmvar_t *pointvar, int offset, int page);
 bool v_unbindArray(int datavar);
-void v_getPageStatus(int page, int *in_use, int *size);
+void v_getPageStatus(int page, vmvar_t *in_use, vmvar_t *size);
 void v_init(void);
 void v_reset(void);

-static inline int *v_ref(int var, struct VarRef *ref) {
+static inline vmvar_t *v_ref(int var, struct VarRef *ref) {
 	return v_ref_indexed(var, -1, ref);
 }

@@ -75,8 +75,8 @@ void svar_append(int no, const char *str);
 size_t svar_length(int no);
 int svar_width(int no);
 int svar_find(int no, int start, const char *str);
-void svar_fromVars(int no, const int *vars);
-int svar_toVars(int no, int *vars);
+void svar_fromVars(int no, const vmvar_t *vars);
+int svar_toVars(int no, vmvar_t *vars);
 int svar_getCharType(int no, int pos);
 void svar_replaceAll(int no, int pattern, int replacement);

@@ -33,7 +33,7 @@ static void allocate_page_test(void) {

 static void array_reference_test(void) {
 	struct VarRef ref;
-	int index = 2;
+	vmvar_t index = 2;

 	ASSERT_TRUE(v_allocatePage(1, 5, true));
 	ASSERT_FALSE(v_bindArray(-1, &index, 0, 1));
@@ -65,13 +65,13 @@ static void array_reference_test(void) {
 }

 static void string_variable_conversion_test(void) {
-	const int input[] = {
+	const vmvar_t input[] = {
 		0x41,    // 'A'
 		0xa082,  // Shift-JIS 0x82 0xa0 ('あ')
 		0x42,    // 'B'
 		0,       // terminator
 	};
-	int output[4] = {-1, -1, -1, -1};
+	vmvar_t output[4] = {-1, -1, -1, -1};

 	svar_fromVars(0, input);
 	ASSERT_STRCMP(svar_get(0), "A\x82\xa0" "B");