Merge pull request #202 from idlechild/master

Practice Hack 2.6.0 rollup

Author: idlechild

.gitignore

@@ -4,6 +4,7 @@
 *.sw[op]
 build/
 tools/*.exe
+tools/asar
 .vscode/launch.json
 .vscode/tasks.json
 /names/custom_names.txt

Dockerfile

@@ -18,6 +18,7 @@ RUN wget https://github.com/RPGHacker/asar/archive/v1.81.tar.gz \
  && cp asar/asar-standalone /app/tools/asar
 
 RUN mkdir -p /app/build \
+ && mkdir -p /app/enemies \
  && mkdir -p /app/layout \
  && mkdir -p /app/names \
  && mkdir -p /app/resources \
@@ -32,6 +33,8 @@ ARG now
 WORKDIR /app
 RUN rm -rf build
 RUN mkdir -p build
+RUN rm -rf enemies
+COPY enemies/ enemies/
 RUN rm -rf layout
 COPY layout/ layout/
 RUN rm -rf names

build.bat

@@ -3,6 +3,7 @@
 if not exist build mkdir build
 
 echo Building SM NTSC Practice Hack
+python enemies\create_clear_enemies_data.py ..\src\clearenemies.asm clear_enemies.txt
 python layout\create_layout.py portals.txt layoutmenutemplate.asm ..\src\layoutmenu.asm ..\src\layoutportaltables.asm
 python names\create_names.py ..\src\roomnames.asm default_names.txt custom_names.txt
 cd resources

build.sh

@@ -7,27 +7,31 @@ trap success=1 ERR
 mkdir -p build
 
 echo "Building SM NTSC Practice Hack"
+python3 enemies/create_clear_enemies_data.py ../src/clearenemies.asm clear_enemies.txt
 python3 layout/create_layout.py portals.txt layoutmenutemplate.asm ../src/layoutmenu.asm ../src/layoutportaltables.asm
 python3 names/create_names.py ../src/roomnames.asm default_names.txt custom_names.txt
 cd resources
 python3 create_ram_symbols.py ../src/defines.asm ../src/symbols.asm
 python3 create_dummies.py 00.sfc ff.sfc
 
 echo "Building saveless version"
+rm -f ../build/smhack20.ips
 cp *.sfc ../build
 ../tools/asar --no-title-check --symbols=wla --symbols-path=../build/symbols.sym -DFEATURE_SD2SNES=0 -DFEATURE_PAL=0 -DFEATURE_TINYSTATES=0 "$@" ../src/main.asm ../build/00.sfc
 ../tools/asar --no-title-check --symbols=wla --symbols-path=../build/symbols.sym -DFEATURE_SD2SNES=0 -DFEATURE_PAL=0 -DFEATURE_TINYSTATES=0 "$@" ../src/main.asm ../build/ff.sfc
 python3 sort_debug_symbols.py ../build/symbols.sym x x
 python3 create_ips.py ../build/00.sfc ../build/ff.sfc ../build/smhack20.ips
 
 echo "Building SD2SNES version"
+rm -f ../build/smhack20_sd2snes.ips
 cp *.sfc ../build
 ../tools/asar --no-title-check --symbols=wla --symbols-path=../build/symbols.sym -DFEATURE_SD2SNES=1 -DFEATURE_PAL=0 -DFEATURE_TINYSTATES=0 "$@" ../src/main.asm ../build/00.sfc
 ../tools/asar --no-title-check --symbols=wla --symbols-path=../build/symbols.sym -DFEATURE_SD2SNES=1 -DFEATURE_PAL=0 -DFEATURE_TINYSTATES=0 "$@" ../src/main.asm ../build/ff.sfc
 python3 sort_debug_symbols.py ../build/symbols.sym x x
 python3 create_ips.py ../build/00.sfc ../build/ff.sfc ../build/smhack20_sd2snes.ips
 
 echo "Building TinyStates version"
+rm -f ../build/smhack20_tinystates.ips
 cp *.sfc ../build
 ../tools/asar --no-title-check --symbols=wla --symbols-path=../build/symbols.sym -DFEATURE_SD2SNES=0 -DFEATURE_PAL=0 -DFEATURE_TINYSTATES=1 "$@" ../src/main.asm ../build/00.sfc
 ../tools/asar --no-title-check --symbols=wla --symbols-path=../build/symbols.sym -DFEATURE_SD2SNES=0 -DFEATURE_PAL=0 -DFEATURE_TINYSTATES=1 "$@" ../src/main.asm ../build/ff.sfc

build_PAL.bat

@@ -3,32 +3,42 @@
 if not exist build mkdir build
 
 echo Building SM PAL Practice Hack
+python enemies\create_clear_enemies_data.py ..\src\clearenemies.asm clear_enemies.txt
 python layout\create_layout.py portals.txt layoutmenutemplate.asm ..\src\layoutmenu.asm ..\src\layoutportaltables.asm
 python names\create_names.py ..\src\roomnames.asm default_names.txt custom_names.txt
 cd resources
 python create_ram_symbols.py ..\src\defines.asm ..\src\symbols.asm
 python create_dummies.py 00.sfc ff.sfc
 
 echo Building saveless version
+if exist ..\build\smpalhack20.ips del ..\build\smpalhack20.ips
 copy *.sfc ..\build
 ..\tools\asar --no-title-check --symbols=wla --symbols-path=..\build\symbols.sym -DFEATURE_SD2SNES=0 -DFEATURE_PAL=1 -DFEATURE_TINYSTATES=0 ..\src\main.asm ..\build\00.sfc
+if ERRORLEVEL 1 goto end_build_saveless
 ..\tools\asar --no-title-check --symbols=wla --symbols-path=..\build\symbols.sym -DFEATURE_SD2SNES=0 -DFEATURE_PAL=1 -DFEATURE_TINYSTATES=0 ..\src\main.asm ..\build\ff.sfc
 python sort_debug_symbols.py ..\build\symbols.sym x x
 python create_ips.py ..\build\00.sfc ..\build\ff.sfc ..\build\smpalhack20.ips
+:end_build_saveless
 
 echo Building SD2SNES version
+if exist ..\build\smpalhack20_sd2snes.ips del ..\build\smpalhack20_sd2snes.ips
 copy *.sfc ..\build
 ..\tools\asar --no-title-check --symbols=wla --symbols-path=..\build\symbols.sym -DFEATURE_SD2SNES=1 -DFEATURE_PAL=1 -DFEATURE_TINYSTATES=0 ..\src\main.asm ..\build\00.sfc
+if ERRORLEVEL 1 goto end_build_sd2snes
 ..\tools\asar --no-title-check --symbols=wla --symbols-path=..\build\symbols.sym -DFEATURE_SD2SNES=1 -DFEATURE_PAL=1 -DFEATURE_TINYSTATES=0 ..\src\main.asm ..\build\ff.sfc
 python sort_debug_symbols.py ..\build\symbols.sym x x
 python create_ips.py ..\build\00.sfc ..\build\ff.sfc ..\build\smpalhack20_sd2snes.ips
+:end_build_sd2snes
 
 echo Building TinyStates version
+if exist ..\build\smpalhack20_tinystates.ips del ..\build\smpalhack20_tinystates.ips
 copy *.sfc ..\build
 ..\tools\asar --no-title-check --symbols=wla --symbols-path=..\build\symbols.sym -DFEATURE_SD2SNES=0 -DFEATURE_PAL=1 -DFEATURE_TINYSTATES=1 ..\src\main.asm ..\build\00.sfc
+if ERRORLEVEL 1 goto end_build_tinystates
 ..\tools\asar --no-title-check --symbols=wla --symbols-path=..\build\symbols.sym -DFEATURE_SD2SNES=0 -DFEATURE_PAL=1 -DFEATURE_TINYSTATES=1 ..\src\main.asm ..\build\ff.sfc
 python sort_debug_symbols.py ..\build\symbols.sym x x
 python create_ips.py ..\build\00.sfc ..\build\ff.sfc ..\build\smpalhack20_tinystates.ips
+:end_build_tinystates
 
 del 00.sfc ff.sfc ..\build\00.sfc ..\build\ff.sfc ..\build\symbols.sym
 cd ..

build_PAL.sh

@@ -7,27 +7,31 @@ trap success=1 ERR
 mkdir -p build
 
 echo "Building SM PAL Practice Hack"
+python3 enemies/create_clear_enemies_data.py ../src/clearenemies.asm clear_enemies.txt
 python3 layout/create_layout.py portals.txt layoutmenutemplate.asm ../src/layoutmenu.asm ../src/layoutportaltables.asm
 python3 names/create_names.py ../src/roomnames.asm default_names.txt custom_names.txt
 cd resources
 python3 create_ram_symbols.py ../src/defines.asm ../src/symbols.asm
 python3 create_dummies.py 00.sfc ff.sfc
 
 echo "Building saveless version"
+rm -f ../build/smpalhack20.ips
 cp *.sfc ../build
 ../tools/asar --no-title-check --symbols=wla --symbols-path=../build/symbols.sym -DFEATURE_SD2SNES=0 -DFEATURE_PAL=1 -DFEATURE_TINYSTATES=0 "$@" ../src/main.asm ../build/00.sfc
 ../tools/asar --no-title-check --symbols=wla --symbols-path=../build/symbols.sym -DFEATURE_SD2SNES=0 -DFEATURE_PAL=1 -DFEATURE_TINYSTATES=0 "$@" ../src/main.asm ../build/ff.sfc
 python3 sort_debug_symbols.py ../build/symbols.sym x x
 python3 create_ips.py ../build/00.sfc ../build/ff.sfc ../build/smpalhack20.ips
 
 echo "Building SD2SNES version"
+rm -f ../build/smpalhack20_sd2snes.ips
 cp *.sfc ../build
 ../tools/asar --no-title-check --symbols=wla --symbols-path=../build/symbols.sym -DFEATURE_SD2SNES=1 -DFEATURE_PAL=1 -DFEATURE_TINYSTATES=0 "$@" ../src/main.asm ../build/00.sfc
 ../tools/asar --no-title-check --symbols=wla --symbols-path=../build/symbols.sym -DFEATURE_SD2SNES=1 -DFEATURE_PAL=1 -DFEATURE_TINYSTATES=0 "$@" ../src/main.asm ../build/ff.sfc
 python3 sort_debug_symbols.py ../build/symbols.sym x x
 python3 create_ips.py ../build/00.sfc ../build/ff.sfc ../build/smpalhack20_sd2snes.ips
 
 echo "Building TinyStates version"
+rm -f ../build/smpalhack20_tinystates.ips
 cp *.sfc ../build
 ../tools/asar --no-title-check --symbols=wla --symbols-path=../build/symbols.sym -DFEATURE_SD2SNES=0 -DFEATURE_PAL=1 -DFEATURE_TINYSTATES=1 "$@" ../src/main.asm ../build/00.sfc
 ../tools/asar --no-title-check --symbols=wla --symbols-path=../build/symbols.sym -DFEATURE_SD2SNES=0 -DFEATURE_PAL=1 -DFEATURE_TINYSTATES=1 "$@" ../src/main.asm ../build/ff.sfc

build_dev.bat

@@ -4,6 +4,7 @@ cls
 if not exist build mkdir build
 
 echo Building SM NTSC Dev Practice Hack
+python enemies\create_clear_enemies_data.py ..\src\clearenemies.asm clear_enemies.txt
 python layout\create_layout.py portals.txt layoutmenutemplate.asm ..\src\layoutmenu.asm ..\src\layoutportaltables.asm
 python names\create_names.py ..\src\roomnames.asm default_names.txt custom_names.txt
 cd resources

build_dev.sh

@@ -7,17 +7,24 @@ trap success=1 ERR
 mkdir -p build
 
 echo "Building SM NTSC Dev Practice Hack"
+python3 enemies/create_clear_enemies_data.py ../src/clearenemies.asm clear_enemies.txt
 python3 layout/create_layout.py portals.txt layoutmenutemplate.asm ../src/layoutmenu.asm ../src/layoutportaltables.asm
 python3 names/create_names.py ../src/roomnames.asm default_names.txt custom_names.txt
 cd resources
 python3 create_ram_symbols.py ../src/defines.asm ../src/symbols.asm
 python3 create_dummies.py 00.sfc ff.sfc
 
 echo "Building tinystates Dev version"
-PRERELEASE=$(git rev-parse --short HEAD)
+rm -f ../build/smhack20_tinystates_dev.ips
 cp *.sfc ../build
-../tools/asar --no-title-check --symbols=wla --symbols-path=../build/Debugging_Symbols.sym -DFEATURE_SD2SNES=0 -DFEATURE_DEV=1 -DFEATURE_PAL=0 -DFEATURE_TINYSTATES=1 -DPRERELEASE=$PRERELEASE "$@" ../src/main.asm ../build/00.sfc
-../tools/asar --no-title-check --symbols=wla --symbols-path=../build/Debugging_Symbols.sym -DFEATURE_SD2SNES=0 -DFEATURE_DEV=1 -DFEATURE_PAL=0 -DFEATURE_TINYSTATES=1 -DPRERELEASE=$PRERELEASE "$@" ../src/main.asm ../build/ff.sfc
+if git --version &>/dev/null; then
+   PRERELEASE=$(git rev-parse --short HEAD)
+   ../tools/asar --no-title-check --symbols=wla --symbols-path=../build/Debugging_Symbols.sym -DFEATURE_SD2SNES=0 -DFEATURE_DEV=1 -DFEATURE_PAL=0 -DFEATURE_TINYSTATES=1 -DPRERELEASE=$PRERELEASE "$@" ../src/main.asm ../build/00.sfc
+   ../tools/asar --no-title-check --symbols=wla --symbols-path=../build/Debugging_Symbols.sym -DFEATURE_SD2SNES=0 -DFEATURE_DEV=1 -DFEATURE_PAL=0 -DFEATURE_TINYSTATES=1 -DPRERELEASE=$PRERELEASE "$@" ../src/main.asm ../build/ff.sfc
+else
+   ../tools/asar --no-title-check --symbols=wla --symbols-path=../build/Debugging_Symbols.sym -DFEATURE_SD2SNES=0 -DFEATURE_DEV=1 -DFEATURE_PAL=0 -DFEATURE_TINYSTATES=1 "$@" ../src/main.asm ../build/00.sfc
+   ../tools/asar --no-title-check --symbols=wla --symbols-path=../build/Debugging_Symbols.sym -DFEATURE_SD2SNES=0 -DFEATURE_DEV=1 -DFEATURE_PAL=0 -DFEATURE_TINYSTATES=1 "$@" ../src/main.asm ../build/ff.sfc
+fi
 python3 sort_debug_symbols.py ../build/Debugging_Symbols.sym ../build/Debugging_Sorted.sym ../build/Debugging_Combined.sym
 python3 create_ips.py ../build/00.sfc ../build/ff.sfc ../build/smhack20_tinystates_dev.ips
 

build_docker.bat

@@ -1,4 +1,10 @@
 @echo off
 for /f "tokens=2-4 delims=/ " %%a in ('DATE /T') do (set mydate=%%c-%%a-%%b)
+if exist build\smhack20.ips del build\smhack20.ips
+if exist build\smhack20_sd2snes.ips del build\smhack20_sd2snes.ips
+if exist build\smhack20_tinystates.ips del build\smhack20_tinystates.ips
+if exist build\smhack20_tinystates_dev.ips del build\smhack20_tinystates_dev.ips
+if exist build\smpalhack20.ips del build\smpalhack20.ips
+if exist build\smpalhack20_sd2snes.ips del build\smpalhack20_sd2snes.ips
+if exist build\smpalhack20_tinystates.ips del build\smpalhack20_tinystates.ips
 docker build --tag sm_practice_hack --build-arg now="%mydate%_%TIME%" --output build .
-

build_docker.sh

@@ -1,4 +1,9 @@
 #!/bin/bash
-
+rm -f build/smhack20.ips
+rm -f build/smhack20_sd2snes.ips
+rm -f build/smhack20_tinystates.ips
+rm -f build/smhack20_tinystates_dev.ips
+rm -f build/smpalhack20.ips
+rm -f build/smpalhack20_sd2snes.ips
+rm -f build/smpalhack20_tinystates.ips
 docker build --tag sm_practice_hack --build-arg now="$(date +%s)" --output build .
-