summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormid-kid <esteve.varela@gmail.com>2020-09-13 20:23:59 +0200
committermid-kid <esteve.varela@gmail.com>2020-09-13 20:23:59 +0200
commitf58179bed21a68e9952d2984caaf0b16d9d22ff9 (patch)
tree6f443e82f6b3c4ba5edcedd0dd11742383b8a9fe
parent5f610c79442c185a627fa3394d9a976e47267b97 (diff)
parent544fb770b3a2b650e89371ac2a3d06d75acb716b (diff)
Merge branch 'master' of github.com:mid-kid/pokepicross
-rw-r--r--Makefile9
-rw-r--r--doc/bgm_portraits.pngbin0 -> 5197 bytes
2 files changed, 5 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 7c6b74e..4e9c073 100644
--- a/Makefile
+++ b/Makefile
@@ -3,10 +3,11 @@ baserom := DMGAKVJ0.1
dir_build := build
-RGBASM := rgbasm
-RGBGFX := rgbgfx
-RGBLINK := rgblink
-RGBFIX := rgbfix
+RGBDS ?=
+RGBASM ?= $(RGBDS)rgbasm
+RGBFIX ?= $(RGBDS)rgbfix
+RGBGFX ?= $(RGBDS)rgbgfx
+RGBLINK ?= $(RGBDS)rgblink
RGBASMFLAGS := -p 0xff -L -h -E
RGBLINKFLAGS := -p 0xff -d
diff --git a/doc/bgm_portraits.png b/doc/bgm_portraits.png
new file mode 100644
index 0000000..832b749
--- /dev/null
+++ b/doc/bgm_portraits.png
Binary files differ