a_dinosaur/ZSNES
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed movie vars from places where it doesn't belong.

Browse Source
This commit is contained in:
n-a-c-h
2005-03-15 15:32:41 +00:00
parent 8404393e16
commit 0f05c9386f
5 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
zsnes/src/cpu/execute.asm
View File

@@ -21,7 +21,7 @@
%include "macros.mac" %include "macros.mac"
EXTSYM StringLength,Get_Time,objhipr,KeyRewind,statesaver EXTSYM StringLength,Get_Time,objhipr,KeyRewind,statesaver
EXTSYM xa,timer2upd,prevoamptr,ReadHead EXTSYM xa,timer2upd,prevoamptr
EXTSYM prevedi,SA1xpc,SA1RAMArea,sa1dmaptr EXTSYM prevedi,SA1xpc,SA1RAMArea,sa1dmaptr
EXTSYM DSP1COp,C4WFXVal,C41FXVal,Op00Multiplicand,Op10Coefficient,Op04Angle EXTSYM DSP1COp,C4WFXVal,C41FXVal,Op00Multiplicand,Op10Coefficient,Op04Angle
EXTSYM Op08X,Op18X,Op28X,Op0CA,Op02FX,Op0AVS,Op06X,Op0DX,Op03F,Op14Zr EXTSYM Op08X,Op18X,Op28X,Op0CA,Op02FX,Op0AVS,Op06X,Op0DX,Op03F,Op14Zr

2
zsnes/src/gblvars.h
View File

@@ -30,7 +30,7 @@ extern unsigned int *wramdata, *vram, PHspcsave, PHdspsave, *C4Ram, *sfxramdata;
extern unsigned int PHnum2writesa1reg, SA1Mode, prevedi, SA1xpc, sa1dmaptr; extern unsigned int PHnum2writesa1reg, SA1Mode, prevedi, SA1xpc, sa1dmaptr;
extern unsigned int soundcycleft, spc700read, timer2upd, xa, PHnum2writesfxreg; extern unsigned int soundcycleft, spc700read, timer2upd, xa, PHnum2writesfxreg;
extern unsigned int spcnumread, spchalted, opcd, HIRQCycNext, oamaddr; extern unsigned int spcnumread, spchalted, opcd, HIRQCycNext, oamaddr;
extern unsigned int SfxR0, ReadHead, *setaramdata, ramsize, *sram; extern unsigned int SfxR0, *setaramdata, ramsize, *sram;
extern unsigned int tempesi, tempedi, tempedx, tempebp; extern unsigned int tempesi, tempedi, tempedx, tempebp;
extern unsigned int SPCMultA, PHnum2writespc7110reg, PHdspsave2; extern unsigned int SPCMultA, PHnum2writespc7110reg, PHdspsave2;
extern unsigned char sndrot, spcRam[65472]; extern unsigned char sndrot, spcRam[65472];

8
zsnes/src/init.asm
View File

@@ -1048,14 +1048,8 @@ NEWSYM ReadInputDevice
SECTION .data SECTION .data
NEWSYM txtmovieended, db 'MOVIE FINISHED.',0 NEWSYM txtmovieended, db 'MOVIE FINISHED.',0
NEWSYM CFWriteStart, dd 64+30
SECTION .bss SECTION .bss
NEWSYM MovieBuffSize, resd 1
NEWSYM MovieBuffFrame, resd 1
NEWSYM CReadHead, resd 1
NEWSYM ReadHead, resd 1
NEWSYM CFWriteHead, resd 1
NEWSYM StoreBuffer, resb 128*32 NEWSYM StoreBuffer, resb 128*32
;******************************************************* ;*******************************************************
@@ -2887,7 +2881,7 @@ NEWSYM CheckROMType
mov dword[memtabler16+30h*4+ecx],DSP4Read16b mov dword[memtabler16+30h*4+ecx],DSP4Read16b
mov dword[memtablew16+30h*4+ecx],DSP4Write16b mov dword[memtablew16+30h*4+ecx],DSP4Write16b
add ecx,4 add ecx,4
cmp ecx,16*4 cmp ecx,1*4
jne .dsp4loop jne .dsp4loop
jmp .notDSP1Hi jmp .notDSP1Hi
.initdsp2 .initdsp2

15
zsnes/src/zmovie.c
View File

@@ -837,6 +837,17 @@ void zmv_replay_finished()
///////////////////////////////////////////////////////// /////////////////////////////////////////////////////////
/*
ZSNES movie related vars:
MovieProcessing
0 = nothing movie related in progress
1 = movie playback in progress
2 = movie recording in progress
*/
extern unsigned int MsgCount, MessageOn; extern unsigned int MsgCount, MessageOn;
extern unsigned char MovieTemp, txtmovieended[15], MovieProcessing, *Msgptr; extern unsigned char MovieTemp, txtmovieended[15], MovieProcessing, *Msgptr;
@@ -891,7 +902,7 @@ void Replay()
} }
} }
extern unsigned int MovieBuffFrame, MovieBuffSize; unsigned int MovieBuffFrame, MovieBuffSize;
unsigned char MovieBuffer[21*60]; unsigned char MovieBuffer[21*60];
void IncFrameWriteBuffer() void IncFrameWriteBuffer()
@@ -922,7 +933,7 @@ unsigned int bytemerger (unsigned char heaviest, unsigned char heavy, unsigned c
return ((heaviest << 24) | (heavy << 16) | (light << 8) | (lightest)); return ((heaviest << 24) | (heavy << 16) | (light << 8) | (lightest));
} }
extern unsigned int CReadHead, ReadHead, CFWriteStart, CFWriteHead; unsigned int CReadHead, ReadHead, CFWriteStart = 64+30, CFWriteHead;
extern unsigned char BackState, CNetType, StoreBuffer[128*32]; extern unsigned char BackState, CNetType, StoreBuffer[128*32];
void Record() void Record()

1
zsnes/src/zstate.c
View File

@@ -72,7 +72,6 @@ static void copy_extra_data(unsigned char **buffer, void (*copy_func)(unsigned c
copy_func(buffer, &HIRQCycNext, 5); copy_func(buffer, &HIRQCycNext, 5);
copy_func(buffer, &oamaddr, 14*4); copy_func(buffer, &oamaddr, 14*4);
copy_func(buffer, &prevoamptr, 1); copy_func(buffer, &prevoamptr, 1);
copy_func(buffer, &ReadHead, 1*4);
} }
static size_t load_save_size; static size_t load_save_size;