Move around files

This commit is contained in:
Snesrev
2023-08-17 02:56:21 +02:00
parent a23632ae6c
commit 43db8cc0f5
90 changed files with 369 additions and 337 deletions

16
.gitignore vendored
View File

@@ -7,24 +7,24 @@
*.aps
/obj/
/bin/
/tables/overworld/*.yaml
/tables/dungeon/*.yaml
/tables/img/
/tables/old/
/tables/zelda3.sfc
/tables/zelda3.smc
/assets/overworld/*.yaml
/assets/dungeon/*.yaml
/assets/img/
/assets/old/
/zelda3.sfc
/zelda3.smc
/saves/*.sav
/saves/sram.dat
/saves/sram.bak
/zelda3
__pycache__
/*.o
/src/*.o
/*.exe
/*.out
/snes/*.o
/msu/
/tmp/
/tables/zelda3_assets.dat
/zelda3_assets.dat
/SDL2.dll
/zelda3.*.ini
/zelda3.wiki

View File

@@ -1,9 +1,9 @@
TARGET_EXEC:=zelda3
ROM:=tables/zelda3.sfc
SRCS:=$(wildcard *.c snes/*.c) third_party/gl_core/gl_core_3_1.c third_party/opus-1.3.1-stripped/opus_decoder_amalgam.c
SRCS:=$(wildcard src/*.c snes/*.c) third_party/gl_core/gl_core_3_1.c third_party/opus-1.3.1-stripped/opus_decoder_amalgam.c
OBJS:=$(SRCS:%.c=%.o)
PYTHON:=/usr/bin/env python3
CFLAGS:=$(if $(CFLAGS),$(CFLAGS),-O2 -Werror)
CFLAGS:=$(if $(CFLAGS),$(CFLAGS),-O2 -Werror) -I .
CFLAGS:=${CFLAGS} $(shell sdl2-config --cflags) -DSYSTEM_VOLUME_MIXER_AVAILABLE=0
ifeq (${OS},Windows_NT)
@@ -16,23 +16,23 @@ endif
.PHONY: all clean clean_obj clean_gen
all: $(TARGET_EXEC) tables/zelda3_assets.dat
all: $(TARGET_EXEC) zelda3_assets.dat
$(TARGET_EXEC): $(OBJS) $(RES)
$(CC) $^ -o $@ $(LDFLAGS) $(SDLFLAGS)
%.o : %.c
$(CC) -c $(CFLAGS) $< -o $@
$(RES): platform/win32/zelda3.rc
$(RES): src/platform/win32/zelda3.rc
@echo "Generating Windows resources"
@$(WINDRES) $< -O coff -o $@
tables/zelda3_assets.dat:
zelda3_assets.dat:
@echo "Extracting game resources"
@cd tables; $(PYTHON) restool.py --extract-from-rom -r ../$(ROM)
$(PYTHON) assets/restool.py --extract-from-rom
clean: clean_obj clean_gen
clean_obj:
@$(RM) $(OBJS) $(TARGET_EXEC)
clean_gen:
@$(RM) $(RES) tables/zelda3_assets.dat tables/*.txt tables/*.png tables/sprites/*.png tables/*.yaml
@$(RM) $(RES) zelda3_assets.dat tables/zelda3_assets.dat tables/*.txt tables/*.png tables/sprites/*.png tables/*.yaml
@rm -rf tables/__pycache__ tables/dungeon tables/img tables/overworld tables/sound

View File

@@ -49,17 +49,15 @@ Visit Wiki for more info on building the project: https://github.com/snesrev/zel
## Compiling on Windows with TCC (1mb Tiny C Compiler)
1. Download the project by clicking "Code > Download ZIP" on the github page
2. Extract the ZIP to your hard drive
3. Place the USA rom named `zelda3.sfc` in the "\tables" subfolder
4. Open the command prompt and navigate to that folder
5. Type `python restool.py --extract-from-rom` and hit enter
6. Close the command prompt
7. Download [TCC](https://github.com/FitzRoyX/tinycc/releases/download/tcc_20221020/tcc_20221020.zip) and extract to the "\third_party" subfolder
8. Download [SDL2](https://github.com/libsdl-org/SDL/releases/download/release-2.26.3/SDL2-devel-2.26.3-VC.zip) and extract to the "\third_party" subfolder
9. Double-click `run_with_tcc.bat` in the main dir to create `zelda3.exe` in that same dir
10. Configure with `zelda3.ini` in the main dir
3. Place the USA rom named `zelda3.sfc` in the root directory.
4. Double-click `extract_assets.bat` in the main dir to create `zelda3_assets.dat` in that same dir
5. Download [TCC](https://github.com/FitzRoyX/tinycc/releases/download/tcc_20221020/tcc_20221020.zip) and extract to the "\third_party" subfolder
6. Download [SDL2](https://github.com/libsdl-org/SDL/releases/download/release-2.26.3/SDL2-devel-2.26.3-VC.zip) and extract to the "\third_party" subfolder
7. Double-click `run_with_tcc.bat` in the main dir to create `zelda3.exe` in that same dir
8. Configure with `zelda3.ini` in the main dir
## Compiling on Windows with Visual Studio (4.5gb IDE and compiler)
Same Steps 1-7 above<br/>
Same Steps 1-4 above<br/>
8. Double-click `Zelda3.sln`<br/>
9. Install the **Desktop development with C++** workload with the VS Installer if you don't have it already (it should prompt you to do this).<br/>
10. Change "debug" to "release" in the top dropdown<br/>
@@ -88,7 +86,7 @@ python3 -m pip install -r requirements.txt
* macOS: `brew install sdl2` (you can get homebrew [here](https://brew.sh/))
## Compiling on Linux/MacOS
1. Place your US ROM file named `zelda3.sfc` in `zelda3/tables`
1. Place your US ROM file named `zelda3.sfc` in `zelda3`
2. Compile
```sh
make
@@ -124,7 +122,7 @@ Look at the wiki at https://github.com/snesrev/zelda3/wiki for more help.
The ROM needs to be named `zelda3.sfc` and has to be from the US region with this exact SHA256 hash
`66871d66be19ad2c34c927d6b14cd8eb6fc3181965b6e517cb361f7316009cfb`
In case you're planning to move the executable to a different location, please include the file `tables/zelda3_assets.dat`.
In case you're planning to move the executable to a different location, please include the file `zelda3_assets.dat`.
## Usage and controls

View File

@@ -809,7 +809,7 @@ extern MemBlk FindInAssetArray(int asset, int idx);
file_data += b'\0'
file_data += v
open('zelda3_assets.dat', 'wb').write(file_data)
open('../zelda3_assets.dat', 'wb').write(file_data)
def main(args):
print_all(args)

View File

@@ -1,6 +1,10 @@
import argparse
import util
import sys
import os
os.chdir(os.path.dirname(__file__))
parser = argparse.ArgumentParser(description='Resource tool used to build zelda3_assets.dat', allow_abbrev=False)
parser.add_argument('-r', '--rom', nargs='?', metavar='ROM')

View File

@@ -10,7 +10,7 @@ def cache(user_function):
# Both are common SNES rom extensions. For Zelda3 (NA), they are equivalent files.
COMMON_ROM_NAMES = ['zelda3.sfc', 'zelda3.smc']
DEFAULT_ROM_DIRECTORY = os.path.dirname(__file__)
DEFAULT_ROM_DIRECTORY = os.path.join(os.path.dirname(__file__), '..')
ZELDA3_SHA1_US = '6D4F10A8B10E10DBE624CB23CF03B88BB8252973'
ZELDA3_SHA1 = {

25
extract_assets.bat Normal file
View File

@@ -0,0 +1,25 @@
@echo off
2>nul (del zelda3_assets.dat)
python assets/restool.py --extract-from-rom
IF NOT ERRORLEVEL 0 goto ERROR
IF NOT EXIST "zelda3_assets.dat" (
ECHO ERROR: The python program didn't generate zelda3_assets.dat successfully.
goto ERROR
) ELSE (
REM
)
goto DONE
:ERROR
ECHO:
ECHO ERROR: Asset extraction failed!
pause
EXIT /B 1
:DONE
echo Complete!
pause

View File

@@ -25,9 +25,9 @@ IF NOT EXIST "%SDL2%\lib\x64\SDL2.dll" (
REM
)
IF NOT EXIST "tables\zelda3_assets.dat" (
IF NOT EXIST "zelda3_assets.dat" (
ECHO:
ECHO ERROR: tables\zelda3_assets.dat was not found.
ECHO ERROR: zelda3_assets.dat was not found.
ECHO You need to extract assets from the ROM first, or get this file from a friend. Please see README.md
ECHO:
PAUSE
@@ -38,7 +38,7 @@ IF NOT EXIST "tables\zelda3_assets.dat" (
echo Building with TCC...
third_party\tcc\tcc.exe -ozelda3.exe -DCOMPILER_TCC=1 -DSTBI_NO_SIMD=1 -DHAVE_STDINT_H=1 -D_HAVE_STDINT_H=1 -DSYSTEM_VOLUME_MIXER_AVAILABLE=0 -I%SDL2%/include -L%SDL2%/lib/x64 -lSDL2 *.c snes/*.c third_party/gl_core/gl_core_3_1.c third_party/opus-1.3.1-stripped/opus_decoder_amalgam.c
third_party\tcc\tcc.exe -ozelda3.exe -DCOMPILER_TCC=1 -DSTBI_NO_SIMD=1 -DHAVE_STDINT_H=1 -D_HAVE_STDINT_H=1 -DSYSTEM_VOLUME_MIXER_AVAILABLE=0 -I%SDL2%/include -L%SDL2%/lib/x64 -lSDL2 -I. src/*.c snes/*.c third_party/gl_core/gl_core_3_1.c third_party/opus-1.3.1-stripped/opus_decoder_amalgam.c
IF ERRORLEVEL 1 goto GETOUT
copy %SDL2%\lib\x64\SDL2.dll .

View File

@@ -6,7 +6,7 @@
#include <stddef.h>
#include <assert.h>
#include "ppu.h"
#include "../types.h"
#include "src/types.h"
static const uint8 kSpriteSizes[8][2] = {
{8, 16}, {8, 32}, {8, 64}, {16, 32},

View File

@@ -7,10 +7,10 @@
#include <string.h>
#include <stdint.h>
#include <stdbool.h>
#include "saveload.h"
#include "snes/saveload.h"
typedef struct Ppu Ppu;
#include "../types.h"
#include "src/types.h"
typedef struct BgLayer {
uint16_t hScroll;

View File

View File

View File

@@ -810,9 +810,9 @@ uint32 g_asset_sizes[kNumberOfAssets];
static void LoadAssets() {
size_t length = 0;
uint8 *data = ReadWholeFile("tables/zelda3_assets.dat", &length);
uint8 *data = ReadWholeFile("zelda3_assets.dat", &length);
if (!data)
data = ReadWholeFile("zelda3_assets.dat", &length);
data = ReadWholeFile("tables/zelda3_assets.dat", &length);
if (!data) Die("Failed to read zelda3_assets.dat. Please see the README for information about how you get this file.");
static const char kAssetsSig[] = { kAssets_Sig };

View File

View File

View File

View File

View File

Before

Width:  |  Height:  |  Size: 33 KiB

After

Width:  |  Height:  |  Size: 33 KiB

View File

Before

Width:  |  Height:  |  Size: 228 KiB

After

Width:  |  Height:  |  Size: 228 KiB

View File

@@ -27,7 +27,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
1 TEXTINCLUDE
BEGIN
"platform\\win32\\resource.h\0"
"src\\platform\\win32\\resource.h\0"
END
2 TEXTINCLUDE
@@ -52,7 +52,7 @@ END
// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
IDI_ICON1 ICON "platform\\win32\\triforce.ico"
IDI_ICON1 ICON "src\\platform\\win32\\triforce.ico"
#endif // English (United States) resources
/////////////////////////////////////////////////////////////////////////////

View File

View File

View File

View File

View File

@@ -126,12 +126,14 @@
<LanguageStandard_C>stdc11</LanguageStandard_C>
<DisableSpecificWarnings>4244;4018;4996</DisableSpecificWarnings>
<TreatWarningAsError>true</TreatWarningAsError>
<AdditionalIncludeDirectories>$(SolutionDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<TargetMachine>MachineX86</TargetMachine>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalOptions>/PDBALTPATH:%_PDB% %(AdditionalOptions)</AdditionalOptions>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -143,6 +145,7 @@
<LanguageStandard_C>stdc11</LanguageStandard_C>
<DisableSpecificWarnings>4244;4018;4996</DisableSpecificWarnings>
<TreatWarningAsError>true</TreatWarningAsError>
<AdditionalIncludeDirectories>$(SolutionDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<TargetMachine>MachineX86</TargetMachine>
@@ -151,6 +154,7 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalOptions>/PDBALTPATH:%_PDB% %(AdditionalOptions)</AdditionalOptions>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDeploy|Win32'">
@@ -162,6 +166,7 @@
<LanguageStandard_C>stdc11</LanguageStandard_C>
<DisableSpecificWarnings>4244;4018;4996</DisableSpecificWarnings>
<TreatWarningAsError>true</TreatWarningAsError>
<AdditionalIncludeDirectories>$(SolutionDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<TargetMachine>MachineX86</TargetMachine>
@@ -171,6 +176,7 @@
<OptimizeReferences>true</OptimizeReferences>
<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile>
<AdditionalOptions>/PDBALTPATH:%_PDB% %(AdditionalOptions)</AdditionalOptions>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -181,9 +187,11 @@
<DisableSpecificWarnings>4244;4018;4996</DisableSpecificWarnings>
<TreatWarningAsError>true</TreatWarningAsError>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(SolutionDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalOptions>/PDBALTPATH:%_PDB% %(AdditionalOptions)</AdditionalOptions>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -193,9 +201,11 @@
<DisableSpecificWarnings>4244;4018;4996</DisableSpecificWarnings>
<TreatWarningAsError>true</TreatWarningAsError>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(SolutionDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalOptions>/PDBALTPATH:%_PDB% %(AdditionalOptions)</AdditionalOptions>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDeploy|x64'">
@@ -205,38 +215,36 @@
<DisableSpecificWarnings>4244;4018;4996</DisableSpecificWarnings>
<TreatWarningAsError>true</TreatWarningAsError>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(SolutionDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile>
<AdditionalOptions>/PDBALTPATH:%_PDB% %(AdditionalOptions)</AdditionalOptions>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="ancilla.c" />
<ClCompile Include="attract.c" />
<ClCompile Include="config.c" />
<ClCompile Include="dungeon.c" />
<ClCompile Include="ending.c" />
<ClCompile Include="glsl_shader.c" />
<ClCompile Include="hud.c" />
<ClCompile Include="load_gfx.c" />
<ClCompile Include="main.c">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Disabled</Optimization>
<Optimization Condition="'$(Configuration)|$(Platform)'=='ReleaseDeploy|x64'">Disabled</Optimization>
<InlineFunctionExpansion Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</InlineFunctionExpansion>
</ClCompile>
<ClCompile Include="messaging.c" />
<ClCompile Include="misc.c" />
<ClCompile Include="audio.c" />
<ClCompile Include="nmi.c" />
<ClCompile Include="overlord.c" />
<ClCompile Include="overworld.c" />
<ClCompile Include="platform\win32\volume_control.c" />
<ClCompile Include="player.c" />
<ClCompile Include="player_oam.c" />
<ClCompile Include="poly.c" />
<ClCompile Include="select_file.c" />
<ClCompile Include="opengl.c" />
<ClCompile Include="src\ancilla.c" />
<ClCompile Include="src\attract.c" />
<ClCompile Include="src\config.c" />
<ClCompile Include="src\dungeon.c" />
<ClCompile Include="src\ending.c" />
<ClCompile Include="src\glsl_shader.c" />
<ClCompile Include="src\hud.c" />
<ClCompile Include="src\load_gfx.c" />
<ClCompile Include="src\main.c" />
<ClCompile Include="src\messaging.c" />
<ClCompile Include="src\misc.c" />
<ClCompile Include="src\audio.c" />
<ClCompile Include="src\nmi.c" />
<ClCompile Include="src\overlord.c" />
<ClCompile Include="src\overworld.c" />
<ClCompile Include="src\platform\win32\volume_control.c" />
<ClCompile Include="src\player.c" />
<ClCompile Include="src\player_oam.c" />
<ClCompile Include="src\poly.c" />
<ClCompile Include="src\select_file.c" />
<ClCompile Include="src\opengl.c" />
<ClCompile Include="snes\apu.c">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
<InlineFunctionExpansion Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</InlineFunctionExpansion>
@@ -276,13 +284,10 @@
<InlineFunctionExpansion Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</InlineFunctionExpansion>
</ClCompile>
<ClCompile Include="snes\tracing.c" />
<ClCompile Include="spc_player.c" />
<ClCompile Include="sprite.c" />
<ClCompile Include="sprite_main.c">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
<Optimization Condition="'$(Configuration)|$(Platform)'=='ReleaseDeploy|x64'">MaxSpeed</Optimization>
</ClCompile>
<ClCompile Include="tagalong.c" />
<ClCompile Include="src\spc_player.c" />
<ClCompile Include="src\sprite.c" />
<ClCompile Include="src\sprite_main.c" />
<ClCompile Include="src\tagalong.c" />
<ClCompile Include="third_party\gl_core\gl_core_3_1.c" />
<ClCompile Include="third_party\opus-1.3.1-stripped\bands.c">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
@@ -429,34 +434,34 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseDeploy|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="tile_detect.c" />
<ClCompile Include="util.c" />
<ClCompile Include="zelda_cpu_infra.c" />
<ClCompile Include="zelda_rtl.c" />
<ClCompile Include="src\tile_detect.c" />
<ClCompile Include="src\util.c" />
<ClCompile Include="src\zelda_cpu_infra.c" />
<ClCompile Include="src\zelda_rtl.c" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="ancilla.h" />
<ClInclude Include="assets.h" />
<ClInclude Include="attract.h" />
<ClInclude Include="config.h" />
<ClInclude Include="dungeon.h" />
<ClInclude Include="ending.h" />
<ClInclude Include="features.h" />
<ClInclude Include="glsl_shader.h" />
<ClInclude Include="hud.h" />
<ClInclude Include="load_gfx.h" />
<ClInclude Include="messaging.h" />
<ClInclude Include="misc.h" />
<ClInclude Include="audio.h" />
<ClInclude Include="nmi.h" />
<ClInclude Include="overlord.h" />
<ClInclude Include="overworld.h" />
<ClInclude Include="platform\win32\volume_control.h" />
<ClInclude Include="player.h" />
<ClInclude Include="player_oam.h" />
<ClInclude Include="poly.h" />
<ClInclude Include="platform\win32\resource.h" />
<ClInclude Include="select_file.h" />
<ClInclude Include="src\ancilla.h" />
<ClInclude Include="src\assets.h" />
<ClInclude Include="src\attract.h" />
<ClInclude Include="src\config.h" />
<ClInclude Include="src\dungeon.h" />
<ClInclude Include="src\ending.h" />
<ClInclude Include="src\features.h" />
<ClInclude Include="src\glsl_shader.h" />
<ClInclude Include="src\hud.h" />
<ClInclude Include="src\load_gfx.h" />
<ClInclude Include="src\messaging.h" />
<ClInclude Include="src\misc.h" />
<ClInclude Include="src\audio.h" />
<ClInclude Include="src\nmi.h" />
<ClInclude Include="src\overlord.h" />
<ClInclude Include="src\overworld.h" />
<ClInclude Include="src\platform\win32\volume_control.h" />
<ClInclude Include="src\player.h" />
<ClInclude Include="src\player_oam.h" />
<ClInclude Include="src\poly.h" />
<ClInclude Include="src\platform\win32\resource.h" />
<ClInclude Include="src\select_file.h" />
<ClInclude Include="snes\apu.h" />
<ClInclude Include="snes\cart.h" />
<ClInclude Include="snes\cpu.h" />
@@ -470,10 +475,10 @@
<ClInclude Include="snes\snes_regs.h" />
<ClInclude Include="snes\spc.h" />
<ClInclude Include="snes\tracing.h" />
<ClInclude Include="spc_player.h" />
<ClInclude Include="sprite.h" />
<ClInclude Include="sprite_main.h" />
<ClInclude Include="tagalong.h" />
<ClInclude Include="src\spc_player.h" />
<ClInclude Include="src\sprite.h" />
<ClInclude Include="src\sprite_main.h" />
<ClInclude Include="src\tagalong.h" />
<ClInclude Include="third_party\gl_core\gl_core_3_1.h" />
<ClInclude Include="third_party\opus-1.3.1-stripped\arch.h">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
@@ -731,22 +736,22 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseDeploy|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClInclude>
<ClInclude Include="tile_detect.h" />
<ClInclude Include="types.h" />
<ClInclude Include="util.h" />
<ClInclude Include="variables.h" />
<ClInclude Include="zelda_cpu_infra.h" />
<ClInclude Include="zelda_rtl.h" />
<ClInclude Include="src\tile_detect.h" />
<ClInclude Include="src\types.h" />
<ClInclude Include="src\util.h" />
<ClInclude Include="src\variables.h" />
<ClInclude Include="src\zelda_cpu_infra.h" />
<ClInclude Include="src\zelda_rtl.h" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="platform\win32\zelda3.rc" />
<ResourceCompile Include="src\platform\win32\zelda3.rc" />
</ItemGroup>
<ItemGroup>
<Image Include="platform\win32\triforce.ico" />
<Image Include="platform\linux\triforce.png" />
<Image Include="src\platform\win32\triforce.ico" />
<Image Include="src\platform\linux\triforce.png" />
</ItemGroup>
<ItemGroup>
<Content Include="LICENSE.txt">

View File

@@ -31,132 +31,12 @@
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="snes\apu.c">
<Filter>Snes</Filter>
</ClCompile>
<ClCompile Include="snes\cart.c">
<Filter>Snes</Filter>
</ClCompile>
<ClCompile Include="snes\cpu.c">
<Filter>Snes</Filter>
</ClCompile>
<ClCompile Include="snes\dma.c">
<Filter>Snes</Filter>
</ClCompile>
<ClCompile Include="snes\dsp.c">
<Filter>Snes</Filter>
</ClCompile>
<ClCompile Include="snes\input.c">
<Filter>Snes</Filter>
</ClCompile>
<ClCompile Include="snes\ppu.c">
<Filter>Snes</Filter>
</ClCompile>
<ClCompile Include="snes\snes.c">
<Filter>Snes</Filter>
</ClCompile>
<ClCompile Include="snes\snes_other.c">
<Filter>Snes</Filter>
</ClCompile>
<ClCompile Include="snes\spc.c">
<Filter>Snes</Filter>
</ClCompile>
<ClCompile Include="zelda_rtl.c">
<Filter>Zelda</Filter>
</ClCompile>
<ClCompile Include="hud.c">
<Filter>Zelda</Filter>
</ClCompile>
<ClCompile Include="dungeon.c">
<Filter>Zelda</Filter>
</ClCompile>
<ClCompile Include="nmi.c">
<Filter>Zelda</Filter>
</ClCompile>
<ClCompile Include="player_oam.c">
<Filter>Zelda</Filter>
</ClCompile>
<ClCompile Include="load_gfx.c">
<Filter>Zelda</Filter>
</ClCompile>
<ClCompile Include="messaging.c">
<Filter>Zelda</Filter>
</ClCompile>
<ClCompile Include="overworld.c">
<Filter>Zelda</Filter>
</ClCompile>
<ClCompile Include="sprite.c">
<Filter>Zelda</Filter>
</ClCompile>
<ClCompile Include="sprite_main.c">
<Filter>Zelda</Filter>
</ClCompile>
<ClCompile Include="tagalong.c">
<Filter>Zelda</Filter>
</ClCompile>
<ClCompile Include="overlord.c">
<Filter>Zelda</Filter>
</ClCompile>
<ClCompile Include="poly.c">
<Filter>Zelda</Filter>
</ClCompile>
<ClCompile Include="ancilla.c">
<Filter>Zelda</Filter>
</ClCompile>
<ClCompile Include="ending.c">
<Filter>Zelda</Filter>
</ClCompile>
<ClCompile Include="attract.c">
<Filter>Zelda</Filter>
</ClCompile>
<ClCompile Include="select_file.c">
<Filter>Zelda</Filter>
</ClCompile>
<ClCompile Include="spc_player.c">
<Filter>Zelda</Filter>
</ClCompile>
<ClCompile Include="player.c">
<Filter>Zelda</Filter>
</ClCompile>
<ClCompile Include="tile_detect.c">
<Filter>Zelda</Filter>
</ClCompile>
<ClCompile Include="misc.c">
<Filter>Zelda</Filter>
</ClCompile>
<ClCompile Include="zelda_cpu_infra.c">
<Filter>Zelda</Filter>
</ClCompile>
<ClCompile Include="config.c">
<Filter>Zelda</Filter>
</ClCompile>
<ClCompile Include="platform\win32\volume_control.c">
<Filter>Platform</Filter>
</ClCompile>
<ClCompile Include="main.c">
<Filter>Zelda</Filter>
</ClCompile>
<ClCompile Include="snes\tracing.c">
<Filter>Snes</Filter>
</ClCompile>
<ClCompile Include="opengl.c">
<Filter>Zelda</Filter>
</ClCompile>
<ClCompile Include="glsl_shader.c">
<Filter>Zelda</Filter>
</ClCompile>
<ClCompile Include="util.c">
<Filter>Zelda</Filter>
</ClCompile>
<ClCompile Include="third_party\gl_core\gl_core_3_1.c">
<Filter>third_party</Filter>
</ClCompile>
<ClCompile Include="third_party\opus-1.3.1-stripped\opus_decoder_amalgam.c">
<Filter>third_party\Opus</Filter>
</ClCompile>
<ClCompile Include="audio.c">
<Filter>Zelda</Filter>
</ClCompile>
<ClCompile Include="third_party\opus-1.3.1-stripped\bands.c">
<Filter>third_party\Opus</Filter>
</ClCompile>
@@ -211,8 +91,39 @@
<ClCompile Include="third_party\opus-1.3.1-stripped\x86\x86cpu.c">
<Filter>third_party\Opus</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClCompile Include="snes\apu.c">
<Filter>Snes</Filter>
</ClCompile>
<ClCompile Include="snes\cart.c">
<Filter>Snes</Filter>
</ClCompile>
<ClCompile Include="snes\cpu.c">
<Filter>Snes</Filter>
</ClCompile>
<ClCompile Include="snes\dma.c">
<Filter>Snes</Filter>
</ClCompile>
<ClCompile Include="snes\dsp.c">
<Filter>Snes</Filter>
</ClCompile>
<ClCompile Include="snes\input.c">
<Filter>Snes</Filter>
</ClCompile>
<ClCompile Include="snes\ppu.c">
<Filter>Snes</Filter>
</ClCompile>
<ClCompile Include="snes\snes.c">
<Filter>Snes</Filter>
</ClCompile>
<ClCompile Include="snes\snes_other.c">
<Filter>Snes</Filter>
</ClCompile>
<ClCompile Include="snes\spc.c">
<Filter>Snes</Filter>
</ClCompile>
<ClCompile Include="snes\tracing.c">
<Filter>Snes</Filter>
</ClCompile>
<ClInclude Include="snes\apu.h">
<Filter>Snes</Filter>
</ClInclude>
@@ -243,114 +154,107 @@
<ClInclude Include="snes\spc.h">
<Filter>Snes</Filter>
</ClInclude>
<ClInclude Include="zelda_rtl.h">
<Filter>Zelda</Filter>
</ClInclude>
<ClInclude Include="hud.h">
<Filter>Zelda</Filter>
</ClInclude>
<ClInclude Include="dungeon.h">
<Filter>Zelda</Filter>
</ClInclude>
<ClInclude Include="nmi.h">
<Filter>Zelda</Filter>
</ClInclude>
<ClInclude Include="load_gfx.h">
<Filter>Zelda</Filter>
</ClInclude>
<ClInclude Include="overworld.h">
<Filter>Zelda</Filter>
</ClInclude>
<ClInclude Include="variables.h">
<Filter>Zelda</Filter>
</ClInclude>
<ClInclude Include="sprite.h">
<Filter>Zelda</Filter>
</ClInclude>
<ClInclude Include="tagalong.h">
<Filter>Zelda</Filter>
</ClInclude>
<ClInclude Include="overlord.h">
<Filter>Zelda</Filter>
</ClInclude>
<ClInclude Include="poly.h">
<Filter>Zelda</Filter>
</ClInclude>
<ClInclude Include="ancilla.h">
<Filter>Zelda</Filter>
</ClInclude>
<ClInclude Include="ending.h">
<Filter>Zelda</Filter>
</ClInclude>
<ClInclude Include="select_file.h">
<Filter>Zelda</Filter>
</ClInclude>
<ClInclude Include="tile_detect.h">
<Filter>Zelda</Filter>
</ClInclude>
<ClInclude Include="types.h">
<Filter>Zelda</Filter>
</ClInclude>
<ClInclude Include="player.h">
<Filter>Zelda</Filter>
</ClInclude>
<ClInclude Include="misc.h">
<Filter>Zelda</Filter>
</ClInclude>
<ClInclude Include="player_oam.h">
<Filter>Zelda</Filter>
</ClInclude>
<ClInclude Include="messaging.h">
<Filter>Zelda</Filter>
</ClInclude>
<ClInclude Include="attract.h">
<Filter>Zelda</Filter>
</ClInclude>
<ClInclude Include="zelda_cpu_infra.h">
<Filter>Zelda</Filter>
</ClInclude>
<ClInclude Include="spc_player.h">
<Filter>Zelda</Filter>
</ClInclude>
<ClInclude Include="sprite_main.h">
<Filter>Zelda</Filter>
</ClInclude>
<ClInclude Include="snes\dsp_regs.h">
<Filter>Snes</Filter>
</ClInclude>
<ClInclude Include="platform\win32\resource.h">
<Filter>Resource Files</Filter>
</ClInclude>
<ClInclude Include="config.h">
<Filter>Zelda</Filter>
</ClInclude>
<ClInclude Include="snes\snes_regs.h">
<Filter>Snes</Filter>
</ClInclude>
<ClInclude Include="platform\win32\volume_control.h">
<Filter>Platform</Filter>
</ClInclude>
<ClInclude Include="assets.h">
<Filter>Zelda</Filter>
</ClInclude>
<ClInclude Include="features.h">
<Filter>Zelda</Filter>
</ClInclude>
<ClInclude Include="snes\tracing.h">
<Filter>Snes</Filter>
</ClInclude>
<ClInclude Include="glsl_shader.h">
<ClCompile Include="src\ancilla.c">
<Filter>Zelda</Filter>
</ClInclude>
<ClInclude Include="util.h">
</ClCompile>
<ClCompile Include="src\dungeon.c">
<Filter>Zelda</Filter>
</ClInclude>
</ClCompile>
<ClCompile Include="src\ending.c">
<Filter>Zelda</Filter>
</ClCompile>
<ClCompile Include="src\glsl_shader.c">
<Filter>Zelda</Filter>
</ClCompile>
<ClCompile Include="src\hud.c">
<Filter>Zelda</Filter>
</ClCompile>
<ClCompile Include="src\load_gfx.c">
<Filter>Zelda</Filter>
</ClCompile>
<ClCompile Include="src\main.c">
<Filter>Zelda</Filter>
</ClCompile>
<ClCompile Include="src\messaging.c">
<Filter>Zelda</Filter>
</ClCompile>
<ClCompile Include="src\misc.c">
<Filter>Zelda</Filter>
</ClCompile>
<ClCompile Include="src\opengl.c">
<Filter>Zelda</Filter>
</ClCompile>
<ClCompile Include="src\nmi.c">
<Filter>Zelda</Filter>
</ClCompile>
<ClCompile Include="src\overworld.c">
<Filter>Zelda</Filter>
</ClCompile>
<ClCompile Include="src\overlord.c">
<Filter>Zelda</Filter>
</ClCompile>
<ClCompile Include="src\player.c">
<Filter>Zelda</Filter>
</ClCompile>
<ClCompile Include="src\player_oam.c">
<Filter>Zelda</Filter>
</ClCompile>
<ClCompile Include="src\poly.c">
<Filter>Zelda</Filter>
</ClCompile>
<ClCompile Include="src\select_file.c">
<Filter>Zelda</Filter>
</ClCompile>
<ClCompile Include="src\spc_player.c">
<Filter>Zelda</Filter>
</ClCompile>
<ClCompile Include="src\sprite.c">
<Filter>Zelda</Filter>
</ClCompile>
<ClCompile Include="src\sprite_main.c">
<Filter>Zelda</Filter>
</ClCompile>
<ClCompile Include="src\tagalong.c">
<Filter>Zelda</Filter>
</ClCompile>
<ClCompile Include="src\tile_detect.c">
<Filter>Zelda</Filter>
</ClCompile>
<ClCompile Include="src\util.c">
<Filter>Zelda</Filter>
</ClCompile>
<ClCompile Include="src\platform\win32\volume_control.c">
<Filter>Zelda</Filter>
</ClCompile>
<ClCompile Include="src\zelda_cpu_infra.c">
<Filter>Zelda</Filter>
</ClCompile>
<ClCompile Include="src\zelda_rtl.c">
<Filter>Zelda</Filter>
</ClCompile>
<ClCompile Include="src\attract.c">
<Filter>Zelda</Filter>
</ClCompile>
<ClCompile Include="src\audio.c">
<Filter>Zelda</Filter>
</ClCompile>
<ClCompile Include="src\config.c">
<Filter>Zelda</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="third_party\gl_core\gl_core_3_1.h">
<Filter>third_party</Filter>
</ClInclude>
<ClInclude Include="audio.h">
<Filter>Zelda</Filter>
</ClInclude>
<ClInclude Include="third_party\opus-1.3.1-stripped\_kiss_fft_guts.h">
<Filter>third_party\Opus</Filter>
</ClInclude>
@@ -447,23 +351,111 @@
<ClInclude Include="third_party\opus-1.3.1-stripped\x86\x86cpu.h">
<Filter>third_party\Opus</Filter>
</ClInclude>
<ClInclude Include="src\ancilla.h">
<Filter>Zelda</Filter>
</ClInclude>
<ClInclude Include="src\assets.h">
<Filter>Zelda</Filter>
</ClInclude>
<ClInclude Include="src\attract.h">
<Filter>Zelda</Filter>
</ClInclude>
<ClInclude Include="src\audio.h">
<Filter>Zelda</Filter>
</ClInclude>
<ClInclude Include="src\config.h">
<Filter>Zelda</Filter>
</ClInclude>
<ClInclude Include="src\dungeon.h">
<Filter>Zelda</Filter>
</ClInclude>
<ClInclude Include="src\ending.h">
<Filter>Zelda</Filter>
</ClInclude>
<ClInclude Include="src\features.h">
<Filter>Zelda</Filter>
</ClInclude>
<ClInclude Include="src\glsl_shader.h">
<Filter>Zelda</Filter>
</ClInclude>
<ClInclude Include="src\hud.h">
<Filter>Zelda</Filter>
</ClInclude>
<ClInclude Include="src\load_gfx.h">
<Filter>Zelda</Filter>
</ClInclude>
<ClInclude Include="src\messaging.h">
<Filter>Zelda</Filter>
</ClInclude>
<ClInclude Include="src\misc.h">
<Filter>Zelda</Filter>
</ClInclude>
<ClInclude Include="src\nmi.h">
<Filter>Zelda</Filter>
</ClInclude>
<ClInclude Include="src\overlord.h">
<Filter>Zelda</Filter>
</ClInclude>
<ClInclude Include="src\overworld.h">
<Filter>Zelda</Filter>
</ClInclude>
<ClInclude Include="src\player.h">
<Filter>Zelda</Filter>
</ClInclude>
<ClInclude Include="src\player_oam.h">
<Filter>Zelda</Filter>
</ClInclude>
<ClInclude Include="src\poly.h">
<Filter>Zelda</Filter>
</ClInclude>
<ClInclude Include="src\platform\win32\resource.h">
<Filter>Zelda</Filter>
</ClInclude>
<ClInclude Include="src\select_file.h">
<Filter>Zelda</Filter>
</ClInclude>
<ClInclude Include="src\spc_player.h">
<Filter>Zelda</Filter>
</ClInclude>
<ClInclude Include="src\sprite.h">
<Filter>Zelda</Filter>
</ClInclude>
<ClInclude Include="src\sprite_main.h">
<Filter>Zelda</Filter>
</ClInclude>
<ClInclude Include="src\tagalong.h">
<Filter>Zelda</Filter>
</ClInclude>
<ClInclude Include="src\tile_detect.h">
<Filter>Zelda</Filter>
</ClInclude>
<ClInclude Include="src\types.h">
<Filter>Zelda</Filter>
</ClInclude>
<ClInclude Include="src\util.h">
<Filter>Zelda</Filter>
</ClInclude>
<ClInclude Include="src\variables.h">
<Filter>Zelda</Filter>
</ClInclude>
<ClInclude Include="src\platform\win32\volume_control.h">
<Filter>Zelda</Filter>
</ClInclude>
<ClInclude Include="src\zelda_cpu_infra.h">
<Filter>Zelda</Filter>
</ClInclude>
<ClInclude Include="src\zelda_rtl.h">
<Filter>Zelda</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<Image Include="platform\win32\triforce.ico">
<Filter>Resource Files</Filter>
<Image Include="src\platform\win32\triforce.ico">
<Filter>Zelda</Filter>
</Image>
<Image Include="platform\linux\triforce.png">
<Filter>Resource Files</Filter>
<Image Include="src\platform\linux\triforce.png">
<Filter>Zelda</Filter>
</Image>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="platform\win32\zelda3.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
</ItemGroup>
<ItemGroup>
<Text Include="LICENSE.txt">
<Filter>Deploy</Filter>
@@ -481,6 +473,9 @@
<None Include="tables\zelda3_assets.dat">
<Filter>Deploy\tables</Filter>
</None>
<None Include="packages.config">
<Filter>Zelda</Filter>
</None>
</ItemGroup>
<ItemGroup>
<None Include="saves\ref\Chapter 1 - Zelda's Rescue.sav">
@@ -523,4 +518,9 @@
<Filter>Deploy\saverefs</Filter>
</None>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="src\platform\win32\zelda3.rc">
<Filter>Zelda</Filter>
</ResourceCompile>
</ItemGroup>
</Project>