Commit graph

477 commits

Author SHA1 Message Date
Corwin 32eee32fb1
make teleporter_2 better 2023-08-29 22:58:59 +01:00
Gwilym Inzani 3c08880b5d add a slime + teleport level 2023-08-29 22:57:09 +01:00
Corwin 45059029fa
another teleporter level 2023-08-29 22:56:05 +01:00
Gwilym Inzani be316a305b BAD CORWIN! 2023-08-29 22:35:41 +01:00
Corwin b78f7345b9
replace existing animation for pushed entity 2023-08-29 22:32:03 +01:00
Corwin f3d0757fa3
squid hero phasing 2023-08-29 22:28:00 +01:00
Corwin 36e912bcb0
nothing should get killed from overlapping the hero 2023-08-29 22:28:00 +01:00
Gwilym Inzani 7af1b01006 Add a level where a squid teleports 2023-08-29 22:26:47 +01:00
Gwilym Inzani a8e8f30f91 Remove invalid solution for glove_key 2023-08-29 22:26:19 +01:00
Corwin 7d907d014f
the check should be for one entity 2023-08-29 22:03:42 +01:00
Corwin b7c10742af
add teleporter to build.rs 2023-08-29 21:58:02 +01:00
Corwin da89a8a6cb
add teleporter shadow 2023-08-29 21:53:10 +01:00
Gwilym Inzani 8cb4f0c40f Make the reason the solution works not the wall 2023-08-29 21:47:40 +01:00
Gwilym Inzani 657637aa8e Make just rocks more interesting 2023-08-29 21:47:40 +01:00
Corwin 712301bd2e
teleporter level 2023-08-29 21:45:11 +01:00
Corwin 8b8f94ae7f
teleporters 2023-08-29 21:45:11 +01:00
Gwilym Inzani 2ce7d91c74 Add a level with just rocks 2023-08-29 21:43:37 +01:00
Gwilym Inzani 86607eeab0 Glove and key 2023-08-29 21:33:21 +01:00
Corwin df2f45797b
only hero and squid can pick up items 2023-08-29 21:31:36 +01:00
Corwin 07c5afb990
add teleporter entity type 2023-08-29 21:24:30 +01:00
Gwilym Inzani a7cbb60b20 Add a squid rock level 2023-08-29 21:13:57 +01:00
Corwin 98c96080f9
environment variable to run specific level 2023-08-29 21:11:58 +01:00
Corwin 56f1b68055
allow with justification 2023-08-29 21:01:35 +01:00
Corwin 078f4f22a9
make obtuse return values understandable 2023-08-29 20:59:03 +01:00
Gwilym Inzani 15d075a1c8 Maybe we'll have this many levels one day 2023-08-29 20:56:29 +01:00
Gwilym Inzani fef393c39c We can now make a lot more levels 2023-08-29 20:54:31 +01:00
Gwilym Inzani f72ff39867 Make the spikes more obvious 2023-08-29 20:52:09 +01:00
Corwin 346f62f328
resolve overlaps after all moves 2023-08-29 20:52:07 +01:00
Gwilym Inzani d781a41357 Add teleporter 2023-08-29 20:38:02 +01:00
Corwin b5da20d748
blocks can't intersect heros or enemies 2023-08-29 20:11:55 +01:00
Gwilym Inzani 6422ed63f1 Give purple night the deduplication treatment 2023-08-29 16:33:11 +01:00
Gwilym Inzani 54237c0fce Remove trailing whitespace 2023-08-29 16:28:57 +01:00
Gwilym Inzani 345a27a7d9 Remove useless cast 2023-08-29 16:25:16 +01:00
Gwilym Inzani 3eb7aabe37 Add dungeon puzzler to combo 2023-08-29 16:17:14 +01:00
Gwilym Inzani a865240308 Start fixing 256 colours 2023-08-29 16:07:50 +01:00
Gwilym Inzani c25cd74f43 Correctly use deduplication for combo rom 2023-08-29 15:20:41 +01:00
Gwilym Inzani c9bf56755a Also deduplicate for the dungeon puzzler 2023-08-29 15:17:50 +01:00
Gwilym Inzani a73e817f02 Deduplicate everything in hatwiz 2023-08-29 15:05:57 +01:00
Gwilym Inzani 201a127673 Use deduplicated tiles for hatwiz splash screens 2023-08-29 14:55:23 +01:00
Gwilym Inzani b39f99990c Use deduplication in hyperspace roll 2023-08-29 14:52:20 +01:00
Gwilym Inzani 8158bc1ff3 Allow deduplicating background tiles 2023-08-29 13:16:57 +01:00
Gwilym Inzani afed1542fe Move the new sprites to the correct place 2023-08-29 09:50:00 +01:00
Corwin b275db90da
make correct solution more obvious 2023-08-28 23:05:35 +01:00
Corwin 31c5519bc8
base update order on initial positions 2023-08-28 15:59:20 +01:00
Corwin 2a02da1c2f
simplify entity update loop 2023-08-28 14:00:39 +01:00
Corwin 0b45c006c8
ice on bottom 2023-08-28 11:45:29 +01:00
Corwin 4bd175cd7b
defined update order 2023-08-28 11:45:21 +01:00
Corwin dacecef900
fix bug where the ice is the one to get moved 2023-08-28 11:38:04 +01:00
Corwin ae0b86c7b9
fix lints 2023-08-28 11:36:22 +01:00
Corwin 5846a1c024
fix wonky ice animation next to wall 2023-08-28 11:34:08 +01:00
Gwilym Inzani 04ee5646ef
Add some new sprites for Corwin 2023-08-28 11:06:59 +01:00
Corwin 248cdae7a3
change squid change direction behaviour 2023-08-27 20:34:20 +01:00
Corwin 36603d5446
add block 2023-08-27 19:49:37 +01:00
Corwin a0ab3e9fb4
add ice level 2023-08-27 18:31:30 +01:00
Corwin e33eee7d11
fix mistakes copy over 2023-08-27 17:27:43 +01:00
Corwin b9e6e09fe1
add ice 2023-08-27 16:47:00 +01:00
GBA bot c29ba6e9ec Update lockfiles 2023-08-13 10:36:46 +00:00
Gwilym Inzani 6607ea3f1f Update lockfiles 2023-08-06 21:06:12 +01:00
Gwilym Inzani 43d7350c2f Remove some of the volume slides 2023-08-04 21:30:09 +01:00
Gwilym Inzani 0a851e296a Some music updates 2023-08-04 21:24:45 +01:00
Gwilym Inzani 6731fa88a0 I prefer this a bit slower 2023-08-02 17:18:27 +01:00
Gwilym Inzani 4b145d3194 Try composing my own theme (with some bug fixes) 2023-08-02 16:48:41 +01:00
Gwilym Inzani 70e763cc11 Add some panning for some more audio interest 2023-08-01 22:34:33 +01:00
Gwilym Inzani ea29c2a9f9 Make all the sound effects louder 2023-08-01 21:59:27 +01:00
Gwilym Inzani f49d3d3700 Actually include the new music and delete the old 2023-08-01 21:42:45 +01:00
Gwilym Inzani f4214b5da8 Use new music for dungeon puzzler's lament and fix tracker bugs 2023-08-01 21:41:33 +01:00
GBA bot e08024ae5b Update lockfiles 2023-07-26 11:31:26 +01:00
Gwilym Inzani a2dc536d49
Use my new married name in all the places it appeared (#465)
- [x] no changelog update needed
2023-07-26 10:42:31 +01:00
Gwilym Inzani 3da10f11be Use my new married name in all the places it appeared 2023-07-26 10:29:03 +01:00
Gwilym Inzani a5ad0129ed Don't need to call it levels16 any more 2023-07-25 23:22:08 +01:00
Gwilym Inzani 15ea1427df Delete the old 8x8 levels 2023-07-25 23:16:00 +01:00
Gwilym Inzani ea3ba89f92 16x16 levels!! 2023-07-25 23:15:34 +01:00
Gwilym Inzani 999a73439c Migrate the first 6 levels 2023-07-25 22:34:09 +01:00
Gwilym Inzani 3bd5ae2313 level 1 implemented 2023-07-25 22:23:32 +01:00
Corwin b80c85f1d9
Import dungeon puzzler's lament (#459)
Includes dungeon keepers lament in the examples

- [x] no changelog update needed
2023-07-25 20:52:48 +01:00
Corwin 748f061856
remove unused method 2023-07-25 20:41:16 +01:00
Corwin 95c4368df6
remove unused resolution 2023-07-25 20:41:05 +01:00
Corwin e7fe866036
remove sound files for unused effects 2023-07-25 20:40:16 +01:00
Corwin 9ee98cf0bf
remove unused sounds 2023-07-25 20:39:14 +01:00
Corwin c461b581b5
emit sword hit 2023-07-25 20:39:06 +01:00
Gwilym Inzani bddb77f5c9
XM tracker (#461)
Closes #446

One big problem with our games so far is that they are 95% music files.
If we want to add a game with more music, we can't at the moment.

This adds a tracker player which can play XM files easily in your games.
A lot of features from tracker files aren't supported yet, but enough to
make the examples sound at least half decent.

- [x] Changelog updated
2023-07-25 20:29:31 +01:00
Corwin b806fa8e66
fix names 2023-07-25 20:27:03 +01:00
Gwilym Inzani df75d1ce8c Fix build errors 2023-07-23 23:39:52 +01:00
Corwin 2d53977c49
add energy to amplitude (#457)
- [x] no changelog update needed
2023-07-19 20:36:54 +01:00
Corwin 41a0c773dd
clean up other examples 2023-07-19 17:54:41 +01:00
Corwin 0fac43746f
add the dungeon keeper's lament 2023-07-19 17:54:41 +01:00
Corwin a7f9fdf011
Release v0.16.0 2023-07-18 18:55:12 +01:00
Corwin c60d0215d6
add energy to amplitude 2023-07-17 17:38:34 +01:00
Gwilym Inzani 284e30078f Fix clippy lint in purple night 2023-07-04 21:24:44 +01:00
GBA bot 78a7c8d1c0 Update lockfiles 2023-07-01 14:21:55 +00:00
Gwilym Inzani 4fc4eab83b Give amplitude the same build settings as the other games
Makes the build faster
2023-06-30 22:09:06 +01:00
GBA bot 28683e701f Update lockfiles 2023-06-30 22:03:31 +01:00
Corwin 28e3a7faf4
Resolve stutter upon switching to dice customise screen (#442)
1. Dealloc now uses the normal dealloc procedure.
    * Better because normalisation is quick, O(1).
    * More normalisation means inserting into the list is faster.
2. Run sfx frame during the generation of upgrades (which can take an
unbounded amount of time).

* Both of these are required to remove the stuttering.
* It sounds really weird now that it works right :/

- [ ] Changelog updated / no changelog update needed
2023-06-05 21:01:12 +01:00
Corwin 80051a163a
Modify the enemy health rng by using a dice roll distribution (#438)
- [ ] Changelog updated / no changelog update needed
2023-06-05 21:01:04 +01:00
Corwin 95a8804094
reset the number of attempts 2023-06-05 00:12:36 +01:00
Corwin cbb0b7d2a0
resolve stutter 2023-06-05 00:12:36 +01:00
Corwin 80f5812039
make the letter "R" better (#441)
Hyperspace roll has a not great looking letter "R". Uses change made by
Gwilym.

- [x] no changelog update needed
2023-06-03 23:56:43 +01:00
Corwin 2b94ef0ac7
make the letter "R" better 2023-06-03 23:45:55 +01:00
Corwin 95b28983ff
show health 2023-06-03 23:29:54 +01:00
Corwin ae23f6fdf4
round towards nearest 2023-06-02 11:57:35 +01:00
Corwin 1d7acfb070
modify the enemy health rng by using a distribution 2023-06-02 01:24:37 +01:00
Gwilym Inzani da5aed83e3
Use bilge rather than modular-bitfield (#430)
Thought I'd give bilge a go rather than modular bitfield after reading
this blog post:
https://hecatia-elegua.github.io/blog/no-more-bit-fiddling/

- [ ] Changelog updated / no changelog update needed
2023-05-30 20:41:46 +01:00
Corwin 6b7088773e
remove codegen units 2023-05-23 20:12:42 +01:00
Corwin d638134d37
remove codegen-units
these were added as a workaround for rust bugs
2023-05-23 20:10:24 +01:00
Gwilym Inzani 7cf66e67e5 Update agb version in amplitude 2023-05-21 16:49:06 +01:00
Gwilym Inzani 78bad29f88 Add codegen-units=1 to prevent miscompiles 2023-05-21 16:37:35 +01:00
Gwilym Inzani 2de1b08f42 Remove references to arm-none-eabi 2023-05-21 16:37:35 +01:00
Gwilym Inzani 5ab0176ddb Entirely remove the need for binutils 2023-05-21 16:37:34 +01:00
Gwilym Inzani 644e94f8ed Use bilge rather than modular-bitfield 2023-05-17 15:01:22 +01:00
Corwin d08500d9c3
launch the correct game 2023-04-26 01:34:25 +01:00
Corwin 400abe5b31
Release v0.15.0 2023-04-25 21:51:29 +01:00
Corwin 68e981f3c8
Objects, again, again (#402)
* A redesign of objects giving the option of a more managed and an
unmanaged system.
* Managed system features
    * Z ordering (should be efficient, based on a doubly linked list).
* More than 128 objects if some are disabled (not currently efficient).
* Unmanaged
    * Same sprite system as before.
    * You control how objects get put in to OAM with the unmanaged OAM.
    
TODO before this is mergable:
* [x] Docs pass, aim for everything to have docs as before.
* [x] Tests, some of these needs some run time testing.
* [x] Affine matrices, I'm not leaving this to die this time.
* [x] Some API redo, so the names make sense / are similar to before.

Future work:
* The Sprite loader should keep most recently used sprites around and
upon allocation of a new sprite try unloading the least recently used
sprite. (Performance wise this would be a disaster as it would be doing
dealloc and alloc in vblank, so really we want to "learn" how much
buffer we should maintain and try to get that during GC).

- [x] Changelog updated
2023-04-25 21:14:49 +01:00
Corwin 409798c3bf
use fancy way of getting and setting slots 2023-04-25 21:07:31 +01:00
Corwin 929eef1569
add deny 2023-04-25 21:01:04 +01:00
Corwin d54560f362
fix warnings 2023-04-25 21:00:26 +01:00
Corwin 4ea75bc064
add amplitude to combo rom 2023-04-25 20:57:18 +01:00
Corwin e78a6624ff
add amplitude 2023-04-25 20:32:28 +01:00
Gwilym Inzani 9835f81b5f Maybe make the build faster by using the same settings for all crates 2023-04-25 20:22:44 +01:00
Corwin 3ec9bd2610
Merge remote-tracking branch 'upstream/master' into new-objects 2023-04-23 20:44:46 +01:00
Corwin 14c7028aa0
reverse change of name 2023-04-23 18:55:23 +01:00
Gwilym Inzani 7029b66c62 Update lockfiles 2023-04-23 18:00:31 +01:00
Corwin e26a9c2c24
Merge remote-tracking branch 'upstream/master' into new-objects 2023-04-22 00:46:41 +01:00
Gwilym Inzani 06db23d574
New include gfx macro (#414)
Replaces `include_gfx!` with `include_background_gfx!` which is much
nicer since it doesn't require the external toml file. See the example
repos for how much better it is :).

Also adds support for aseprite files in `include_background_gfx` and
uses that ability where we still have the original files.

- [x] Changelog updated / no changelog update needed
2023-04-18 21:14:28 +01:00
Gwilym Inzani 1e0102d615 Also update the combo rom 2023-04-18 20:29:45 +01:00
Corwin f3c4593a51
move mixer frame 2023-04-18 20:25:31 +01:00
Corwin e601374207
pull out common part of loop 2023-04-18 00:12:20 +01:00
Corwin 3f9fdd7c37
just use equals like before 2023-04-17 23:53:55 +01:00
Corwin f67ffac227
prioritise audio and deprioritise objects 2023-04-17 23:48:48 +01:00
Corwin a5c1d62cad
pointless capacity 2023-04-17 23:48:26 +01:00
Corwin 8bef214797
fix jitter 2023-04-17 23:48:15 +01:00
Corwin a249404063
fix player collision mask 2023-04-17 23:48:00 +01:00
Corwin 692890b6d6
fix jitter between objects and background 2023-04-17 23:34:09 +01:00
Corwin c970ab9362
fix positioning issues due 2023-04-17 23:31:05 +01:00
Gwilym Inzani 45343efe52 Update lockfiles 2023-04-13 22:33:59 +01:00
GBA bot 753f59e0e0 Allow importing aseprite backgrounds directly 2023-04-13 22:33:26 +01:00
Gwilym Inzani 875a0fbb65 Remove unneeded stuff from image-converter 2023-04-13 22:14:44 +01:00
Corwin fc5ce97db4
Release v0.14.0 2023-04-11 21:28:22 +01:00
Corwin fd79611dc3
update lock files 2023-04-11 21:27:09 +01:00
Corwin 4f19d6c240
forbid slot drop and move slot on set 2023-04-06 23:34:30 +01:00
Corwin c84e81299b
improve the migration 2023-04-06 21:45:32 +01:00
Corwin cdc2eed01d
unsafe arena added (may remove later) 2023-04-06 21:45:30 +01:00
Corwin e7caff3776
use new names in games 2023-04-06 21:45:03 +01:00
Corwin 660adbe961
fix games 2023-04-06 21:45:00 +01:00
Corwin af168f709b
update lock files 2023-04-06 17:17:12 +01:00
Gwilym Inzani e07a080aad Reduce codegen units to 1 to ensure build works 2023-04-05 17:06:56 +01:00
Gwilym Inzani 9d621f9b6a Add shstrtab section for lld 2023-04-02 20:39:38 +01:00
Corwin bf79fc89fb
Update Rust crate bitflags to v2 (#395) 2023-03-23 23:11:42 +00:00
Gwilym Inzani aea8547f97
Ensure cargo fmt is run accross everything (#399)
I have fmt'd all the things!

- [x] Changelog updated / no changelog update needed
2023-03-23 23:11:19 +00:00
GBA bot 09ec6c25b0 Update lockfiles 2023-03-23 22:30:47 +00:00
Gwilym Inzani 8a3660733d Add rustfmt as a component to rust-toolchain 2023-03-23 22:17:02 +00:00