aboutsummaryrefslogtreecommitdiff
path: root/source/memmap.c
diff options
context:
space:
mode:
authoraliaspider2014-11-02 07:52:33 +0100
committeraliaspider2014-11-02 07:52:33 +0100
commit79a0fe978c6eece18d2e05320d6c86de584dbb48 (patch)
treea766b67e5ba37cd8bca19d15b3021af5cde2026a /source/memmap.c
parentd2c9eb147defae3d98df43730372dfce4a224cde (diff)
downloadsnes9x2005-79a0fe978c6eece18d2e05320d6c86de584dbb48.tar.gz
snes9x2005-79a0fe978c6eece18d2e05320d6c86de584dbb48.tar.bz2
snes9x2005-79a0fe978c6eece18d2e05320d6c86de584dbb48.zip
cleanups.
Diffstat (limited to 'source/memmap.c')
-rw-r--r--source/memmap.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/source/memmap.c b/source/memmap.c
index c058002..13fcd9c 100644
--- a/source/memmap.c
+++ b/source/memmap.c
@@ -406,10 +406,10 @@ char* Safe(const char* s)
}
/**********************************************************************************************/
-/* Init() */
+/* S9xInitMemory() */
/* This function allocates and zeroes all the memory needed by the emulator */
/**********************************************************************************************/
-bool8 Init()
+bool8 S9xInitMemory()
{
// DS2 DMA notes: These would do well to be allocated with 32 extra bytes
// so they can be 32-byte aligned. [Neb]
@@ -448,7 +448,7 @@ bool8 Init()
!IPPU.TileCache [TILE_8BIT] || !IPPU.TileCached [TILE_2BIT] ||
!IPPU.TileCached [TILE_4BIT] || !IPPU.TileCached [TILE_8BIT])
{
- Deinit();
+ S9xDeinitMemory();
return (FALSE);
}
@@ -485,7 +485,7 @@ bool8 Init()
return (TRUE);
}
-void Deinit()
+void S9xDeinitMemory()
{
#ifdef __W32_HEAP
if (_HEAPOK != _heapchk())
@@ -910,7 +910,7 @@ again:
FreeSDD1Data();
InitROM(Tales);
- S9xLoadCheatFile(S9xGetFilename(".cht"));
+ S9xLoadCheatFile(S9xGetFilename("cht"));
S9xInitCheatData();
S9xApplyCheats();
@@ -4146,7 +4146,7 @@ void CheckForIPSPatch(const char* rom_filename, bool8 header,
if (!(patch_file = fopen(fname, "rb")))
{
- if (!(patch_file = fopen(S9xGetFilename(".ips"), "rb")))
+ if (!(patch_file = fopen(S9xGetFilename("ips"), "rb")))
return;
}