gbrg/.git
6 months agoAdded assert macro origin/simple-enemy-behavior
Lukas Krickl [Sat, 7 Dec 2024 05:39:37 +0000 (06:39 +0100)]
Added assert macro

6 months agoFixed enum value for doors
Lukas Krickl [Wed, 4 Dec 2024 12:45:29 +0000 (13:45 +0100)]
Fixed enum value for doors

6 months agoAdded BREAK macro
Lukas Krickl [Wed, 4 Dec 2024 09:54:02 +0000 (10:54 +0100)]
Added BREAK macro

6 months agoMoved flag reading to map
Lukas Krickl [Wed, 4 Dec 2024 09:49:17 +0000 (10:49 +0100)]
Moved flag reading to map

6 months agoAdded door flags to base room
Lukas Krickl [Wed, 4 Dec 2024 07:43:15 +0000 (08:43 +0100)]
Added door flags to base room

6 months agoWIP: reworking room flag access
Lukas Krickl [Wed, 4 Dec 2024 07:11:11 +0000 (08:11 +0100)]
WIP: reworking room flag access

6 months agoWIP: flag setting for maps
Lukas Krickl [Mon, 2 Dec 2024 05:01:25 +0000 (06:01 +0100)]
WIP: flag setting for maps

7 months agoAdded constant rand call to main loop
Lukas Krickl [Fri, 29 Nov 2024 17:22:31 +0000 (18:22 +0100)]
Added constant rand call to main loop

7 months agoAdded test animation for bats
Lukas Krickl [Fri, 29 Nov 2024 09:05:34 +0000 (10:05 +0100)]
Added test animation for bats

7 months agoWIP: bat movement
Lukas Krickl [Fri, 29 Nov 2024 08:10:39 +0000 (09:10 +0100)]
WIP: bat movement

7 months agoAdded basic 'rng' function
Lukas Krickl [Fri, 29 Nov 2024 05:00:01 +0000 (06:00 +0100)]
Added basic 'rng' function

7 months agoAdded simple player animation
Lukas Krickl [Tue, 26 Nov 2024 14:07:01 +0000 (15:07 +0100)]
Added simple player animation

7 months agoMoved animation load macro to macro defs
Lukas Krickl [Tue, 26 Nov 2024 13:33:12 +0000 (14:33 +0100)]
Moved animation load macro to macro defs

7 months agoMoved animation loading to a macro
Lukas Krickl [Tue, 26 Nov 2024 07:28:59 +0000 (08:28 +0100)]
Moved animation loading to a macro

7 months agoAdded bat tiles for simple animations
Lukas Krickl [Mon, 25 Nov 2024 14:24:28 +0000 (15:24 +0100)]
Added bat tiles for simple animations

7 months agoOptimized call_tbl a bit
Lukas Krickl [Mon, 25 Nov 2024 12:44:11 +0000 (13:44 +0100)]
Optimized call_tbl a bit

7 months agoAdded template for plot
Lukas Krickl [Mon, 25 Nov 2024 11:41:42 +0000 (12:41 +0100)]
Added template for plot

7 months agoUpdated map converter to align actors to the tile grid
Lukas Krickl [Mon, 25 Nov 2024 10:50:07 +0000 (11:50 +0100)]
Updated map converter to align actors to the tile grid

7 months agoWIP: actor table update
Lukas Krickl [Mon, 25 Nov 2024 09:12:39 +0000 (10:12 +0100)]
WIP: actor table update

7 months agoAdded basic bat rendering
Lukas Krickl [Wed, 20 Nov 2024 15:52:35 +0000 (16:52 +0100)]
Added basic bat rendering

7 months agowip: Added bat actor and move duplicate actor code to macros
Lukas Krickl [Wed, 20 Nov 2024 15:14:18 +0000 (16:14 +0100)]
wip: Added bat actor and move duplicate actor code to macros

7 months agoAdded bat sprite
Lukas Krickl [Tue, 19 Nov 2024 18:40:48 +0000 (19:40 +0100)]
Added bat sprite

7 months agoAdded test noise for walking
Lukas Krickl [Tue, 19 Nov 2024 14:01:19 +0000 (15:01 +0100)]
Added test noise for walking

7 months agoUpdted readme.
Lukas Krickl [Tue, 19 Nov 2024 13:16:49 +0000 (14:16 +0100)]
Updted readme.

Added built instructions as well as a reference to ulas

7 months agoAdded audio register definitions
Lukas Krickl [Tue, 19 Nov 2024 08:24:25 +0000 (09:24 +0100)]
Added audio register definitions

7 months agoAdded audio init code
Lukas Krickl [Tue, 19 Nov 2024 08:02:27 +0000 (09:02 +0100)]
Added audio init code

