Leahnaya/porymap
1
0
Fork 0
mirror of https://github.com/huderlem/porymap.git synced 2026-08-14 12:57:06 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into pokefirered

Browse Source
This commit is contained in:
GriffinR
2020-03-29 13:15:23 -04:00
committed by GitHub
parent 76a8c0dc44 3ff5483267
commit e9210f96aa
4 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/ui/paletteeditor.h
View File

@@ -23,7 +23,7 @@ public:
class PaletteEditor : public QMainWindow {
Q_OBJECT
public:
explicit PaletteEditor(Project*, Tileset*, Tileset*, QWidget *parent = nullptr);
explicit PaletteEditor(Project*, Tileset*, Tileset*, int paletteId, QWidget *parent = nullptr);
~PaletteEditor();
void setPaletteId(int);
void setTilesets(Tileset*, Tileset*);