Rooba
/
ReC98
mirror of https://github.com/nmlgc/ReC98.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[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.
This commit is contained in:
nmlgc 2018-03-20 19:26:44 +01:00
parent dca8770533
commit 6b0d0c6940
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libs/master.lib/palette_black_in.asm
View File

@ -45,8 +45,8 @@ func PALETTE_BLACK_IN ; palette_black_in() {
push SI push SI
push DI push DI
; 引数 ; 引数
speed = (RETSIZE+0)*2 @@speed = (RETSIZE+0)*2
mov SI,SS:[BX+speed] mov SI,SS:[BX+@@speed]
mov PaletteTone,0 mov PaletteTone,0
nopcall VSYNC_WAIT ; 表示タイミングあわせ nopcall VSYNC_WAIT ; 表示タイミングあわせ

4
libs/master.lib/palette_black_out.asm
View File

@ -43,8 +43,8 @@ func PALETTE_BLACK_OUT ; palette_black_out() {
push SI push SI
push DI push DI
; 引数 ; 引数
speed = (RETSIZE+0)*2 @@speed = (RETSIZE+0)*2
mov SI,SS:[BX+speed] mov SI,SS:[BX+@@speed]
mov PaletteTone,100 mov PaletteTone,100
nopcall VSYNC_WAIT ; 表示タイミングあわせ nopcall VSYNC_WAIT ; 表示タイミングあわせ

4
libs/master.lib/palette_white_in.asm
View File

@ -45,8 +45,8 @@ func PALETTE_WHITE_IN ; palette_white_in() {
push SI push SI
push DI push DI
; 引数 ; 引数
speed = (RETSIZE+0)*2 @@speed = (RETSIZE+0)*2
mov SI,SS:[BX+speed] mov SI,SS:[BX+@@speed]
mov PaletteTone,200 mov PaletteTone,200
call VSYNC_WAIT ; 表示タイミングあわせ call VSYNC_WAIT ; 表示タイミングあわせ

4
libs/master.lib/palette_white_out.asm
View File

@ -45,8 +45,8 @@ func PALETTE_WHITE_OUT ; palette_white_out {
push SI push SI
push DI push DI
; 引数 ; 引数
speed = (RETSIZE+0)*2 @@speed = (RETSIZE+0)*2
mov SI,SS:[BX+speed] mov SI,SS:[BX+@@speed]
mov PaletteTone,100 mov PaletteTone,100
call VSYNC_WAIT ; 表示タイミングあわせ call VSYNC_WAIT ; 表示タイミングあわせ