enne2/ascreamfromthedark-gb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Revert sprite-based stairs back to tile-based stairs

Browse Source
This commit is contained in:
Matteo Benedetto
2026-06-23 19:57:13 +02:00
parent 8d71a23ae9
commit 1b0e1a057b
17 changed files with 18 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/enemy.c
+1 -1
View File
@@ -1,5 +1,5 @@
//AUTOGENERATED FILE FROM png2asset
// Conversion args: /enemy.png -c /enemy.c -sw 16 -sh 16 -bpp 2 -noflip -keep_palette_order -sp 0x10 -spr8x16
// Conversion args: /enemy.png -c /enemy.c -sw 16 -sh 16 -bpp 2 -noflip -keep_palette_order -sp 0x10
#include <stdint.h>
#include <gbdk/platform.h>
src/enemy.h
+1 -1
View File
@@ -1,5 +1,5 @@
//AUTOGENERATED FILE FROM png2asset
// Conversion args: /enemy.png -c /enemy.c -sw 16 -sh 16 -bpp 2 -noflip -keep_palette_order -sp 0x10 -spr8x16
// Conversion args: /enemy.png -c /enemy.c -sw 16 -sh 16 -bpp 2 -noflip -keep_palette_order -sp 0x10
#ifndef METASPRITE_enemy_H
#define METASPRITE_enemy_H
src/engine.c
-13
View File
@@ -20,9 +20,6 @@
#include "victory.h"
#include "stamina.h"
#include "title_bg.h"
#ifdef USE_SPRITE_STAIRS
#include "stairs_sprite.h"
#endif
/**
* Inizializza la schermata del titolo
@@ -99,9 +96,6 @@ void engine_init(void) {
set_sprite_data(player_TILE_COUNT + enemy_TILE_COUNT, gameover_TILE_COUNT, gameover_tiles);
set_sprite_data(player_TILE_COUNT + enemy_TILE_COUNT + gameover_TILE_COUNT, victory_TILE_COUNT, victory_tiles);
set_sprite_data(player_TILE_COUNT + enemy_TILE_COUNT + gameover_TILE_COUNT + victory_TILE_COUNT, stamina_TILE_COUNT * 2, stamina_tiles);
#ifdef USE_SPRITE_STAIRS
set_sprite_data(player_TILE_COUNT + enemy_TILE_COUNT + gameover_TILE_COUNT + victory_TILE_COUNT + stamina_TILE_COUNT * 2, stairs_sprite_TILE_COUNT, stairs_sprite_tiles);
#endif
// SPAWN DEL GIOCATORE
player_lx = 1;
@@ -122,13 +116,6 @@ void engine_init(void) {
}
}
#ifdef USE_SPRITE_STAIRS
// HARDCODE STAIRS FOR TESTING
stairs_lx = player_lx + 1;
stairs_ly = player_ly;
maze[stairs_ly][stairs_lx] = 2;
#endif
// SPAWN DEL NEMICO
// Cerca randomicamente un punto lontano almeno 3 celle dal giocatore
while (1) {
src/gameover.c
+1 -1
View File
@@ -1,5 +1,5 @@
//AUTOGENERATED FILE FROM png2asset
// Conversion args: /gameover.png -c /gameover.c -bpp 2 -noflip -keep_palette_order -spr8x16
// Conversion args: /gameover.png -c /gameover.c -bpp 2 -noflip -keep_palette_order
#include <stdint.h>
#include <gbdk/platform.h>
src/gameover.h
+1 -1
View File
@@ -1,5 +1,5 @@
//AUTOGENERATED FILE FROM png2asset
// Conversion args: /gameover.png -c /gameover.c -bpp 2 -noflip -keep_palette_order -spr8x16
// Conversion args: /gameover.png -c /gameover.c -bpp 2 -noflip -keep_palette_order
#ifndef METASPRITE_gameover_H
#define METASPRITE_gameover_H
src/player.c
+1 -1
View File
@@ -1,5 +1,5 @@
//AUTOGENERATED FILE FROM png2asset
// Conversion args: /player.png -c /player.c -sw 16 -sh 16 -bpp 2 -noflip -keep_palette_order -spr8x16
// Conversion args: /player.png -c /player.c -sw 16 -sh 16 -bpp 2 -noflip -keep_palette_order
#include <stdint.h>
#include <gbdk/platform.h>
src/player.h
+1 -1
View File
@@ -1,5 +1,5 @@
//AUTOGENERATED FILE FROM png2asset
// Conversion args: /player.png -c /player.c -sw 16 -sh 16 -bpp 2 -noflip -keep_palette_order -spr8x16
// Conversion args: /player.png -c /player.c -sw 16 -sh 16 -bpp 2 -noflip -keep_palette_order
#ifndef METASPRITE_player_H
#define METASPRITE_player_H
src/render.c
-30
View File
@@ -9,9 +9,6 @@
#include "victory.h"
#include "stamina.h"
#include "maze.h"
#ifdef USE_SPRITE_STAIRS
#include "stairs_sprite.h"
#endif
uint8_t get_tile_state(int8_t cx, int8_t cy, int8_t lx, int8_t ly) {
if (lx < 0 || lx >= MAP_SIZE || ly < 0 || ly >= MAP_SIZE) return 0;
@@ -121,11 +118,7 @@ void draw_map(uint8_t center_x, uint8_t center_y) {
// Passata 1: Pavimenti normali
for (int8_t ly = start_y; ly <= end_y; ly++) {
for (int8_t lx = start_x; lx <= end_x; lx++) {
#ifdef USE_SPRITE_STAIRS
if (maze[ly][lx] == 1 || maze[ly][lx] == 2) {
#else
if (maze[ly][lx] == 1) {
#endif
// Distanza di Chebyshev dal giocatore
int8_t dx = lx - center_x;
int8_t dy = ly - center_y;
@@ -162,7 +155,6 @@ void draw_map(uint8_t center_x, uint8_t center_y) {
}
}
#ifndef USE_SPRITE_STAIRS
// Passata 2: Scala della Vittoria (disegnata sempre sopra)
for (int8_t ly = start_y; ly <= end_y; ly++) {
for (int8_t lx = start_x; lx <= end_x; lx++) {
@@ -204,7 +196,6 @@ void draw_map(uint8_t center_x, uint8_t center_y) {
}
}
}
#endif
update_stamina_display();
@@ -229,27 +220,6 @@ void update_camera(void) {
// Comando hardware GBDK per scrollare il livello Background
move_bkg(scroll_x, scroll_y);
#ifdef USE_SPRITE_STAIRS
// Calcola e posiziona lo sprite delle scale
int16_t stairs_px = (stairs_lx - stairs_ly) * 16 + 96;
int16_t stairs_py = (stairs_lx + stairs_ly) * 8 + 16;
int16_t stairs_screen_x = ((stairs_px - scroll_x) & 255) + 8; // Offset per sprite
int16_t stairs_screen_y = ((stairs_py - scroll_y) & 255) + 16;
int8_t dx = (int8_t)stairs_lx - (int8_t)player_lx;
int8_t dy = (int8_t)stairs_ly - (int8_t)player_ly;
if (dx < 0) dx = -dx;
if (dy < 0) dy = -dy;
uint8_t dist = (dx > dy) ? dx : dy;
// Se le scale sono visibili (dist <= 2), disegnale, altrimenti nascondile
if (dist <= 2 && stairs_screen_x >= -32 && stairs_screen_x <= 168 && stairs_screen_y >= -16 && stairs_screen_y <= 152) {
move_metasprite(stairs_sprite_metasprites[0], player_TILE_COUNT + enemy_TILE_COUNT + gameover_TILE_COUNT + victory_TILE_COUNT + stamina_TILE_COUNT * 2, 12, stairs_screen_x, stairs_screen_y - 8);
} else {
move_metasprite(stairs_sprite_metasprites[0], player_TILE_COUNT + enemy_TILE_COUNT + gameover_TILE_COUNT + victory_TILE_COUNT + stamina_TILE_COUNT * 2, 12, 0, 0);
}
#endif
}
/**
src/stairs_sprite.c
-36
View File
@@ -1,36 +0,0 @@
//AUTOGENERATED FILE FROM png2asset
// Conversion args: /stairs_sprite.png -c /stairs_sprite.c -sw 32 -sh 16 -bpp 2 -noflip -keep_palette_order -spr8x16
#include <stdint.h>
#include <gbdk/platform.h>
#include <gbdk/metasprites.h>
BANKREF(stairs_sprite)
const palette_color_t stairs_sprite_palettes[32] = {
RGB8(224,248,207), RGB8(134,192,108), RGB8( 48,104, 80), RGB8( 7, 24, 33),
RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0),
RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0),
RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0),
RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0),
RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0),
RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0),
RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0), RGB8( 0, 0, 0)
};
const uint8_t stairs_sprite_tiles[64] = {
0x01,0x01,0x07,0x06,0x1f,0x18,0x07,0x06,0x01,0x01,0x06,0x06,0x18,0x18,0x06,0x06,
0x01,0x01,0x07,0x06,0x1f,0x18,0x07,0x06,0x01,0x01,0x06,0x06,0x18,0x18,0x06,0x06,
0x80,0x80,0xe0,0x60,0xf8,0x18,0xe0,0x60,0x80,0x80,0x60,0x60,0x18,0x18,0x60,0x60,
0x80,0x80,0xe0,0x60,0xf8,0x18,0xe0,0x60,0x80,0x80,0x60,0x60,0x18,0x18,0x60,0x60
};
const metasprite_t stairs_sprite_metasprite0[] = {
METASPR_ITEM(-8, -8, 0, S_PAL(0)),
METASPR_ITEM(0, 8, 2, S_PAL(0)),
METASPR_TERM
};
const metasprite_t* const stairs_sprite_metasprites[1] = {
stairs_sprite_metasprite0
};
src/stairs_sprite.h
-31
View File
@@ -1,31 +0,0 @@
//AUTOGENERATED FILE FROM png2asset
// Conversion args: /stairs_sprite.png -c /stairs_sprite.c -sw 32 -sh 16 -bpp 2 -noflip -keep_palette_order -spr8x16
#ifndef METASPRITE_stairs_sprite_H
#define METASPRITE_stairs_sprite_H
#include <stdint.h>
#include <gbdk/platform.h>
#include <gbdk/metasprites.h>
#define stairs_sprite_TILE_ORIGIN 0
#define stairs_sprite_TILE_W 8
#define stairs_sprite_TILE_H 16
#define stairs_sprite_WIDTH 32
#define stairs_sprite_HEIGHT 16
#define stairs_sprite_TILE_COUNT 4
#define stairs_sprite_PALETTE_COUNT 8
#define stairs_sprite_COLORS_PER_PALETTE 4
#define stairs_sprite_TOTAL_COLORS 32
#define stairs_sprite_PIVOT_X 16
#define stairs_sprite_PIVOT_Y 8
#define stairs_sprite_PIVOT_W 32
#define stairs_sprite_PIVOT_H 16
extern const metasprite_t* const stairs_sprite_metasprites[1];
BANKREF_EXTERN(stairs_sprite)
extern const palette_color_t stairs_sprite_palettes[32];
extern const uint8_t stairs_sprite_tiles[64];
#endif
src/stamina.c
+1 -1
View File
@@ -1,5 +1,5 @@
//AUTOGENERATED FILE FROM png2asset
// Conversion args: /stamina.png -c /stamina.c -bpp 2 -noflip -keep_palette_order -spr8x16
// Conversion args: /stamina.png -c /stamina.c -bpp 2 -noflip -keep_palette_order
#include <stdint.h>
#include <gbdk/platform.h>
src/stamina.h
+1 -1
View File
@@ -1,5 +1,5 @@
//AUTOGENERATED FILE FROM png2asset
// Conversion args: /stamina.png -c /stamina.c -bpp 2 -noflip -keep_palette_order -spr8x16
// Conversion args: /stamina.png -c /stamina.c -bpp 2 -noflip -keep_palette_order
#ifndef METASPRITE_stamina_H
#define METASPRITE_stamina_H
src/victory.c
+1 -1
View File
@@ -1,5 +1,5 @@
//AUTOGENERATED FILE FROM png2asset
// Conversion args: /victory.png -c /victory.c -bpp 2 -noflip -keep_palette_order -spr8x16
// Conversion args: /victory.png -c /victory.c -bpp 2 -noflip -keep_palette_order
#include <stdint.h>
#include <gbdk/platform.h>
src/victory.h
+1 -1
View File
@@ -1,5 +1,5 @@
//AUTOGENERATED FILE FROM png2asset
// Conversion args: /victory.png -c /victory.c -bpp 2 -noflip -keep_palette_order -spr8x16
// Conversion args: /victory.png -c /victory.c -bpp 2 -noflip -keep_palette_order
#ifndef METASPRITE_victory_H
#define METASPRITE_victory_H