From 6b0d0c6940201217b3481474b89c1f6e6b17e703 Mon Sep 17 00:00:00 2001
From: nmlgc <nmlgc@nmlgc.net>
Date: Tue, 20 Mar 2018 19:26:44 +0100
Subject: [PATCH] [Maintenance] Rename master.lib's speed parameter to avoid an
 upcoming conflict

TASM crashes if you try to define a structure member with the same name
as an existing numeric equate.

And yes, we should have solved this by finally librarifying master.lib,
but that'll be a rather involved subtask as well.
---
 libs/master.lib/palette_black_in.asm  | 4 ++--
 libs/master.lib/palette_black_out.asm | 4 ++--
 libs/master.lib/palette_white_in.asm  | 4 ++--
 libs/master.lib/palette_white_out.asm | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/libs/master.lib/palette_black_in.asm b/libs/master.lib/palette_black_in.asm
index cf4e5e80..5262a060 100644
--- a/libs/master.lib/palette_black_in.asm
+++ b/libs/master.lib/palette_black_in.asm
@@ -45,8 +45,8 @@ func PALETTE_BLACK_IN	; palette_black_in() {
 	push	SI
 	push	DI
 	; 引数
-	speed	= (RETSIZE+0)*2
-	mov	SI,SS:[BX+speed]
+	@@speed	= (RETSIZE+0)*2
+	mov	SI,SS:[BX+@@speed]
 
 	mov	PaletteTone,0
 	nopcall	VSYNC_WAIT	; 表示タイミングあわせ
diff --git a/libs/master.lib/palette_black_out.asm b/libs/master.lib/palette_black_out.asm
index 8dfe661f..2fdd45aa 100644
--- a/libs/master.lib/palette_black_out.asm
+++ b/libs/master.lib/palette_black_out.asm
@@ -43,8 +43,8 @@ func PALETTE_BLACK_OUT	; palette_black_out() {
 	push	SI
 	push	DI
 	; 引数
-	speed	= (RETSIZE+0)*2
-	mov	SI,SS:[BX+speed]
+	@@speed	= (RETSIZE+0)*2
+	mov	SI,SS:[BX+@@speed]
 
 	mov	PaletteTone,100
 	nopcall	VSYNC_WAIT	; 表示タイミングあわせ
diff --git a/libs/master.lib/palette_white_in.asm b/libs/master.lib/palette_white_in.asm
index b9607840..ab806ca1 100644
--- a/libs/master.lib/palette_white_in.asm
+++ b/libs/master.lib/palette_white_in.asm
@@ -45,8 +45,8 @@ func PALETTE_WHITE_IN	; palette_white_in() {
 	push	SI
 	push	DI
 	; 引数
-	speed	= (RETSIZE+0)*2
-	mov	SI,SS:[BX+speed]
+	@@speed	= (RETSIZE+0)*2
+	mov	SI,SS:[BX+@@speed]
 
 	mov	PaletteTone,200
 	call	VSYNC_WAIT	; 表示タイミングあわせ
diff --git a/libs/master.lib/palette_white_out.asm b/libs/master.lib/palette_white_out.asm
index f488eb0e..62ac73e5 100644
--- a/libs/master.lib/palette_white_out.asm
+++ b/libs/master.lib/palette_white_out.asm
@@ -45,8 +45,8 @@ func PALETTE_WHITE_OUT	; palette_white_out {
 	push	SI
 	push	DI
 	; 引数
-	speed	= (RETSIZE+0)*2
-	mov	SI,SS:[BX+speed]
+	@@speed	= (RETSIZE+0)*2
+	mov	SI,SS:[BX+@@speed]
 
 	mov	PaletteTone,100
 	call	VSYNC_WAIT	; 表示タイミングあわせ