7 months agoAdded skip turn code to all other actor types for now
Lukas Krickl [Mon, 18 Nov 2024 18:18:33 +0000 (19:18 +0100)]
Added skip turn code to all other actor types for now

7 months agoThe player's turn is now ended after a move
Lukas Krickl [Mon, 18 Nov 2024 17:48:26 +0000 (18:48 +0100)]
The player's turn is now ended after a move

for now now other actor is handling turns so the player can only move
  once

7 months agoAdded system for ending turns
Lukas Krickl [Mon, 18 Nov 2024 17:40:54 +0000 (18:40 +0100)]
Added system for ending turns

7 months agoAdded who_next call
Lukas Krickl [Mon, 18 Nov 2024 17:04:04 +0000 (18:04 +0100)]
Added who_next call

7 months agoFixed take damage debug buttons
Lukas Krickl [Mon, 18 Nov 2024 15:17:52 +0000 (16:17 +0100)]
Fixed take damage debug buttons

7 months agoAdded collision check for new movement
Lukas Krickl [Mon, 18 Nov 2024 13:41:05 +0000 (14:41 +0100)]
Added collision check for new movement

7 months agoAdded new movement for player.
Lukas Krickl [Mon, 18 Nov 2024 12:55:32 +0000 (13:55 +0100)]
Added new movement for player.

- TODO: collision is still not implemented again

7 months agoReworking player input handling for turn-based movement
Lukas Krickl [Sun, 17 Nov 2024 20:05:44 +0000 (21:05 +0100)]
Reworking player input handling for turn-based movement

7 months agoWIP: turn based movement
Lukas Krickl [Sun, 17 Nov 2024 17:09:47 +0000 (18:09 +0100)]
WIP: turn based movement

7 months agoRemoved unused collision code
Lukas Krickl [Sun, 17 Nov 2024 07:39:29 +0000 (08:39 +0100)]
Removed unused collision code

7 months agoAdded todo txt
Lukas Krickl [Sun, 17 Nov 2024 06:33:39 +0000 (07:33 +0100)]
Added todo txt

7 months agoWIP: sram functionality
Lukas Krickl [Sun, 17 Nov 2024 06:25:51 +0000 (07:25 +0100)]
WIP: sram functionality

7 months agoWIP: mbc1 ram access
Lukas Krickl [Sun, 17 Nov 2024 05:45:02 +0000 (06:45 +0100)]
WIP: mbc1 ram access

7 months agoWIP: map struct
Lukas Krickl [Sat, 16 Nov 2024 18:22:52 +0000 (19:22 +0100)]
WIP: map struct

7 months agoAdded docs for maps and rooms
Lukas Krickl [Sat, 16 Nov 2024 16:22:11 +0000 (17:22 +0100)]
Added docs for maps and rooms

7 months agoUpdated ulas -i flag to -I
Lukas Krickl [Sun, 10 Nov 2024 19:04:08 +0000 (20:04 +0100)]
Updated ulas -i flag to -I

7 months agoAdded player tile with new collision box
Lukas Krickl [Tue, 5 Nov 2024 17:51:19 +0000 (18:51 +0100)]
Added player tile with new collision box

7 months agoMoved rec collision check to a macro to avoid copy-paste issues
Lukas Krickl [Fri, 1 Nov 2024 17:44:41 +0000 (18:44 +0100)]
Moved rec collision check to a macro to avoid copy-paste issues

7 months agowip: point rectangle collision
Lukas Krickl [Fri, 1 Nov 2024 06:14:11 +0000 (07:14 +0100)]
wip: point rectangle collision

7 months agowip: rectangle collision
Lukas Krickl [Fri, 1 Nov 2024 04:41:52 +0000 (05:41 +0100)]
wip: rectangle collision

8 months agoUpdated makefile
Lukas Krickl [Tue, 29 Oct 2024 09:16:34 +0000 (10:16 +0100)]
Updated makefile

8 months agoAdded basic docs for how to handle collision
Lukas Krickl [Mon, 28 Oct 2024 05:00:18 +0000 (06:00 +0100)]
Added basic docs for how to handle collision

8 months agoAdded stub for point/rectangle collision
Lukas Krickl [Mon, 28 Oct 2024 04:50:22 +0000 (05:50 +0100)]
Added stub for point/rectangle collision

8 months agoActors from the map table are now positions correctly
Lukas Krickl [Fri, 25 Oct 2024 17:29:49 +0000 (19:29 +0200)]
Actors from the map table are now positions correctly

8 months agoTesting actor tile assignment
Lukas Krickl [Fri, 25 Oct 2024 16:34:49 +0000 (18:34 +0200)]
Testing actor tile assignment

