Skip to content

Commit 6a7e65f

Browse files
committed
Merge branch 'master' of https://github.com/pret/pokered
2 parents aa693a5 + e2f7c5c commit 6a7e65f

File tree

279 files changed

+3304
-9894
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

279 files changed

+3304
-9894
lines changed

.github/workflows/main.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,13 @@ jobs:
1616
uses: actions/checkout@master
1717
with:
1818
path: rgbds
19-
ref: v0.8.0
19+
ref: v0.9.3
2020
repository: gbdev/rgbds
2121

2222
- name: Install rgbds
2323
working-directory: rgbds
2424
run: |
25+
sudo apt-get install -yq libpng-dev
2526
sudo make install
2627
2728
- name: Remove rgbds

.rgbds-version

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
0.9.3

INSTALL.md

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ Run setup and leave the default settings. At the "**Select Packages**" step, cho
4242

4343
Double click on the text that says "**Skip**" next to each package to select the most recent version to install.
4444

45-
Then follow the [**rgbds** install instructions](https://rgbds.gbdev.io/install#pre-built) for Windows with Cygwin to install **rgbds 0.7.0**.
45+
Then follow the [**rgbds** install instructions](https://rgbds.gbdev.io/install#pre-built) for Windows with Cygwin to install **rgbds 0.9.3**.
4646

47-
**Note:** If you already have an installed rgbds older than 0.7.0, you will need to update to 0.7.0. Ignore this if you have never installed rgbds before. If a version newer than 0.7.0 does not work, try downloading 0.7.0.
47+
**Note:** If you already have an installed rgbds older than 0.9.3, you will need to update to 0.9.3. Ignore this if you have never installed rgbds before. If a version newer than 0.9.3 does not work, try downloading 0.9.3.
4848

4949
Now open the **Cygwin terminal** and enter the following commands.
5050

@@ -67,7 +67,7 @@ Install [**Homebrew**](https://brew.sh/). Follow the official instructions.
6767

6868
Open **Terminal** and prepare to enter commands.
6969

70-
Then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install#pre-built) for macOS to install **rgbds 0.7.0**.
70+
Then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install#pre-built) for macOS to install **rgbds 0.9.3**.
7171

7272
Now you're ready to [build **pokered-gbc**](#build-pokered-gbc).
7373

@@ -84,7 +84,7 @@ To install the software required for **pokered-gbc**:
8484
sudo apt-get install make gcc git
8585
```
8686

87-
Then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install#building-from-source) to build **rgbds 0.7.0** from source.
87+
Then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install#building-from-source) to build **rgbds 0.9.3** from source.
8888

8989
### OpenSUSE
9090

@@ -94,7 +94,7 @@ To install the software required for **pokered-gbc**:
9494
sudo zypper install make gcc git
9595
```
9696

97-
Then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install#building-from-source) to build **rgbds 0.7.0** from source.
97+
Then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install#building-from-source) to build **rgbds 0.9.3** from source.
9898

9999
### Arch Linux
100100

@@ -104,23 +104,23 @@ To install the software required for **pokered-gbc**:
104104
sudo pacman -S make gcc git rgbds
105105
```
106106

107-
If you want to compile and install **rgbds** yourself instead, then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install#building-from-source) to build **rgbds 0.7.0** from source.
107+
If you want to compile and install **rgbds** yourself instead, then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install#building-from-source) to build **rgbds 0.9.3** from source.
108108

109109
### Termux
110110

111111
To install the software required for **pokered-gbc**:
112112

113113
```bash
114-
sudo apt install make clang git sed
114+
pkg install make clang git sed
115115
```
116116

117117
To install **rgbds**:
118118

119119
```bash
120-
sudo apt install rgbds
120+
pkg install rgbds
121121
```
122122

123-
If you want to compile and install **rgbds** yourself instead, then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install#building-from-source) to build **rgbds 0.7.0** from source.
123+
If you want to compile and install **rgbds** yourself instead, then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install#building-from-source) to build **rgbds 0.9.3** from source.
124124

125125
### Other distros
126126

@@ -131,7 +131,7 @@ If your distro is not listed here, try to find the required software in its repo
131131
- `git`
132132
- `rgbds`
133133

134-
If `rgbds` is not available, you'll need to follow the [**rgbds** instructions](https://rgbds.gbdev.io/install#building-from-source) to build **rgbds 0.7.0** from source.
134+
If `rgbds` is not available, you'll need to follow the [**rgbds** instructions](https://rgbds.gbdev.io/install#building-from-source) to build **rgbds 0.9.3** from source.
135135

136136
Now you're ready to [build **pokered-gbc**](#build-pokered-gbc).
137137

@@ -153,8 +153,8 @@ make
153153

154154
### Build with a local rgbds version
155155

156-
If you have different projects that require different versions of `rgbds`, it might not be convenient to install rgbds 0.7.0 globally. Instead, you can put its files in a directory within pokered-gbc, such as `pokered-gbc/rgbds-0.7.0/`. Then specify it when you run `make`:
156+
If you have different projects that require different versions of `rgbds`, it might not be convenient to install rgbds 0.9.3 globally. Instead, you can put its files in a directory within pokered-gbc, such as `pokered-gbc/rgbds-0.9.3/`. Then specify it when you run `make`:
157157

158158
```bash
159-
make RGBDS=rgbds-0.7.0/
159+
make RGBDS=rgbds-0.9.3/
160160
```

Makefile

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ pokeblue_vc_obj := $(rom_obj:.o=_blue_vc.o)
2626

2727
### Build tools
2828

29-
ifeq (,$(shell which sha1sum))
29+
ifeq (,$(shell command -v sha1sum 2>/dev/null))
3030
SHA1 := shasum
3131
else
3232
SHA1 := sha1sum
@@ -85,7 +85,7 @@ tools:
8585
$(MAKE) -C tools/
8686

8787

88-
RGBASMFLAGS = -Q8 -P includes.asm -Weverything -Wnumeric-string=2 -Wtruncation=1
88+
RGBASMFLAGS = -Q8 -P includes.asm -Weverything -Wtruncation=1
8989
# Create a sym/map for debug purposes if `make` run with `DEBUG=1`
9090
ifeq ($(DEBUG),1)
9191
RGBASMFLAGS += -E
@@ -97,7 +97,7 @@ $(pokeblue_debug_obj): RGBASMFLAGS += -D _BLUE -D _DEBUG
9797
$(pokered_vc_obj): RGBASMFLAGS += -D _RED -D _RED_VC
9898
$(pokeblue_vc_obj): RGBASMFLAGS += -D _BLUE -D _BLUE_VC
9999

100-
%.patch: vc/%.constants.sym %_vc.gbc %.gbc vc/%.patch.template
100+
%.patch: %_vc.gbc %.gbc vc/%.patch.template
101101
tools/make_patch $*_vc.sym $^ $@
102102

103103
rgbdscheck.o: rgbdscheck.asm
@@ -125,10 +125,6 @@ $(foreach obj, $(pokeblue_debug_obj), $(eval $(call DEP,$(obj),$(obj:_blue_debug
125125
$(foreach obj, $(pokered_vc_obj), $(eval $(call DEP,$(obj),$(obj:_red_vc.o=.asm))))
126126
$(foreach obj, $(pokeblue_vc_obj), $(eval $(call DEP,$(obj),$(obj:_blue_vc.o=.asm))))
127127

128-
# Dependencies for VC files that need to run scan_includes
129-
%.constants.sym: %.constants.asm $(shell tools/scan_includes %.constants.asm) $(preinclude_deps) | rgbdscheck.o
130-
$(RGBASM) $(RGBASMFLAGS) $< > $@
131-
132128
endif
133129

134130

@@ -141,11 +137,11 @@ pokered_vc_pad = 0x00
141137
pokeblue_vc_pad = 0x00
142138
pokeblue_debug_pad = 0xff
143139

144-
pokered_opt = -Cjv -n 0 -k 01 -l 0x33 -m 0x13 -r 03 -t "POKEMON RED"
145-
pokeblue_opt = -Cjv -n 0 -k 01 -l 0x33 -m 0x13 -r 03 -t "POKEMON BLUE"
146-
pokeblue_debug_opt = -Cjv -n 0 -k 01 -l 0x33 -m 0x13 -r 03 -t "POKEMON BLUE"
147-
pokered_vc_opt = -Cjv -n 0 -k 01 -l 0x33 -m 0x13 -r 03 -t "POKEMON RED"
148-
pokeblue_vc_opt = -Cjv -n 0 -k 01 -l 0x33 -m 0x13 -r 03 -t "POKEMON BLUE"
140+
pokered_opt = -Cjv -n 0 -k 01 -l 0x33 -m MBC3+RAM+BATTERY -r 03 -t "POKEMON RED"
141+
pokeblue_opt = -Cjv -n 0 -k 01 -l 0x33 -m MBC3+RAM+BATTERY -r 03 -t "POKEMON BLUE"
142+
pokeblue_debug_opt = -Cjv -n 0 -k 01 -l 0x33 -m MBC3+RAM+BATTERY -r 03 -t "POKEMON BLUE"
143+
pokered_vc_opt = -Cjv -n 0 -k 01 -l 0x33 -m MBC3+RAM+BATTERY -r 03 -t "POKEMON RED"
144+
pokeblue_vc_opt = -Cjv -n 0 -k 01 -l 0x33 -m MBC3+RAM+BATTERY -r 03 -t "POKEMON BLUE"
149145

150146
%.gbc: $$(%_obj) layout.link
151147
$(RGBLINK) -p $($*_pad) -d -m $*.map -n $*.sym -l layout.link -o $@ $(filter %.o,$^)
@@ -182,14 +178,14 @@ gfx/trade/game_boy.2bpp: tools/gfx += --remove-duplicates
182178
%.png: ;
183179

184180
%.2bpp: %.png
185-
$(RGBGFX) $(rgbgfx) -o $@ $<
181+
$(RGBGFX) --colors dmg=e4 $(rgbgfx) -o $@ $<
186182
$(if $(tools/gfx),\
187-
tools/gfx $(tools/gfx) -o $@ $@)
183+
tools/gfx $(tools/gfx) -o $@ $@ || $$($(RM) $@ && false))
188184

189185
%.1bpp: %.png
190-
$(RGBGFX) $(rgbgfx) --depth 1 -o $@ $<
186+
$(RGBGFX) --colors dmg=e4 $(rgbgfx) --depth 1 -o $@ $<
191187
$(if $(tools/gfx),\
192-
tools/gfx $(tools/gfx) --depth 1 -o $@ $@)
188+
tools/gfx $(tools/gfx) --depth 1 -o $@ $@ || $$($(RM) $@ && false))
193189

194190
%.pic: %.2bpp
195191
tools/pkmncompress $< $@

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ To set up the repository, see [**INSTALL.md**](INSTALL.md).
1717

1818
- [**Wiki**][wiki] (includes [tutorials][tutorials])
1919
- [**Symbols**][symbols]
20+
- [**Tools**][tools]
2021

2122
You can find us on [Discord (pret, #pokered)](https://discord.gg/d5dubZ3).
2223

@@ -25,5 +26,6 @@ For other pret projects, see [pret.github.io](https://pret.github.io/).
2526
[wiki]: https://github.com/pret/pokered/wiki
2627
[tutorials]: https://github.com/pret/pokered/wiki/Tutorials
2728
[symbols]: https://github.com/pret/pokered/tree/symbols
29+
[tools]: https://github.com/pret/gb-asm-tools
2830
[ci]: https://github.com/pret/pokered/actions
2931
[ci-badge]: https://github.com/pret/pokered/actions/workflows/main.yml/badge.svg

0 commit comments

Comments
 (0)