Skip to content

Commit

Permalink
Added some new sprites
Browse files Browse the repository at this point in the history
Ms. Pacman, Inky, Blinky, Pinky, and Clyde
Also some fixed for some NPC palettes on some sprites.
  • Loading branch information
mcgrew committed Jul 27, 2019
1 parent 21b7f8b commit 4ee25a3
Show file tree
Hide file tree
Showing 6 changed files with 139 additions and 360 deletions.
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
* Music can now be totally disabled aside from instances where it affects game timing
* All music is now randomized/disabled, including after inn stays, etc.
* New player sprites:
* Red Slime
* Metal Slime
* Dragonlord
* Tov the Dog (Dragon Quest IV)
* Jason (Blaster Master)
Expand All @@ -20,6 +22,12 @@
* Kirby
* Lala (Adventures of Lolo)
* Lolo (Adventures of Lolo)
* Pac-Man
* Ms. Pac-Man
* Inky
* Blinky
* Pinky
* Clyde
* Slime (Dragon Quest franchise)
* Mike (Star Tropics)
* Waluigi (Mario franchise)
Expand Down
2 changes: 1 addition & 1 deletion cli/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ static void print_usage(const char *command, char *default_flags)
printf("If the seed is not specified, a random seed will be chosen\n");
printf("\n");
printf("Sprite should be one of: ");
for(i=0; i < sizeof(dwr_sprite_names) / sizeof(char *); i++) {
for(i=0; i < sprite_count(); i++) {
if (i) {
printf(", %s", dwr_sprite_names[i]);
} else {
Expand Down
2 changes: 1 addition & 1 deletion common/build.h
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
/* This file is generated by git */
#define BUILD "411"
#define BUILD "413"
478 changes: 124 additions & 354 deletions common/sprites.c

Large diffs are not rendered by default.

7 changes: 4 additions & 3 deletions common/sprites.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,18 @@
#ifndef DWRANDOMIZER_SPRITES_H
#define DWRANDOMIZER_SPRITES_H

#include "dwr_types.h"
#include <stdio.h>

#define SPRITE_COUNT 68
#include "dwr_types.h"

#ifdef __cplusplus
extern "C" {
#endif

extern const char * const dwr_sprite_names[SPRITE_COUNT];
extern const char * const dwr_sprite_names[];

void sprite(dw_rom *rom, const char *sprite_name);
size_t sprite_count();

#ifdef __cplusplus
}
Expand Down
2 changes: 1 addition & 1 deletion ui/main-window.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ void MainWindow::initWidgets()
this->levelSpeed = new LevelComboBox(this);
this->goButton = new QPushButton("Randomize!", this);
this->spriteSelect = new QComboBox(this);
for (int i=0; i < sizeof(dwr_sprite_names)/sizeof(char*); ++i) {
for (int i=0; i < sprite_count(); ++i) {
spriteSelect->addItem(dwr_sprite_names[i]);
}
this->tabWidget = new QTabWidget(this);
Expand Down

0 comments on commit 4ee25a3

Please sign in to comment.