Move around files

Author: snesrev

Diff for: .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 for: 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 for: README.md

@@ -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 for: tables/.gitignore renamed to assets/.gitignore

@@ -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 for: tables/compile_music.py renamed to assets/compile_music.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 for: tables/compile_resources.py renamed to assets/compile_resources.py

@@ -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 for: tables/decode_music.py renamed to assets/decode_music.py

@@ -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 for: tables/extract_music.py renamed to assets/extract_music.py

@@ -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 for: tables/extract_resources.py renamed to assets/extract_resources.py

@@ -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 for: tables/palette_usage.bin renamed to assets/palette_usage.bin

@@ -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 for: tables/restool.py renamed to assets/restool.py

@@ -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
 /////////////////////////////////////////////////////////////////////////////