Move around files

snesrev · Aug 17, 2023 · 43db8cc · 43db8cc
1 parent a23632a
commit 43db8cc
Show file tree

Hide file tree

Showing 90 changed files with 351 additions and 319 deletions.
diff --git a/.gitignore b/.gitignore
@@ -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

diff --git a/Makefile b/Makefile
@@ -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
diff --git a/README.md b/README.md
@@ -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
 

diff --git a/tables/.gitignore → assets/.gitignore b/tables/.gitignore → assets/.gitignore
diff --git a/tables/compile_music.py → assets/compile_music.py b/tables/compile_music.py → assets/compile_music.py
diff --git a/tables/compile_resources.py → assets/compile_resources.py b/tables/compile_resources.py → assets/compile_resources.py
@@ -809,7 +809,7 @@ def write_assets_to_file(print_header = False):
       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)

diff --git a/tables/decode_music.py → assets/decode_music.py b/tables/decode_music.py → assets/decode_music.py
diff --git a/tables/extract_music.py → assets/extract_music.py b/tables/extract_music.py → assets/extract_music.py
diff --git a/tables/extract_resources.py → assets/extract_resources.py b/tables/extract_resources.py → assets/extract_resources.py
diff --git a/tables/palette_usage.bin → assets/palette_usage.bin b/tables/palette_usage.bin → assets/palette_usage.bin
diff --git a/tables/restool.py → assets/restool.py b/tables/restool.py → assets/restool.py
@@ -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')

diff --git a/tables/sprite_sheet_info.py → assets/sprite_sheet_info.py b/tables/sprite_sheet_info.py → assets/sprite_sheet_info.py
diff --git a/tables/sprite_sheets.py → assets/sprite_sheets.py b/tables/sprite_sheets.py → assets/sprite_sheets.py
diff --git a/tables/sprites/.gitignore → assets/sprites/.gitignore b/tables/sprites/.gitignore → assets/sprites/.gitignore
diff --git a/tables/tables.py → assets/tables.py b/tables/tables.py → assets/tables.py
diff --git a/tables/text_compression.py → assets/text_compression.py b/tables/text_compression.py → assets/text_compression.py
diff --git a/tables/util.py → assets/util.py b/tables/util.py → assets/util.py
@@ -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 = {

diff --git a/extract_assets.bat b/extract_assets.bat
@@ -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
diff --git a/run_with_tcc.bat b/run_with_tcc.bat
@@ -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 .

diff --git a/snes/ppu.c b/snes/ppu.c
@@ -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},

diff --git a/snes/ppu.h b/snes/ppu.h
@@ -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;

diff --git a/ancilla.c → src/ancilla.c b/ancilla.c → src/ancilla.c
diff --git a/ancilla.h → src/ancilla.h b/ancilla.h → src/ancilla.h
diff --git a/assets.h → src/assets.h b/assets.h → src/assets.h
diff --git a/attract.c → src/attract.c b/attract.c → src/attract.c
diff --git a/attract.h → src/attract.h b/attract.h → src/attract.h
diff --git a/audio.c → src/audio.c b/audio.c → src/audio.c
diff --git a/audio.h → src/audio.h b/audio.h → src/audio.h
diff --git a/config.c → src/config.c b/config.c → src/config.c
diff --git a/config.h → src/config.h b/config.h → src/config.h
diff --git a/dungeon.c → src/dungeon.c b/dungeon.c → src/dungeon.c
diff --git a/dungeon.h → src/dungeon.h b/dungeon.h → src/dungeon.h
diff --git a/ending.c → src/ending.c b/ending.c → src/ending.c
diff --git a/ending.h → src/ending.h b/ending.h → src/ending.h
diff --git a/features.h → src/features.h b/features.h → src/features.h
diff --git a/glsl_shader.c → src/glsl_shader.c b/glsl_shader.c → src/glsl_shader.c
diff --git a/glsl_shader.h → src/glsl_shader.h b/glsl_shader.h → src/glsl_shader.h
diff --git a/hud.c → src/hud.c b/hud.c → src/hud.c
diff --git a/hud.h → src/hud.h b/hud.h → src/hud.h
diff --git a/load_gfx.c → src/load_gfx.c b/load_gfx.c → src/load_gfx.c
diff --git a/load_gfx.h → src/load_gfx.h b/load_gfx.h → src/load_gfx.h
diff --git a/main.c → src/main.c b/main.c → src/main.c
@@ -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 };

