Merge pull request #689 from mid-kid/master

Fix Mac OSX install instructions
This commit is contained in:
Rangi
2020-02-25 16:27:57 -05:00
committed by GitHub
2 changed files with 12 additions and 18 deletions

View File

@@ -57,19 +57,14 @@ Now you're ready to [build **pokecrystal**](#build-pokecrystal).
## Mac OS X ## Mac OS X
Install [**Homebrew**](https://brew.sh/). Follow the official instructions.
Open **Terminal** and enter the following commands. Open **Terminal** and enter the following commands.
To install the **Xcode Command Line Tools**:
```bash
xcode-select --install
```
To install **rgbds**: To install **rgbds**:
```bash ```bash
git clone --depth=1 https://github.com/rednex/rgbds brew install rgbds
sudo make -C rgbds CFLAGS=-O2 install
``` ```
Now you're ready to [build **pokecrystal**](#build-pokecrystal). Now you're ready to [build **pokecrystal**](#build-pokecrystal).
@@ -91,7 +86,7 @@ To install **rgbds**:
```bash ```bash
sudo apt-get install pkg-config flex bison libpng-dev sudo apt-get install pkg-config flex bison libpng-dev
git clone --depth=1 https://github.com/rednex/rgbds git clone -b v0.3.9 --depth=1 https://github.com/rednex/rgbds
sudo make -C rgbds CFLAGS=-O2 install sudo make -C rgbds CFLAGS=-O2 install
``` ```
@@ -107,7 +102,7 @@ To install **rgbds**:
```bash ```bash
sudo zypper install pkg-config flex bison libpng16-devel sudo zypper install pkg-config flex bison libpng16-devel
git clone --depth=1 https://github.com/rednex/rgbds git clone -b v0.3.9 --depth=1 https://github.com/rednex/rgbds
sudo make -C rgbds CFLAGS=-O2 install sudo make -C rgbds CFLAGS=-O2 install
``` ```
@@ -125,7 +120,7 @@ Alternatively, to install **rgbds** manually:
```bash ```bash
sudo pacman -S pkg-config flex bison libpng sudo pacman -S pkg-config flex bison libpng
git clone --depth=1 https://github.com/rednex/rgbds git clone -b v0.3.9 --depth=1 https://github.com/rednex/rgbds
sudo make -C rgbds CFLAGS=-O2 install sudo make -C rgbds CFLAGS=-O2 install
``` ```
@@ -162,7 +157,7 @@ If `rgbds` is not available, you'll also need these:
To install **rgbds**: To install **rgbds**:
```bash ```bash
git clone --depth=1 https://github.com/rednex/rgbds git clone -b v0.3.9 --depth=1 https://github.com/rednex/rgbds
sudo make -C rgbds CFLAGS=-O2 install sudo make -C rgbds CFLAGS=-O2 install
``` ```

View File

@@ -136,15 +136,14 @@ Function140ae:
.time_overflow .time_overflow
farcall ClearDailyTimers farcall ClearDailyTimers
farcall Function170923 farcall Function170923
; mobile ld a, BANK(s5_aa8c) ; and BANK(s5_b2fa)
ld a, 5 ; MBC30 bank used by JP Crystal; inaccessible by MBC3
call GetSRAMBank call GetSRAMBank
ld a, [$aa8c] ; address of MBC30 bank ld a, [s5_aa8c]
inc a inc a
ld [$aa8c], a ; address of MBC30 bank ld [s5_aa8c], a
ld a, [$b2fa] ; address of MBC30 bank ld a, [s5_b2fa]
inc a inc a
ld [$b2fa], a ; address of MBC30 bank ld [s5_b2fa], a
call CloseSRAM call CloseSRAM
ret ret