aboutsummaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
authorspicyjpeg <88942473+spicyjpeg@users.noreply.github.com>2022-02-07 01:06:33 +0100
committerspicyjpeg <88942473+spicyjpeg@users.noreply.github.com>2022-02-07 02:35:02 +0100
commit40b7d95e9b16252d1aebb0706f3bba885f6e67cf (patch)
treeec7604008134f312c403f895661c4c4d6caa96b6 /examples
parent57cda18641d16ba4e4fec52b5514e48db8ee4593 (diff)
downloadpsn00bsdk-40b7d95e9b16252d1aebb0706f3bba885f6e67cf.tar.gz
Add LIBPSN00B_GENERATOR option, fix .incbin alignment
Diffstat (limited to 'examples')
-rw-r--r--examples/README.md4
-rw-r--r--examples/demos/n00bdemo/data.s.template8
-rw-r--r--examples/graphics/billboard/tim.s.template1
-rw-r--r--examples/graphics/render2tex/texture.s.template1
-rw-r--r--examples/graphics/rgb24/tim.s.template1
-rw-r--r--examples/graphics/tilesasm/data.s.template1
-rw-r--r--examples/system/childexec/child_exe.s.template1
7 files changed, 14 insertions, 3 deletions
diff --git a/examples/README.md b/examples/README.md
index 60ccd21..8b84e5e 100644
--- a/examples/README.md
+++ b/examples/README.md
@@ -76,7 +76,7 @@ are for rebuilding the examples *after* the SDK has been installed.
Add `-DPSN00BSDK_TARGET=mipsel-unknown-elf` to the first command if your
toolchain targets `mipsel-unknown-elf` rather than `mipsel-none-elf`. If you
can't get Ninja to work or don't have it installed, you can also replace
- `-G "Ninja"` with `-G "Unix Makefiles"` (`-G "MSYS Makefiles"` on Windows)
+ `-G "Ninja"` with `-G "Unix Makefiles"` (`-G "MinGW Makefiles"` on Windows)
to build using `make` instead.
This should create a `build` directory whose structure mirrors the one of
@@ -84,4 +84,4 @@ are for rebuilding the examples *after* the SDK has been installed.
CD images for each example.
-----------------------------------------
-_Last updated on 2022-01-21 by spicyjpeg_
+_Last updated on 2022-02-06 by spicyjpeg_
diff --git a/examples/demos/n00bdemo/data.s.template b/examples/demos/n00bdemo/data.s.template
index 9fbef2e..f659163 100644
--- a/examples/demos/n00bdemo/data.s.template
+++ b/examples/demos/n00bdemo/data.s.template
@@ -3,29 +3,35 @@
.global _lz_resources
.type _lz_resources, @object
_lz_resources:
+ .balign 4
.incbin "${PROJECT_BINARY_DIR}/data.lzp"
#.global smd_mtekdisk
#.type smd_mtekdisk, @object
#smd_mtekdisk:
+# .balign 4
# .incbin "data/mtekdisk.smd"
#.global smd_mtektext
#.type smd_mtektext, @object
#smd_mtektext:
+# .balign 4
# .incbin "data/mtektext.smd"
#.global smd_star
#.type smd_star, @object
#smd_star:
+# .balign 4
# .incbin "data/star.smd"
#.global smd_psn00b
#.type smd_psn00b, @object
#smd_psn00b:
+# .balign 4
# .incbin "data/psn00blogo.smd"
#.global smd_scarletlogo
#.type smd_scarletlogo, @object
#smd_scarletlogo:
-# .incbin "data/scarletlogo.smd" \ No newline at end of file
+# .balign 4
+# .incbin "data/scarletlogo.smd"
diff --git a/examples/graphics/billboard/tim.s.template b/examples/graphics/billboard/tim.s.template
index fbe7522..d9309bc 100644
--- a/examples/graphics/billboard/tim.s.template
+++ b/examples/graphics/billboard/tim.s.template
@@ -3,4 +3,5 @@
.global tim_image
.type tim_image, @object
tim_image:
+ .balign 4 # Required to correctly parse and load the image
.incbin "${PROJECT_SOURCE_DIR}/texture64.tim"
diff --git a/examples/graphics/render2tex/texture.s.template b/examples/graphics/render2tex/texture.s.template
index 8b09ad8..48248b2 100644
--- a/examples/graphics/render2tex/texture.s.template
+++ b/examples/graphics/render2tex/texture.s.template
@@ -5,4 +5,5 @@
.global tim_blendpattern
.type tim_blendpattern, @object
tim_blendpattern:
+ .balign 4 # Required to correctly parse and load the image
.incbin "${PROJECT_SOURCE_DIR}/blendpattern-16c.tim"
diff --git a/examples/graphics/rgb24/tim.s.template b/examples/graphics/rgb24/tim.s.template
index 9fb1fb6..205a081 100644
--- a/examples/graphics/rgb24/tim.s.template
+++ b/examples/graphics/rgb24/tim.s.template
@@ -3,4 +3,5 @@
.global tim_image
.type tim_image, @object
tim_image:
+ .balign 4 # Required to correctly parse and load the image
.incbin "${PROJECT_SOURCE_DIR}/bunpattern.tim"
diff --git a/examples/graphics/tilesasm/data.s.template b/examples/graphics/tilesasm/data.s.template
index 1c4b01e..bec0b84 100644
--- a/examples/graphics/tilesasm/data.s.template
+++ b/examples/graphics/tilesasm/data.s.template
@@ -31,4 +31,5 @@
# declared in the C code
#
tim_tileset:
+ .balign 4 # Required to correctly parse and load the image
.incbin "${PROJECT_SOURCE_DIR}/tiles_256.tim"
diff --git a/examples/system/childexec/child_exe.s.template b/examples/system/childexec/child_exe.s.template
index f76bb3d..31e7c49 100644
--- a/examples/system/childexec/child_exe.s.template
+++ b/examples/system/childexec/child_exe.s.template
@@ -3,4 +3,5 @@
.global child_exe # Insert spoopypasta
.type child_exe, @object
child_exe:
+ .balign 4
.incbin "${PROJECT_BINARY_DIR}/child.exe"