diff --git a/messaging.c → src/messaging.c b/messaging.c → src/messaging.c
diff --git a/messaging.h → src/messaging.h b/messaging.h → src/messaging.h
diff --git a/misc.c → src/misc.c b/misc.c → src/misc.c
diff --git a/misc.h → src/misc.h b/misc.h → src/misc.h
diff --git a/nmi.c → src/nmi.c b/nmi.c → src/nmi.c
diff --git a/nmi.h → src/nmi.h b/nmi.h → src/nmi.h
diff --git a/opengl.c → src/opengl.c b/opengl.c → src/opengl.c
diff --git a/overlord.c → src/overlord.c b/overlord.c → src/overlord.c
diff --git a/overlord.h → src/overlord.h b/overlord.h → src/overlord.h
diff --git a/overworld.c → src/overworld.c b/overworld.c → src/overworld.c
diff --git a/overworld.h → src/overworld.h b/overworld.h → src/overworld.h
diff --git a/platform/switch/.gitignore → src/platform/switch/.gitignore b/platform/switch/.gitignore → src/platform/switch/.gitignore
diff --git a/platform/switch/Makefile → src/platform/switch/Makefile b/platform/switch/Makefile → src/platform/switch/Makefile
diff --git a/platform/switch/icon.jpg → src/platform/switch/icon.jpg b/platform/switch/icon.jpg → src/platform/switch/icon.jpg
diff --git a/platform/switch/zelda3.ini → src/platform/switch/zelda3.ini b/platform/switch/zelda3.ini → src/platform/switch/zelda3.ini
diff --git a/platform/win32/resource.h → src/platform/win32/resource.h b/platform/win32/resource.h → src/platform/win32/resource.h
diff --git a/platform/win32/triforce.ico → src/platform/win32/triforce.ico b/platform/win32/triforce.ico → src/platform/win32/triforce.ico
diff --git a/platform/win32/volume_control.c → src/platform/win32/volume_control.c b/platform/win32/volume_control.c → src/platform/win32/volume_control.c
diff --git a/platform/win32/volume_control.h → src/platform/win32/volume_control.h b/platform/win32/volume_control.h → src/platform/win32/volume_control.h
diff --git a/platform/win32/zelda3.rc → src/platform/win32/zelda3.rc b/platform/win32/zelda3.rc → src/platform/win32/zelda3.rc
@@ -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
 /////////////////////////////////////////////////////////////////////////////

diff --git a/player.c → src/player.c b/player.c → src/player.c
diff --git a/player.h → src/player.h b/player.h → src/player.h
diff --git a/player_oam.c → src/player_oam.c b/player_oam.c → src/player_oam.c
diff --git a/player_oam.h → src/player_oam.h b/player_oam.h → src/player_oam.h
diff --git a/poly.c → src/poly.c b/poly.c → src/poly.c
diff --git a/poly.h → src/poly.h b/poly.h → src/poly.h
diff --git a/select_file.c → src/select_file.c b/select_file.c → src/select_file.c
diff --git a/select_file.h → src/select_file.h b/select_file.h → src/select_file.h
diff --git a/spc_player.c → src/spc_player.c b/spc_player.c → src/spc_player.c
diff --git a/spc_player.h → src/spc_player.h b/spc_player.h → src/spc_player.h
diff --git a/sprite.c → src/sprite.c b/sprite.c → src/sprite.c
diff --git a/sprite.h → src/sprite.h b/sprite.h → src/sprite.h
diff --git a/sprite_main.c → src/sprite_main.c b/sprite_main.c → src/sprite_main.c
diff --git a/sprite_main.h → src/sprite_main.h b/sprite_main.h → src/sprite_main.h
diff --git a/tagalong.c → src/tagalong.c b/tagalong.c → src/tagalong.c
diff --git a/tagalong.h → src/tagalong.h b/tagalong.h → src/tagalong.h
diff --git a/tile_detect.c → src/tile_detect.c b/tile_detect.c → src/tile_detect.c
diff --git a/tile_detect.h → src/tile_detect.h b/tile_detect.h → src/tile_detect.h
diff --git a/types.h → src/types.h b/types.h → src/types.h
diff --git a/util.c → src/util.c b/util.c → src/util.c
diff --git a/util.h → src/util.h b/util.h → src/util.h
diff --git a/variables.h → src/variables.h b/variables.h → src/variables.h
diff --git a/zelda_cpu_infra.c → src/zelda_cpu_infra.c b/zelda_cpu_infra.c → src/zelda_cpu_infra.c
diff --git a/zelda_cpu_infra.h → src/zelda_cpu_infra.h b/zelda_cpu_infra.h → src/zelda_cpu_infra.h
diff --git a/zelda_rtl.c → src/zelda_rtl.c b/zelda_rtl.c → src/zelda_rtl.c
diff --git a/zelda_rtl.h → src/zelda_rtl.h b/zelda_rtl.h → src/zelda_rtl.h