summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKiritoDev <36680385+KiritoDv@users.noreply.github.com>2022-03-21 15:43:22 -0600
committerM4xw <m4x@m4xw.net>2022-03-22 02:38:26 +0100
commit1503d3eefa0b51164371c60c2aae8ad057678319 (patch)
treee6cb048c98e3b86882dd1c2969a7fd16944296fd
parent64bcf7bb10e590fa3f65033c5f0fe16059433714 (diff)
Game Enhancements (#52)old_master
* [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
-rw-r--r--.gitignore7
-rw-r--r--assets/ship_of_harkinian/buttons/ABtn.pngbin0 -> 10967 bytes
-rw-r--r--assets/ship_of_harkinian/buttons/BBtn.pngbin0 -> 1300 bytes
-rw-r--r--assets/ship_of_harkinian/buttons/CDown.pngbin0 -> 11241 bytes
-rw-r--r--assets/ship_of_harkinian/buttons/CLeft.pngbin0 -> 11232 bytes
-rw-r--r--assets/ship_of_harkinian/buttons/CRight.pngbin0 -> 11284 bytes
-rw-r--r--assets/ship_of_harkinian/buttons/CUp.pngbin0 -> 11219 bytes
-rw-r--r--assets/ship_of_harkinian/buttons/LBtn.pngbin0 -> 355 bytes
-rw-r--r--assets/ship_of_harkinian/buttons/RBtn.pngbin0 -> 379 bytes
-rw-r--r--assets/ship_of_harkinian/buttons/StartBtn.pngbin0 -> 11868 bytes
-rw-r--r--assets/ship_of_harkinian/buttons/ZBtn.pngbin0 -> 1241 bytes
-rw-r--r--assets/ship_of_harkinian/icons/gSohIcon.pngbin0 -> 2355 bytes
-rwxr-xr-xextract_assets.py4
13 files changed, 6 insertions, 5 deletions
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
--- /dev/null
+++ b/assets/ship_of_harkinian/buttons/ABtn.png
Binary files 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
--- /dev/null
+++ b/assets/ship_of_harkinian/buttons/BBtn.png
Binary files 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
--- /dev/null
+++ b/assets/ship_of_harkinian/buttons/CDown.png
Binary files 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
--- /dev/null
+++ b/assets/ship_of_harkinian/buttons/CLeft.png
Binary files 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
--- /dev/null
+++ b/assets/ship_of_harkinian/buttons/CRight.png
Binary files 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
--- /dev/null
+++ b/assets/ship_of_harkinian/buttons/CUp.png
Binary files 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
--- /dev/null
+++ b/assets/ship_of_harkinian/buttons/LBtn.png
Binary files 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
--- /dev/null
+++ b/assets/ship_of_harkinian/buttons/RBtn.png
Binary files 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
--- /dev/null
+++ b/assets/ship_of_harkinian/buttons/StartBtn.png
Binary files 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
--- /dev/null
+++ b/assets/ship_of_harkinian/buttons/ZBtn.png
Binary files 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
--- /dev/null
+++ b/assets/ship_of_harkinian/icons/gSohIcon.png
Binary files 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