8 months agoroom load now directly loads the room structs into its respective ptrs
Lukas Krickl [Fri, 25 Oct 2024 14:55:21 +0000 (16:55 +0200)]
room load now directly loads the room structs into its respective ptrs

8 months agoUpdated room script to also output a room struct
Lukas Krickl [Fri, 25 Oct 2024 09:45:46 +0000 (11:45 +0200)]
Updated room script to also output a room struct

8 months agoFixed actor table loader
Lukas Krickl [Fri, 25 Oct 2024 04:17:16 +0000 (06:17 +0200)]
Fixed actor table loader

8 months agowip: map actor loading
Lukas Krickl [Thu, 24 Oct 2024 18:24:09 +0000 (20:24 +0200)]
wip: map actor loading

8 months agoAdded basic script to convert actor layers
Lukas Krickl [Thu, 24 Oct 2024 15:45:12 +0000 (17:45 +0200)]
Added basic script to convert actor layers

8 months agowip: room loading
Lukas Krickl [Wed, 23 Oct 2024 17:35:47 +0000 (19:35 +0200)]
wip: room loading

8 months agowip: actor system
Lukas Krickl [Wed, 23 Oct 2024 16:00:44 +0000 (18:00 +0200)]
wip: actor system

8 months agoAdded script that converts tiled csv maps to in-game maps
Lukas Krickl [Mon, 21 Oct 2024 18:38:34 +0000 (20:38 +0200)]
Added script that converts tiled csv maps to in-game maps

8 months agoAdded new floor tiles
Lukas Krickl [Sun, 20 Oct 2024 08:10:02 +0000 (10:10 +0200)]
Added new floor tiles

