mirror of
https://github.com/dborth/vbagx.git
synced 2025-02-16 18:59:12 +01:00
update includes to match new structure
This commit is contained in:
parent
19ecf65f28
commit
96c0a729bd
@ -18,7 +18,8 @@ include $(DEVKITPPC)/gamecube_rules
|
|||||||
TARGET := vbagx_gc
|
TARGET := vbagx_gc
|
||||||
TARGETDIR := executables
|
TARGETDIR := executables
|
||||||
BUILD := build_gc
|
BUILD := build_gc
|
||||||
SOURCES := source/vba source/vba/agb source/vba/dmg source/vba/dmg/gb_apu \
|
SOURCES := source/vba source/vba/apu source/vba/common \
|
||||||
|
source/vba/gb source/vba/gba \
|
||||||
source/ngc source/sz source/unzip
|
source/ngc source/sz source/unzip
|
||||||
INCLUDES := source/vba source/ngc source/unzip
|
INCLUDES := source/vba source/ngc source/unzip
|
||||||
|
|
||||||
@ -103,7 +104,6 @@ $(BUILD):
|
|||||||
@[ -d $@ ] || mkdir -p $@
|
@[ -d $@ ] || mkdir -p $@
|
||||||
@[ -d $(TARGETDIR) ] || mkdir -p $(TARGETDIR)
|
@[ -d $(TARGETDIR) ] || mkdir -p $(TARGETDIR)
|
||||||
@make --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile.gc
|
@make --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile.gc
|
||||||
@rm -fr $(OUTPUT).elf
|
|
||||||
|
|
||||||
#---------------------------------------------------------------------------------
|
#---------------------------------------------------------------------------------
|
||||||
clean:
|
clean:
|
||||||
|
@ -18,7 +18,8 @@ include $(DEVKITPPC)/wii_rules
|
|||||||
TARGET := vbagx_wii
|
TARGET := vbagx_wii
|
||||||
TARGETDIR := executables
|
TARGETDIR := executables
|
||||||
BUILD := build_wii
|
BUILD := build_wii
|
||||||
SOURCES := source/vba source/vba/agb source/vba/dmg source/vba/dmg/gb_apu \
|
SOURCES := source/vba source/vba/apu source/vba/common \
|
||||||
|
source/vba/gb source/vba/gba \
|
||||||
source/ngc source/sz source/unzip
|
source/ngc source/sz source/unzip
|
||||||
INCLUDES := source/vba source/ngc source/unzip
|
INCLUDES := source/vba source/ngc source/unzip
|
||||||
|
|
||||||
|
@ -30,15 +30,15 @@ extern "C" {
|
|||||||
#include "System.h"
|
#include "System.h"
|
||||||
#include "NLS.h"
|
#include "NLS.h"
|
||||||
#include "Util.h"
|
#include "Util.h"
|
||||||
#include "Flash.h"
|
#include "gba/Flash.h"
|
||||||
#include "agb/GBA.h"
|
#include "gba/GBA.h"
|
||||||
#include "Globals.h"
|
#include "gba/Globals.h"
|
||||||
#include "RTC.h"
|
#include "gba/RTC.h"
|
||||||
#include "Port.h"
|
#include "common/Port.h"
|
||||||
#include "unzip.h"
|
#include "unzip.h"
|
||||||
|
|
||||||
extern "C" {
|
extern "C" {
|
||||||
#include "memgzio.h"
|
#include "common/memgzio.h"
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifndef _MSC_VER
|
#ifndef _MSC_VER
|
||||||
|
@ -21,7 +21,7 @@
|
|||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <zlib.h>
|
#include <zlib.h>
|
||||||
|
|
||||||
#include "System.h"
|
#include "../System.h"
|
||||||
#include "memfile.h"
|
#include "memfile.h"
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -14,7 +14,8 @@
|
|||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdarg.h>
|
#include <stdarg.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
#include <string.h>
|
||||||
|
#include <errno.h>
|
||||||
#include "memgzio.h"
|
#include "memgzio.h"
|
||||||
|
|
||||||
/*struct internal_state {int dummy;};*/ /* for buggy compilers */
|
/*struct internal_state {int dummy;};*/ /* for buggy compilers */
|
||||||
@ -670,7 +671,7 @@ int flush;
|
|||||||
if (len == 0 && s->z_err == Z_BUF_ERROR) s->z_err = Z_OK;
|
if (len == 0 && s->z_err == Z_BUF_ERROR) s->z_err = Z_OK;
|
||||||
|
|
||||||
/* deflate has finished flushing only when it hasn't used up
|
/* deflate has finished flushing only when it hasn't used up
|
||||||
* all the available space in the output buffer:
|
* all the available space in the output buffer:
|
||||||
*/
|
*/
|
||||||
done = (s->stream.avail_out != 0 || s->z_err == Z_STREAM_END);
|
done = (s->stream.avail_out != 0 || s->z_err == Z_STREAM_END);
|
||||||
|
|
||||||
|
@ -11,9 +11,22 @@
|
|||||||
#ifndef HAVE_ZUTIL_H
|
#ifndef HAVE_ZUTIL_H
|
||||||
#include "../win32/include/zlib/zutil.h"
|
#include "../win32/include/zlib/zutil.h"
|
||||||
#else
|
#else
|
||||||
#include <zutil.h>
|
#include <zlib.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifndef local
|
||||||
|
# define local static
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if MAX_MEM_LEVEL >= 8
|
||||||
|
# define DEF_MEM_LEVEL 8
|
||||||
|
#else
|
||||||
|
# define DEF_MEM_LEVEL MAX_MEM_LEVEL
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#define OS_CODE 0x03 /* assume Unix */
|
||||||
|
#define zmemcpy memcpy
|
||||||
|
|
||||||
gzFile ZEXPORT memgzopen(char *memory, int, const char *);
|
gzFile ZEXPORT memgzopen(char *memory, int, const char *);
|
||||||
int ZEXPORT memgzread(gzFile, voidp, unsigned);
|
int ZEXPORT memgzread(gzFile, voidp, unsigned);
|
||||||
int ZEXPORT memgzwrite(gzFile, const voidp, unsigned);
|
int ZEXPORT memgzwrite(gzFile, const voidp, unsigned);
|
||||||
|
@ -18,7 +18,7 @@
|
|||||||
|
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
#include "../agb/GBA.h"
|
#include "../gba/GBA.h"
|
||||||
#include "gbGlobals.h"
|
#include "gbGlobals.h"
|
||||||
#include "gbSGB.h"
|
#include "gbSGB.h"
|
||||||
|
|
||||||
|
@ -16,7 +16,7 @@
|
|||||||
// along with this program; if not, write to the Free Software Foundation,
|
// along with this program; if not, write to the Free Software Foundation,
|
||||||
// Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
// Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||||
|
|
||||||
#include "../agb/GBA.h"
|
#include "../gba/GBA.h"
|
||||||
|
|
||||||
u8 *gbMemoryMap[16];
|
u8 *gbMemoryMap[16];
|
||||||
|
|
||||||
|
@ -16,8 +16,8 @@
|
|||||||
// along with this program; if not, write to the Free Software Foundation,
|
// along with this program; if not, write to the Free Software Foundation,
|
||||||
// Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
// Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||||
|
|
||||||
#include "../agb/GBA.h"
|
#include "../gba/GBA.h"
|
||||||
#include "../Port.h"
|
#include "../common/Port.h"
|
||||||
#include "gbGlobals.h"
|
#include "gbGlobals.h"
|
||||||
#include "gbMemory.h"
|
#include "gbMemory.h"
|
||||||
#include "gb.h"
|
#include "gb.h"
|
||||||
|
@ -18,7 +18,7 @@
|
|||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include "../agb/GBA.h"
|
#include "../gba/GBA.h"
|
||||||
|
|
||||||
u8 gbPrinterStatus = 0;
|
u8 gbPrinterStatus = 0;
|
||||||
int gbPrinterState = 0;
|
int gbPrinterState = 0;
|
||||||
|
@ -20,7 +20,7 @@
|
|||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
#include "../System.h"
|
#include "../System.h"
|
||||||
#include "../Port.h"
|
#include "../common/Port.h"
|
||||||
#include "../Util.h"
|
#include "../Util.h"
|
||||||
#include "gb.h"
|
#include "gb.h"
|
||||||
#include "gbGlobals.h"
|
#include "gbGlobals.h"
|
||||||
@ -236,7 +236,7 @@ void gbSgbDrawBorderTile(int x, int y, int tile, int attr)
|
|||||||
u8 d = *tileAddress2++;
|
u8 d = *tileAddress2++;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
u8 yyy;
|
u8 yyy;
|
||||||
if(!flipY)
|
if(!flipY)
|
||||||
yyy = yy;
|
yyy = yy;
|
||||||
|
@ -20,13 +20,13 @@
|
|||||||
|
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
#include "../Sound.h"
|
#include "../gba/Sound.h"
|
||||||
#include "../Util.h"
|
#include "../Util.h"
|
||||||
#include "gbGlobals.h"
|
#include "gbGlobals.h"
|
||||||
#include "gbSound.h"
|
#include "gbSound.h"
|
||||||
|
|
||||||
#include "gb_apu/Gb_Apu.h"
|
#include "../apu/Gb_Apu.h"
|
||||||
#include "gb_apu/Effects_Buffer.h"
|
#include "../apu/Effects_Buffer.h"
|
||||||
|
|
||||||
extern int gbHardware;
|
extern int gbHardware;
|
||||||
|
|
||||||
@ -132,7 +132,7 @@ void gbSoundTick()
|
|||||||
if ( memcmp( &gb_effects_config_current, &gb_effects_config,
|
if ( memcmp( &gb_effects_config_current, &gb_effects_config,
|
||||||
sizeof gb_effects_config ) || soundGetEnable() != prevSoundEnable )
|
sizeof gb_effects_config ) || soundGetEnable() != prevSoundEnable )
|
||||||
apply_effects();
|
apply_effects();
|
||||||
|
|
||||||
if ( soundVolume_ != soundGetVolume() )
|
if ( soundVolume_ != soundGetVolume() )
|
||||||
apply_volume();
|
apply_volume();
|
||||||
}
|
}
|
||||||
@ -147,7 +147,7 @@ static void reset_apu()
|
|||||||
mode = Gb_Apu::mode_agb;
|
mode = Gb_Apu::mode_agb;
|
||||||
gb_apu->reset( mode );
|
gb_apu->reset( mode );
|
||||||
gb_apu->reduce_clicks( declicking );
|
gb_apu->reduce_clicks( declicking );
|
||||||
|
|
||||||
if ( stereo_buffer )
|
if ( stereo_buffer )
|
||||||
stereo_buffer->clear();
|
stereo_buffer->clear();
|
||||||
|
|
||||||
@ -387,7 +387,7 @@ static void gbSoundReadGameOld(int version,gzFile gzFile)
|
|||||||
state.apu.regs [nr52] = 0x80; // power on
|
state.apu.regs [nr52] = 0x80; // power on
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Load state
|
// Load state
|
||||||
utilReadData( gzFile, gbsound_format );
|
utilReadData( gzFile, gbsound_format );
|
||||||
|
|
||||||
@ -420,7 +420,7 @@ static void gbSoundReadGameOld(int version,gzFile gzFile)
|
|||||||
static variable_desc gb_state [] =
|
static variable_desc gb_state [] =
|
||||||
{
|
{
|
||||||
LOAD( int, state.version ), // room_for_expansion will be used by later versions
|
LOAD( int, state.version ), // room_for_expansion will be used by later versions
|
||||||
|
|
||||||
// APU
|
// APU
|
||||||
LOAD( u8 [0x40], state.apu.regs ), // last values written to registers and wave RAM (both banks)
|
LOAD( u8 [0x40], state.apu.regs ), // last values written to registers and wave RAM (both banks)
|
||||||
LOAD( int, state.apu.frame_time ), // clocks until next frame sequencer action
|
LOAD( int, state.apu.frame_time ), // clocks until next frame sequencer action
|
||||||
@ -466,7 +466,7 @@ void gbSoundReadGame( int version, gzFile in )
|
|||||||
// Prepare APU and default state
|
// Prepare APU and default state
|
||||||
reset_apu();
|
reset_apu();
|
||||||
gb_apu->save_state( &state.apu );
|
gb_apu->save_state( &state.apu );
|
||||||
|
|
||||||
if ( version > 11 )
|
if ( version > 11 )
|
||||||
utilReadData( in, gb_state );
|
utilReadData( in, gb_state );
|
||||||
else
|
else
|
||||||
|
@ -20,12 +20,12 @@
|
|||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <ctype.h>
|
#include <ctype.h>
|
||||||
|
|
||||||
#include "agb/GBA.h"
|
#include "GBA.h"
|
||||||
#include "agb/GBAinline.h"
|
#include "GBAinline.h"
|
||||||
#include "Cheats.h"
|
#include "Cheats.h"
|
||||||
#include "Globals.h"
|
#include "Globals.h"
|
||||||
#include "NLS.h"
|
#include "../NLS.h"
|
||||||
#include "Util.h"
|
#include "../Util.h"
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Gameshark code types: (based on AR v1.0)
|
* Gameshark code types: (based on AR v1.0)
|
||||||
|
@ -17,9 +17,9 @@
|
|||||||
// Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
// Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||||
|
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include "agb/GBA.h"
|
#include "GBA.h"
|
||||||
#include "EEprom.h"
|
#include "EEprom.h"
|
||||||
#include "Util.h"
|
#include "../Util.h"
|
||||||
|
|
||||||
extern int cpuDmaCount;
|
extern int cpuDmaCount;
|
||||||
|
|
||||||
|
@ -18,11 +18,11 @@
|
|||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include "agb/GBA.h"
|
#include "GBA.h"
|
||||||
#include "Globals.h"
|
#include "Globals.h"
|
||||||
#include "Flash.h"
|
#include "Flash.h"
|
||||||
#include "Sram.h"
|
#include "Sram.h"
|
||||||
#include "Util.h"
|
#include "../Util.h"
|
||||||
|
|
||||||
#define FLASH_READ_ARRAY 0
|
#define FLASH_READ_ARRAY 0
|
||||||
#define FLASH_CMD_1 1
|
#define FLASH_CMD_1 1
|
||||||
|
@ -25,17 +25,17 @@
|
|||||||
#include "GBA.h"
|
#include "GBA.h"
|
||||||
#include "GBAcpu.h"
|
#include "GBAcpu.h"
|
||||||
#include "GBAinline.h"
|
#include "GBAinline.h"
|
||||||
#include "../Globals.h"
|
#include "Globals.h"
|
||||||
#include "../EEprom.h"
|
#include "EEprom.h"
|
||||||
#include "../Flash.h"
|
#include "Flash.h"
|
||||||
#include "../Sound.h"
|
#include "Sound.h"
|
||||||
#include "../Sram.h"
|
#include "Sram.h"
|
||||||
#include "../bios.h"
|
#include "bios.h"
|
||||||
#include "../Cheats.h"
|
#include "Cheats.h"
|
||||||
#include "../NLS.h"
|
#include "../NLS.h"
|
||||||
#include "../elf.h"
|
#include "elf.h"
|
||||||
#include "../Util.h"
|
#include "../Util.h"
|
||||||
#include "../Port.h"
|
#include "../common/Port.h"
|
||||||
#include "../System.h"
|
#include "../System.h"
|
||||||
#include "agbprint.h"
|
#include "agbprint.h"
|
||||||
#ifdef PROFILING
|
#ifdef PROFILING
|
||||||
|
@ -27,17 +27,17 @@
|
|||||||
#include "GBA.h"
|
#include "GBA.h"
|
||||||
#include "GBAcpu.h"
|
#include "GBAcpu.h"
|
||||||
#include "GBAinline.h"
|
#include "GBAinline.h"
|
||||||
#include "../Globals.h"
|
#include "Globals.h"
|
||||||
#include "../EEprom.h"
|
#include "EEprom.h"
|
||||||
#include "../Flash.h"
|
#include "Flash.h"
|
||||||
#include "../Sound.h"
|
#include "Sound.h"
|
||||||
#include "../Sram.h"
|
#include "Sram.h"
|
||||||
#include "../bios.h"
|
#include "bios.h"
|
||||||
#include "../Cheats.h"
|
#include "Cheats.h"
|
||||||
#include "../NLS.h"
|
#include "../NLS.h"
|
||||||
#include "../elf.h"
|
#include "elf.h"
|
||||||
#include "../Util.h"
|
#include "../Util.h"
|
||||||
#include "../Port.h"
|
#include "../common/Port.h"
|
||||||
#include "../System.h"
|
#include "../System.h"
|
||||||
#include "agbprint.h"
|
#include "agbprint.h"
|
||||||
#ifdef PROFILING
|
#ifdef PROFILING
|
||||||
|
@ -23,18 +23,18 @@
|
|||||||
#include "GBA.h"
|
#include "GBA.h"
|
||||||
#include "GBAcpu.h"
|
#include "GBAcpu.h"
|
||||||
#include "GBAinline.h"
|
#include "GBAinline.h"
|
||||||
#include "../Globals.h"
|
#include "Globals.h"
|
||||||
#include "GBAGfx.h"
|
#include "GBAGfx.h"
|
||||||
#include "../EEprom.h"
|
#include "EEprom.h"
|
||||||
#include "../Flash.h"
|
#include "Flash.h"
|
||||||
#include "../Sound.h"
|
#include "Sound.h"
|
||||||
#include "../Sram.h"
|
#include "Sram.h"
|
||||||
#include "../bios.h"
|
#include "bios.h"
|
||||||
#include "../Cheats.h"
|
#include "Cheats.h"
|
||||||
#include "../NLS.h"
|
#include "../NLS.h"
|
||||||
#include "../elf.h"
|
#include "elf.h"
|
||||||
#include "../Util.h"
|
#include "../Util.h"
|
||||||
#include "../Port.h"
|
#include "../common/Port.h"
|
||||||
#include "../System.h"
|
#include "../System.h"
|
||||||
#include "agbprint.h"
|
#include "agbprint.h"
|
||||||
#ifdef PROFILING
|
#ifdef PROFILING
|
||||||
|
@ -152,9 +152,9 @@ extern struct EmulatedSystem GBASystem;
|
|||||||
#define R14_FIQ 43
|
#define R14_FIQ 43
|
||||||
#define SPSR_FIQ 44
|
#define SPSR_FIQ 44
|
||||||
|
|
||||||
#include "../Cheats.h"
|
#include "Cheats.h"
|
||||||
#include "../Globals.h"
|
#include "Globals.h"
|
||||||
#include "../EEprom.h"
|
#include "EEprom.h"
|
||||||
#include "../Flash.h"
|
#include "Flash.h"
|
||||||
|
|
||||||
#endif //VBA_GBA_H
|
#endif //VBA_GBA_H
|
||||||
|
@ -22,9 +22,9 @@
|
|||||||
#define VBA_GFX_H
|
#define VBA_GFX_H
|
||||||
|
|
||||||
#include "GBA.h"
|
#include "GBA.h"
|
||||||
#include "../Globals.h"
|
#include "Globals.h"
|
||||||
|
|
||||||
#include "../Port.h"
|
#include "../common/Port.h"
|
||||||
|
|
||||||
//#define SPRITE_DEBUG
|
//#define SPRITE_DEBUG
|
||||||
|
|
||||||
|
@ -21,9 +21,9 @@
|
|||||||
#define VBA_GBAinline_H
|
#define VBA_GBAinline_H
|
||||||
|
|
||||||
#include "../System.h"
|
#include "../System.h"
|
||||||
#include "../Port.h"
|
#include "../common/Port.h"
|
||||||
#include "../RTC.h"
|
#include "RTC.h"
|
||||||
#include "../Sound.h"
|
#include "Sound.h"
|
||||||
#include "agbprint.h"
|
#include "agbprint.h"
|
||||||
#include "vmmem.h" // Nintendo GC Virtual Memory
|
#include "vmmem.h" // Nintendo GC Virtual Memory
|
||||||
|
|
||||||
|
@ -16,7 +16,7 @@
|
|||||||
// along with this program; if not, write to the Free Software Foundation,
|
// along with this program; if not, write to the Free Software Foundation,
|
||||||
// Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
// Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||||
|
|
||||||
#include "agb/GBA.h"
|
#include "GBA.h"
|
||||||
|
|
||||||
#ifdef BKPT_SUPPORT
|
#ifdef BKPT_SUPPORT
|
||||||
int oldreg[17];
|
int oldreg[17];
|
||||||
|
@ -20,7 +20,7 @@
|
|||||||
#ifndef VBA_GLOBALS_H
|
#ifndef VBA_GLOBALS_H
|
||||||
#define VBA_GLOBALS_H
|
#define VBA_GLOBALS_H
|
||||||
|
|
||||||
#include "agb/GBA.h"
|
#include "GBA.h"
|
||||||
|
|
||||||
#define VERBOSE_SWI 1
|
#define VERBOSE_SWI 1
|
||||||
#define VERBOSE_UNALIGNED_MEMORY 2
|
#define VERBOSE_UNALIGNED_MEMORY 2
|
||||||
|
@ -16,9 +16,9 @@
|
|||||||
// along with this program; if not, write to the Free Software Foundation,
|
// along with this program; if not, write to the Free Software Foundation,
|
||||||
// Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
// Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||||
|
|
||||||
#include "agb/GBA.h"
|
#include "GBA.h"
|
||||||
#include "Globals.h"
|
#include "Globals.h"
|
||||||
#include "agb/GBAGfx.h"
|
#include "GBAGfx.h"
|
||||||
|
|
||||||
void mode0RenderLine()
|
void mode0RenderLine()
|
||||||
{
|
{
|
||||||
|
@ -16,9 +16,9 @@
|
|||||||
// along with this program; if not, write to the Free Software Foundation,
|
// along with this program; if not, write to the Free Software Foundation,
|
||||||
// Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
// Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||||
|
|
||||||
#include "agb/GBA.h"
|
#include "GBA.h"
|
||||||
#include "Globals.h"
|
#include "Globals.h"
|
||||||
#include "agb/GBAGfx.h"
|
#include "GBAGfx.h"
|
||||||
|
|
||||||
void mode1RenderLine()
|
void mode1RenderLine()
|
||||||
{
|
{
|
||||||
|
@ -16,9 +16,9 @@
|
|||||||
// along with this program; if not, write to the Free Software Foundation,
|
// along with this program; if not, write to the Free Software Foundation,
|
||||||
// Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
// Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||||
|
|
||||||
#include "agb/GBA.h"
|
#include "GBA.h"
|
||||||
#include "Globals.h"
|
#include "Globals.h"
|
||||||
#include "agb/GBAGfx.h"
|
#include "GBAGfx.h"
|
||||||
|
|
||||||
void mode2RenderLine()
|
void mode2RenderLine()
|
||||||
{
|
{
|
||||||
|
@ -16,9 +16,9 @@
|
|||||||
// along with this program; if not, write to the Free Software Foundation,
|
// along with this program; if not, write to the Free Software Foundation,
|
||||||
// Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
// Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||||
|
|
||||||
#include "agb/GBA.h"
|
#include "GBA.h"
|
||||||
#include "Globals.h"
|
#include "Globals.h"
|
||||||
#include "agb/GBAGfx.h"
|
#include "GBAGfx.h"
|
||||||
|
|
||||||
void mode3RenderLine()
|
void mode3RenderLine()
|
||||||
{
|
{
|
||||||
|
@ -16,8 +16,8 @@
|
|||||||
// along with this program; if not, write to the Free Software Foundation,
|
// along with this program; if not, write to the Free Software Foundation,
|
||||||
// Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
// Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||||
|
|
||||||
#include "agb/GBA.h"
|
#include "GBA.h"
|
||||||
#include "agb/GBAGfx.h"
|
#include "GBAGfx.h"
|
||||||
#include "Globals.h"
|
#include "Globals.h"
|
||||||
|
|
||||||
void mode4RenderLine()
|
void mode4RenderLine()
|
||||||
|
@ -16,9 +16,9 @@
|
|||||||
// along with this program; if not, write to the Free Software Foundation,
|
// along with this program; if not, write to the Free Software Foundation,
|
||||||
// Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
// Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||||
|
|
||||||
#include "agb/GBA.h"
|
#include "GBA.h"
|
||||||
#include "Globals.h"
|
#include "Globals.h"
|
||||||
#include "agb/GBAGfx.h"
|
#include "GBAGfx.h"
|
||||||
|
|
||||||
void mode5RenderLine()
|
void mode5RenderLine()
|
||||||
{
|
{
|
||||||
|
@ -16,12 +16,12 @@
|
|||||||
// along with this program; if not, write to the Free Software Foundation,
|
// along with this program; if not, write to the Free Software Foundation,
|
||||||
// Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
// Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||||
|
|
||||||
#include "System.h"
|
#include "../System.h"
|
||||||
#include "agb/GBA.h"
|
#include "GBA.h"
|
||||||
#include "Globals.h"
|
#include "Globals.h"
|
||||||
#include "Port.h"
|
#include "../common/Port.h"
|
||||||
#include "Util.h"
|
#include "../Util.h"
|
||||||
#include "NLS.h"
|
#include "../NLS.h"
|
||||||
#include "vmmem.h"
|
#include "vmmem.h"
|
||||||
|
|
||||||
#include <time.h>
|
#include <time.h>
|
||||||
|
@ -23,13 +23,13 @@
|
|||||||
|
|
||||||
#include "Sound.h"
|
#include "Sound.h"
|
||||||
|
|
||||||
#include "agb/GBA.h"
|
#include "GBA.h"
|
||||||
#include "Globals.h"
|
#include "Globals.h"
|
||||||
#include "Util.h"
|
#include "../Util.h"
|
||||||
#include "Port.h"
|
#include "../common/Port.h"
|
||||||
|
|
||||||
#include "dmg/gb_apu/Gb_Apu.h"
|
#include "../apu/Gb_Apu.h"
|
||||||
#include "dmg/gb_apu/Multi_Buffer.h"
|
#include "../apu/Multi_Buffer.h"
|
||||||
|
|
||||||
#define NR10 0x60
|
#define NR10 0x60
|
||||||
#define NR11 0x62
|
#define NR11 0x62
|
||||||
|
@ -16,7 +16,7 @@
|
|||||||
// along with this program; if not, write to the Free Software Foundation,
|
// along with this program; if not, write to the Free Software Foundation,
|
||||||
// Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
// Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||||
|
|
||||||
#include "agb/GBA.h"
|
#include "GBA.h"
|
||||||
#include "Globals.h"
|
#include "Globals.h"
|
||||||
#include "Flash.h"
|
#include "Flash.h"
|
||||||
#include "Sram.h"
|
#include "Sram.h"
|
||||||
|
@ -21,8 +21,8 @@
|
|||||||
|
|
||||||
#include "GBA.h"
|
#include "GBA.h"
|
||||||
#include "Globals.h"
|
#include "Globals.h"
|
||||||
#include "Port.h"
|
#include "../common/Port.h"
|
||||||
#include "System.h"
|
#include "../System.h"
|
||||||
|
|
||||||
#define debuggerWriteHalfWord(addr, value) \
|
#define debuggerWriteHalfWord(addr, value) \
|
||||||
WRITE16LE((u16*)&map[(addr)>>24].address[(addr) & map[(addr)>>24].mask], (value))
|
WRITE16LE((u16*)&map[(addr)>>24].address[(addr) & map[(addr)>>24].mask], (value))
|
||||||
|
@ -21,9 +21,9 @@
|
|||||||
/************************************************************************/
|
/************************************************************************/
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
|
||||||
#include "System.h"
|
#include "../System.h"
|
||||||
#include "Port.h"
|
#include "../common/Port.h"
|
||||||
#include "agb/GBA.h"
|
#include "GBA.h"
|
||||||
#include "armdis.h"
|
#include "armdis.h"
|
||||||
#include "elf.h"
|
#include "elf.h"
|
||||||
|
|
||||||
|
@ -20,9 +20,9 @@
|
|||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
|
||||||
#include "agb/GBA.h"
|
#include "GBA.h"
|
||||||
#include "bios.h"
|
#include "bios.h"
|
||||||
#include "agb/GBAinline.h"
|
#include "GBAinline.h"
|
||||||
#include "Globals.h"
|
#include "Globals.h"
|
||||||
|
|
||||||
s16 sineTable[256] = {
|
s16 sineTable[256] = {
|
||||||
|
@ -20,10 +20,10 @@
|
|||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
#include "agb/GBA.h"
|
#include "GBA.h"
|
||||||
#include "Port.h"
|
#include "../common/Port.h"
|
||||||
#include "elf.h"
|
#include "elf.h"
|
||||||
#include "NLS.h"
|
#include "../NLS.h"
|
||||||
|
|
||||||
#define elfReadMemory(addr) \
|
#define elfReadMemory(addr) \
|
||||||
READ32LE((&map[(addr)>>24].address[(addr) & map[(addr)>>24].mask]))
|
READ32LE((&map[(addr)>>24].address[(addr) & map[(addr)>>24].mask]))
|
||||||
|
Loading…
x
Reference in New Issue
Block a user