mirror of
https://github.com/pret/pokered.git
synced 2024-10-22 22:55:31 +00:00
Require rgbds 0.4.2
This commit is contained in:
parent
f38ee046c0
commit
fc3bbc1358
3 changed files with 34 additions and 13 deletions
|
@ -5,7 +5,7 @@ os:
|
|||
install:
|
||||
- |-
|
||||
( cd
|
||||
git clone -b v0.4.1 --depth=1 https://github.com/gbdev/rgbds
|
||||
git clone -b v0.4.2 --depth=1 https://github.com/gbdev/rgbds
|
||||
sudo make -C rgbds install
|
||||
rm -rf rgbds
|
||||
)
|
||||
|
|
18
INSTALL.md
18
INSTALL.md
|
@ -42,9 +42,9 @@ Run setup and leave the default settings. At the "**Select Packages**" step, cho
|
|||
|
||||
Double click on the text that says "**Skip**" next to each package to select the most recent version to install.
|
||||
|
||||
Then follow the [**rgbds** install instructions](https://rgbds.gbdev.io/install/windows) for Windows with Cygwin to install **rgbds 0.4.1**.
|
||||
Then follow the [**rgbds** install instructions](https://rgbds.gbdev.io/install/windows) for Windows with Cygwin to install **rgbds 0.4.2**.
|
||||
|
||||
**Note:** If you already have an older rgbds, you will need to update to 0.4.1. Ignore this if you have never installed rgbds before. If a version newer than 0.4.1 does not work, try downloading 0.4.1.
|
||||
**Note:** If you already have an older rgbds, you will need to update to 0.4.2. Ignore this if you have never installed rgbds before. If a version newer than 0.4.2 does not work, try downloading 0.4.2.
|
||||
|
||||
Now open the **Cygwin terminal** and enter the following commands.
|
||||
|
||||
|
@ -67,7 +67,7 @@ Install [**Homebrew**](https://brew.sh/). Follow the official instructions.
|
|||
|
||||
Open **Terminal** and prepare to enter commands.
|
||||
|
||||
Then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install/macos) for macOS to install **rgbds 0.4.1**.
|
||||
Then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install/macos) for macOS to install **rgbds 0.4.2**.
|
||||
|
||||
Now you're ready to [build **pokered**](#build-pokered).
|
||||
|
||||
|
@ -84,7 +84,7 @@ To install the software required for **pokered**:
|
|||
sudo apt-get install make gcc git
|
||||
```
|
||||
|
||||
Then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install/source) to build **rgbds 0.4.1** from source.
|
||||
Then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install/source) to build **rgbds 0.4.2** from source.
|
||||
|
||||
### OpenSUSE
|
||||
|
||||
|
@ -94,7 +94,7 @@ To install the software required for **pokered**:
|
|||
sudo zypper install make gcc git
|
||||
```
|
||||
|
||||
Then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install/source) to build **rgbds 0.4.1** from source.
|
||||
Then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install/source) to build **rgbds 0.4.2** from source.
|
||||
|
||||
### Arch Linux
|
||||
|
||||
|
@ -104,9 +104,9 @@ To install the software required for **pokered**:
|
|||
sudo pacman -S make gcc git
|
||||
```
|
||||
|
||||
Then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install/arch) for Arch Linux to install **rgbds 0.4.1**.
|
||||
Then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install/arch) for Arch Linux to install **rgbds 0.4.2**.
|
||||
|
||||
If you want to compile and install **rgbds** yourself instead, then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install/source) to build **rgbds 0.4.1** from source.
|
||||
If you want to compile and install **rgbds** yourself instead, then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install/source) to build **rgbds 0.4.2** from source.
|
||||
|
||||
### Termux
|
||||
|
||||
|
@ -122,7 +122,7 @@ To install **rgbds**:
|
|||
sudo apt install rgbds
|
||||
```
|
||||
|
||||
If you want to compile and install **rgbds** yourself instead, then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install/source) to build **rgbds 0.4.1** from source.
|
||||
If you want to compile and install **rgbds** yourself instead, then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install/source) to build **rgbds 0.4.2** from source.
|
||||
|
||||
### Other distros
|
||||
|
||||
|
@ -133,7 +133,7 @@ If your distro is not listed here, try to find the required software in its repo
|
|||
- `git`
|
||||
- `rgbds`
|
||||
|
||||
If `rgbds` is not available, you'll need to follow the [**rgbds** instructions](https://rgbds.gbdev.io/install/source) to build **rgbds 0.4.1** from source.
|
||||
If `rgbds` is not available, you'll need to follow the [**rgbds** instructions](https://rgbds.gbdev.io/install/source) to build **rgbds 0.4.2** from source.
|
||||
|
||||
Now you're ready to [build **pokered**](#build-pokered).
|
||||
|
||||
|
|
|
@ -82,17 +82,38 @@ for objfile in objects:
|
|||
elif magic == b'RGB9':
|
||||
obj_ver = 10 + unpack_file("<I", f)[0]
|
||||
|
||||
if obj_ver not in [6, 10, 11, 12, 13, 15]:
|
||||
if obj_ver not in [6, 10, 11, 12, 13, 15, 16]:
|
||||
print("Error: File '%s' is of an unknown format." % objfile, file=stderr)
|
||||
exit(1)
|
||||
|
||||
num_symbols = unpack_file("<II", f)[0]
|
||||
num_symbols = unpack_file("<I", f)[0]
|
||||
unpack_file("<I", f) # skip num sections
|
||||
|
||||
if obj_ver in [16]:
|
||||
node_filenames = []
|
||||
num_nodes = unpack_file("<I", f)[0]
|
||||
for x in range(num_nodes):
|
||||
unpack_file("<II", f) # parent id, parent line no
|
||||
node_type = unpack_file("<B", f)[0]
|
||||
if node_type:
|
||||
node_filenames.append(read_string(f))
|
||||
else:
|
||||
node_filenames.append("rept")
|
||||
depth = unpack_file("<I", f)[0]
|
||||
for i in range(depth):
|
||||
unpack_file("<I", f) # rept iterations
|
||||
node_filenames.reverse()
|
||||
|
||||
for x in range(num_symbols):
|
||||
sym_name = read_string(f)
|
||||
sym_type = symtype(unpack_file("<B", f)[0] & 0x7f)
|
||||
if sym_type == symtype.IMPORT:
|
||||
continue
|
||||
sym_filename = read_string(f)
|
||||
if obj_ver in [16]:
|
||||
sym_fileno = unpack_file("<I", f)[0]
|
||||
sym_filename = node_filenames[sym_fileno]
|
||||
else:
|
||||
sym_filename = read_string(f)
|
||||
unpack_file("<III", f)
|
||||
if sym_name not in symbols:
|
||||
continue
|
||||
|
|
Loading…
Reference in a new issue