From 1503d3eefa0b51164371c60c2aae8ad057678319 Mon Sep 17 00:00:00 2001 From: KiritoDev <36680385+KiritoDv@users.noreply.github.com> Date: Mon, 21 Mar 2022 15:43:22 -0600 Subject: Game Enhancements (#52) * [WIP] Texture replacements * Moved texture load to an otr file * Implemented gDPFillWideRectangle and added black bars to prerendered rooms * Added audio sliders, texture load barebones, settings cleanup and input display * Added functionality to gyro sensitivity and rumble strength * Fixed volume sliders * Added task to copy custom assets --- .gitignore | 7 +++---- assets/ship_of_harkinian/buttons/ABtn.png | Bin 0 -> 10967 bytes assets/ship_of_harkinian/buttons/BBtn.png | Bin 0 -> 1300 bytes assets/ship_of_harkinian/buttons/CDown.png | Bin 0 -> 11241 bytes assets/ship_of_harkinian/buttons/CLeft.png | Bin 0 -> 11232 bytes assets/ship_of_harkinian/buttons/CRight.png | Bin 0 -> 11284 bytes assets/ship_of_harkinian/buttons/CUp.png | Bin 0 -> 11219 bytes assets/ship_of_harkinian/buttons/LBtn.png | Bin 0 -> 355 bytes assets/ship_of_harkinian/buttons/RBtn.png | Bin 0 -> 379 bytes assets/ship_of_harkinian/buttons/StartBtn.png | Bin 0 -> 11868 bytes assets/ship_of_harkinian/buttons/ZBtn.png | Bin 0 -> 1241 bytes assets/ship_of_harkinian/icons/gSohIcon.png | Bin 0 -> 2355 bytes extract_assets.py | 4 +++- 13 files changed, 6 insertions(+), 5 deletions(-) create mode 100644 assets/ship_of_harkinian/buttons/ABtn.png create mode 100644 assets/ship_of_harkinian/buttons/BBtn.png create mode 100644 assets/ship_of_harkinian/buttons/CDown.png create mode 100644 assets/ship_of_harkinian/buttons/CLeft.png create mode 100644 assets/ship_of_harkinian/buttons/CRight.png create mode 100644 assets/ship_of_harkinian/buttons/CUp.png create mode 100644 assets/ship_of_harkinian/buttons/LBtn.png create mode 100644 assets/ship_of_harkinian/buttons/RBtn.png create mode 100644 assets/ship_of_harkinian/buttons/StartBtn.png create mode 100644 assets/ship_of_harkinian/buttons/ZBtn.png create mode 100644 assets/ship_of_harkinian/icons/gSohIcon.png diff --git a/.gitignore b/.gitignore index bacbc9e..2372a0c 100644 --- a/.gitignore +++ b/.gitignore @@ -222,7 +222,7 @@ ClientBin/ *.publishsettings orleans.codegen.cs -# Including strong name files can present a security risk +# Including strong name files can present a security risk # (https://github.com/github/gitignore/pull/2483#issue-259490424) #*.snk @@ -318,7 +318,7 @@ __pycache__/ # OpenCover UI analysis results OpenCover/ -# Azure Stream Analytics local run output +# Azure Stream Analytics local run output ASALocalRun/ # MSBuild Binary and Structured Log @@ -327,7 +327,7 @@ ASALocalRun/ # NVidia Nsight GPU debugger configuration file *.nvuser -# MFractors (Xamarin productivity tool) working folder +# MFractors (Xamarin productivity tool) working folder .mfractor/ *.out @@ -340,7 +340,6 @@ ZAPDUtils/ZAPDUtils.a build/ ZAPDUtils/build/ ZAPD/BuildInfo.h -assets/ baserom/ *.vtx.inc *.otr diff --git a/assets/ship_of_harkinian/buttons/ABtn.png b/assets/ship_of_harkinian/buttons/ABtn.png new file mode 100644 index 0000000..c1b0657 Binary files /dev/null and b/assets/ship_of_harkinian/buttons/ABtn.png differ diff --git a/assets/ship_of_harkinian/buttons/BBtn.png b/assets/ship_of_harkinian/buttons/BBtn.png new file mode 100644 index 0000000..99b1197 Binary files /dev/null and b/assets/ship_of_harkinian/buttons/BBtn.png differ diff --git a/assets/ship_of_harkinian/buttons/CDown.png b/assets/ship_of_harkinian/buttons/CDown.png new file mode 100644 index 0000000..741188e Binary files /dev/null and b/assets/ship_of_harkinian/buttons/CDown.png differ diff --git a/assets/ship_of_harkinian/buttons/CLeft.png b/assets/ship_of_harkinian/buttons/CLeft.png new file mode 100644 index 0000000..5e26a20 Binary files /dev/null and b/assets/ship_of_harkinian/buttons/CLeft.png differ diff --git a/assets/ship_of_harkinian/buttons/CRight.png b/assets/ship_of_harkinian/buttons/CRight.png new file mode 100644 index 0000000..9e61806 Binary files /dev/null and b/assets/ship_of_harkinian/buttons/CRight.png differ diff --git a/assets/ship_of_harkinian/buttons/CUp.png b/assets/ship_of_harkinian/buttons/CUp.png new file mode 100644 index 0000000..6c0e29d Binary files /dev/null and b/assets/ship_of_harkinian/buttons/CUp.png differ diff --git a/assets/ship_of_harkinian/buttons/LBtn.png b/assets/ship_of_harkinian/buttons/LBtn.png new file mode 100644 index 0000000..2e0a8f0 Binary files /dev/null and b/assets/ship_of_harkinian/buttons/LBtn.png differ diff --git a/assets/ship_of_harkinian/buttons/RBtn.png b/assets/ship_of_harkinian/buttons/RBtn.png new file mode 100644 index 0000000..c255643 Binary files /dev/null and b/assets/ship_of_harkinian/buttons/RBtn.png differ diff --git a/assets/ship_of_harkinian/buttons/StartBtn.png b/assets/ship_of_harkinian/buttons/StartBtn.png new file mode 100644 index 0000000..c3e08dc Binary files /dev/null and b/assets/ship_of_harkinian/buttons/StartBtn.png differ diff --git a/assets/ship_of_harkinian/buttons/ZBtn.png b/assets/ship_of_harkinian/buttons/ZBtn.png new file mode 100644 index 0000000..def8d9a Binary files /dev/null and b/assets/ship_of_harkinian/buttons/ZBtn.png differ diff --git a/assets/ship_of_harkinian/icons/gSohIcon.png b/assets/ship_of_harkinian/icons/gSohIcon.png new file mode 100644 index 0000000..614de2b Binary files /dev/null and b/assets/ship_of_harkinian/icons/gSohIcon.png differ diff --git a/extract_assets.py b/extract_assets.py index 7d3ed9d..404b49c 100755 --- a/extract_assets.py +++ b/extract_assets.py @@ -14,6 +14,8 @@ def BuildOTR(): shutil.copyfile("baserom/Audioseq", "Extract/Audioseq") shutil.copyfile("baserom/Audiotable", "Extract/Audiotable") + shutil.copytree("assets", "Extract/assets") + execStr = "x64\\Release\\ZAPD.exe" if sys.platform == "win32" else "../ZAPD/ZAPD.out" execStr += " botr -se OTR" @@ -109,7 +111,7 @@ def main(): BuildOTR() - # shutil.rmtree("Extract") + shutil.rmtree("Extract") if __name__ == "__main__": main() \ No newline at end of file -- cgit v1.2.3