8 months agoMerge pull request 'Initial setup for engine' (#1) from engine-setup into master
unlink2 [Sun, 20 Oct 2024 07:49:11 +0000 (07:49 +0000)]
Merge pull request 'Initial setup for engine' (#1) from engine-setup into master

- Added basic map loader
- Added player controller
- Added simple tile collision

8 months agoTweaking collision shape for player
Lukas Krickl [Sun, 20 Oct 2024 07:47:54 +0000 (09:47 +0200)]
Tweaking collision shape for player

8 months agoUpdated door tileset to align with collision origin/engine-setup
Lukas Krickl [Sun, 20 Oct 2024 07:28:52 +0000 (09:28 +0200)]
Updated door tileset to align with collision

8 months agoAdded basic left/right collision
Lukas Krickl [Sat, 19 Oct 2024 14:54:33 +0000 (16:54 +0200)]
Added basic left/right collision

8 months agoMoved player collision call to a macro
Lukas Krickl [Sat, 19 Oct 2024 05:36:32 +0000 (07:36 +0200)]
Moved player collision call to a macro

8 months agoFixed tile -> player collision by using the correct shift
Lukas Krickl [Sat, 19 Oct 2024 05:09:58 +0000 (07:09 +0200)]
Fixed tile -> player collision by using the correct shift
instructions.

For future reference sra did not do it because bit 7 might be set in
normal gameplay we needed srl

8 months agoplayer -> tile collision from top
Lukas Krickl [Sat, 19 Oct 2024 04:31:16 +0000 (06:31 +0200)]
player -> tile collision from top

8 months agocollision pointer loading
Lukas Krickl [Sat, 19 Oct 2024 03:33:11 +0000 (05:33 +0200)]
collision pointer loading

8 months agoAdding collision tile mask
Lukas Krickl [Sat, 19 Oct 2024 03:13:20 +0000 (05:13 +0200)]
Adding collision tile mask

8 months agowip: collision with tiles
Lukas Krickl [Fri, 18 Oct 2024 18:25:43 +0000 (20:25 +0200)]
wip: collision with tiles

8 months agoRemoved redundant hl push from collison routine
Lukas Krickl [Mon, 14 Oct 2024 12:11:58 +0000 (14:11 +0200)]
Removed redundant hl push from collison routine

8 months agowip: collision bounds checking for tiles
Lukas Krickl [Mon, 14 Oct 2024 11:59:09 +0000 (13:59 +0200)]
wip: collision bounds checking for tiles

8 months agowip: map tile flag lookup
Lukas Krickl [Fri, 11 Oct 2024 11:13:48 +0000 (13:13 +0200)]
wip: map tile flag lookup

8 months agowip: added static location for collision check inputs
Lukas Krickl [Thu, 10 Oct 2024 17:51:26 +0000 (19:51 +0200)]
wip: added static location for collision check inputs

8 months agoRenamed wall flag
Lukas Krickl [Thu, 10 Oct 2024 16:41:41 +0000 (18:41 +0200)]
Renamed wall flag

8 months agoAdded collision tile lut
Lukas Krickl [Thu, 10 Oct 2024 14:52:34 +0000 (16:52 +0200)]
Added collision tile lut

8 months agoAdded basic layout for map collision and room flags
Lukas Krickl [Thu, 10 Oct 2024 11:18:18 +0000 (13:18 +0200)]
Added basic layout for map collision and room flags

8 months agoAdded tempalte for collision shapes
Lukas Krickl [Thu, 10 Oct 2024 03:52:51 +0000 (05:52 +0200)]
Added tempalte for collision shapes

8 months agoMoved ptr tbl call to its own sub routine
Lukas Krickl [Thu, 10 Oct 2024 03:25:38 +0000 (05:25 +0200)]
Moved ptr tbl call to its own sub routine

8 months agoUpdated wall corner tiles
Lukas Krickl [Wed, 9 Oct 2024 13:11:42 +0000 (15:11 +0200)]
Updated wall corner tiles

8 months agoAdded simple game mode switch
Lukas Krickl [Wed, 9 Oct 2024 10:46:47 +0000 (12:46 +0200)]
Added simple game mode switch

8 months agotake damage code is now only run when the player is not in iframe mode
Lukas Krickl [Wed, 9 Oct 2024 04:02:02 +0000 (06:02 +0200)]
take damage code is now only run when the player is not in iframe mode

8 months agoReworked floor tile
Lukas Krickl [Tue, 8 Oct 2024 16:02:03 +0000 (18:02 +0200)]
Reworked floor tile

8 months agoAdded simple flashing animation for iframes
Lukas Krickl [Tue, 8 Oct 2024 15:05:36 +0000 (17:05 +0200)]
Added simple flashing animation for iframes

8 months agoFixed bug that overwrote de when taking damage
Lukas Krickl [Tue, 8 Oct 2024 05:16:22 +0000 (07:16 +0200)]
Fixed bug that overwrote de when taking damage

8 months agowip: iframe timer
Lukas Krickl [Tue, 8 Oct 2024 04:43:51 +0000 (06:43 +0200)]
wip: iframe timer

8 months agoentry now inits sp to prevent a restart
Lukas Krickl [Mon, 7 Oct 2024 17:57:04 +0000 (19:57 +0200)]
entry now inits sp to prevent a restart
from clobbering the stack

8 months agoAdded simple game over animation
Lukas Krickl [Mon, 7 Oct 2024 16:39:10 +0000 (18:39 +0200)]
Added simple game over animation

8 months agoAdded slight pause every time damage is taken
Lukas Krickl [Mon, 7 Oct 2024 16:09:57 +0000 (18:09 +0200)]
Added slight pause every time damage is taken

- This allows the player to adjust to a damage source
- Added clear indication that damage was taken

8 months agoMade player sprite slightly taller
Lukas Krickl [Mon, 7 Oct 2024 15:36:32 +0000 (17:36 +0200)]
Made player sprite slightly taller

8 months agoAdded new broom tiles
Lukas Krickl [Sun, 6 Oct 2024 20:13:18 +0000 (22:13 +0200)]
Added new broom tiles

8 months agoAdded function to gain resources
Lukas Krickl [Sun, 6 Oct 2024 16:45:57 +0000 (18:45 +0200)]
Added function to gain resources

8 months agoAdded ability to reduce hp using a debug input
Lukas Krickl [Sun, 6 Oct 2024 16:12:56 +0000 (18:12 +0200)]
Added ability to reduce hp using a debug input

8 months agoCombined single and multi bar drawing logic
Lukas Krickl [Sun, 6 Oct 2024 08:37:29 +0000 (10:37 +0200)]
Combined single and multi bar drawing logic

8 months agoAdded basic drawing rotuine for stat bars
Lukas Krickl [Sun, 6 Oct 2024 07:49:29 +0000 (09:49 +0200)]
Added basic drawing rotuine for stat bars

8 months agoAdded tmp and itmp storage
Lukas Krickl [Sat, 5 Oct 2024 18:30:21 +0000 (20:30 +0200)]
Added tmp and itmp storage

8 months agowip: stats bars
Lukas Krickl [Sat, 5 Oct 2024 17:19:22 +0000 (19:19 +0200)]
wip: stats bars

8 months agoAdded basic drawing routine for single filled and empty stats bar
Lukas Krickl [Sat, 5 Oct 2024 16:44:20 +0000 (18:44 +0200)]
Added basic drawing routine for single filled and empty stats bar

8 months agoAdded demo player sprite
Lukas Krickl [Sat, 5 Oct 2024 15:30:22 +0000 (17:30 +0200)]
Added demo player sprite

8 months agoAdded door tiles for each direction
Lukas Krickl [Sat, 5 Oct 2024 14:34:17 +0000 (16:34 +0200)]
Added door tiles for each direction