ShuriZma
/
visualboyadvance-m
mirror of https://github.com/visualboyadvance-m/visualboyadvance-m.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Modified the includes so that files from the dmg folder don't include anything from the agb folder.

This commit is contained in:
bgk 2009-01-01 14:34:16 +00:00
parent 6c6e4a8b97
commit 56f42e81eb
4 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/dmg/gbGfx.cpp
View File

@ -1,6 +1,6 @@
#include <memory.h> #include <memory.h>
#include "../agb/GBA.h" #include "../Globals.h"
#include "gbGlobals.h" #include "gbGlobals.h"
#include "gbSGB.h" #include "gbSGB.h"
@ -565,11 +565,12 @@ void gbDrawSprites(bool draw)
{ {
for (int j = x-8; j<300; j++) for (int j = x-8; j<300; j++)
if (j>=0) if (j>=0)
{
if (gbSpeed) if (gbSpeed)
gbSpritesTicks[j] += 5; gbSpritesTicks[j] += 5;
else else
gbSpritesTicks[j] += 2+(count&1); gbSpritesTicks[j] += 2+(count&1);
}
} }
count++; count++;
} }

3
src/dmg/gbGlobals.cpp
View File

@ -1,4 +1,5 @@
#include "../agb/GBA.h" #include <cstdlib>
#include "../common/Types.h"
u8 *gbMemoryMap[16]; u8 *gbMemoryMap[16];

8
src/dmg/gbMemory.cpp
View File

@ -1,4 +1,4 @@
#include "../agb/GBA.h" #include "../System.h"
#include "../common/Port.h" #include "../common/Port.h"
#include "gbGlobals.h" #include "gbGlobals.h"
#include "gbMemory.h" #include "gbMemory.h"
@ -1322,8 +1322,8 @@ void mapperTAMA5RAM(u16 address, u8 value)
// Write Commands !!! // Write Commands !!!
if (gbDataTAMA5.mapperCommands[0x0f] && (gbDataTAMA5.mapperCommandNumber == 7)) if (gbDataTAMA5.mapperCommands[0x0f] && (gbDataTAMA5.mapperCommandNumber == 7))
{ {
int data = gbDataTAMA5.mapperCommands[0x04] & 0x0f | int data = (gbDataTAMA5.mapperCommands[0x04] & 0x0f) |
(gbDataTAMA5.mapperCommands[0x05] <<4); (gbDataTAMA5.mapperCommands[0x05] <<4);
// Not sure when the write command should reset... // Not sure when the write command should reset...
// but it doesn't seem to matter. // but it doesn't seem to matter.
@ -1456,7 +1456,7 @@ void mapperTAMA5RAM(u16 address, u8 value)
for (int i = 0; i<0x10; i++) for (int i = 0; i<0x10; i++)
for (int j = 0; j<0x10; j++) for (int j = 0; j<0x10; j++)
if (!(j&2)) if (!(j&2))
gbTAMA5ram[(i*0x10)+j | 2] = gbTAMA5ram[(i*0x10)+j]; gbTAMA5ram[((i*0x10)+j) | 2] = gbTAMA5ram[(i*0x10)+j];
// Enable this to see the content of the flashrom in 0xe000 // Enable this to see the content of the flashrom in 0xe000
/*for (int k = 0; k<0x100; k++) /*for (int k = 0; k<0x100; k++)
gbMemoryMap[0xe][k] = gbTAMA5ram[k];*/ gbMemoryMap[0xe][k] = gbTAMA5ram[k];*/

2
src/dmg/gbPrinter.cpp
View File

@ -1,6 +1,6 @@
#include <stdio.h> #include <stdio.h>
#include <memory.h> #include <memory.h>
#include "../agb/GBA.h" #include "../System.h"
u8 gbPrinterStatus = 0; u8 gbPrinterStatus = 0;
int gbPrinterState = 0; int gbPrinterState = 0;