pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-04-09 05:44:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #705 from Rangi42/master

Browse Source 
Upgrade to rgbds 0.4.0, and do miscellaneous fixes
This commit is contained in:
Rangi
2020-04-06 12:41:44 -04:00
committed by GitHub
parent e225d296b7 3144b54bd1
commit 9076d63d62
38 changed files with 2048 additions and 2056 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
FAQ.md
View File

@ -8,6 +8,7 @@
- [I can't build the ROM, `make` just prints an error!](#i-cant-build-the-rom-make-just-prints-an-error) - [I can't build the ROM, `make` just prints an error!](#i-cant-build-the-rom-make-just-prints-an-error)
- [`gcc`: command not found](#gcc-command-not-found) - [`gcc`: command not found](#gcc-command-not-found)
- ["ERROR: `UNION` already defined"](#error-union-already-defined) - ["ERROR: `UNION` already defined"](#error-union-already-defined)
- ["ERROR: Macro not defined"](#error-macro-not-defined)
- ["Expression must be 8-bit"](#expression-must-be-8-bit) - ["Expression must be 8-bit"](#expression-must-be-8-bit)
- ["Segmentation fault" from `rgbgfx`](#segmentation-fault-from-rgbgfx) - ["Segmentation fault" from `rgbgfx`](#segmentation-fault-from-rgbgfx)
- ["Section is too big" or "Unable to place section in bank"](#section-is-too-big-or-unable-to-place-section-in-bank) - ["Section is too big" or "Unable to place section in bank"](#section-is-too-big-or-unable-to-place-section-in-bank)
@ -16,6 +17,7 @@
- [How do I edit maps?](#how-do-i-edit-maps) - [How do I edit maps?](#how-do-i-edit-maps)
- [How do I edit the colors of an image?](#how-do-i-edit-the-colors-of-an-image) - [How do I edit the colors of an image?](#how-do-i-edit-the-colors-of-an-image)
- [How do I write new features?](#how-do-i-write-new-features) - [How do I write new features?](#how-do-i-write-new-features)
- [How do I share code on Discord?](#how-do-i-share-code-on-discord)
- [I need more help!](#i-need-more-help) - [I need more help!](#i-need-more-help)
@ -38,11 +40,15 @@ You need to install `gcc`. If you're using Cygwin, re-run its setup, and at "Sel
### "ERROR: `UNION` already defined" ### "ERROR: `UNION` already defined"
Download [**rgbds 0.3.9**][rgbds] or newer. Older versions will not work. Download [**rgbds 0.4.0**][rgbds] or newer. Older versions will not work.
### "ERROR: Macro not defined"
Download [**rgbds 0.4.0**][rgbds] or newer. Older versions will not work.
### "Expression must be 8-bit" ### "Expression must be 8-bit"
Download [**rgbds 0.3.9**][rgbds] or newer. Older versions will not work. Download [**rgbds 0.4.0**][rgbds] or newer. Older versions will not work.
### "Segmentation fault" from `rgbgfx` ### "Segmentation fault" from `rgbgfx`
@ -84,9 +90,20 @@ It really depends on what image you're trying to change the colors of, where the
There are a number of special-purpose scripting languages, as described in [docs](https://pret.github.io/pokecrystal/). For more general features, you'll need to code directly in [assembly language][asm]. Some of the [tutorials][tutorials] for specific features may also be helpful. There are a number of special-purpose scripting languages, as described in [docs](https://pret.github.io/pokecrystal/). For more general features, you'll need to code directly in [assembly language][asm]. Some of the [tutorials][tutorials] for specific features may also be helpful.
## How do I share code on Discord?
If you're looking for help on Discord, you'll probably need to share your code. How to do this:
- Post *short* pieces of code in Discord messages, surrounded with three <code>\`\`\`backticks\`\`\`</code> to make a [code block][markdown].
- Post longer pieces of code by linking to [GitHub Gist][gist], [Pastebin][pastebin], [Hastebin][hastebin], or other such sites.
- Share your entire pokecrystal project at once by hosting it on GitHub as a fork of this repository. Read the [GitHub Help][forkhelp] for details.
If your code is on GitHub, you can [link to specific lines][snippethelp]. Put "`#L42`" at the end of a URL to link to line 42, or "`#L10-L20`" to link to lines 10-20. For example: [https://github.com/pret/pokecrystal/blob/master/main.asm#L21-L26](https://github.com/pret/pokecrystal/blob/master/main.asm#L21-L26)
## I need more help! ## I need more help!
Try asking on IRC or Discord (see [README.md](README.md)). Try asking on Discord or IRC (see [README.md](README.md)).
[cygwin]: https://cygwin.com/install.html [cygwin]: https://cygwin.com/install.html
[rgbds]: https://github.com/rednex/rgbds/releases [rgbds]: https://github.com/rednex/rgbds/releases
@ -97,3 +114,9 @@ Try asking on IRC or Discord (see [README.md](README.md)).
[irfanview]: https://www.irfanview.com/ [irfanview]: https://www.irfanview.com/
[asm]: https://github.com/pret/pokecrystal/wiki/Assembly-programming [asm]: https://github.com/pret/pokecrystal/wiki/Assembly-programming
[tutorials]: https://github.com/pret/pokecrystal/wiki/Tutorials [tutorials]: https://github.com/pret/pokecrystal/wiki/Tutorials
[markdown]: https://support.discordapp.com/hc/en-us/articles/210298617
[gist]: https://gist.github.com/
[pastebin]: https://pastebin.com/
[hastebin]: https://hastebin.com/
[forkhelp]: https://help.github.com/en/github/getting-started-with-github/fork-a-repo
[snippethelp]: https://help.github.com/en/github/managing-your-work-on-github/creating-a-permanent-link-to-a-code-snippet

18
INSTALL.md
View File

@ -38,7 +38,7 @@ Double click on the text that says "**Skip**" next to each package to select the
Then download [**rgbds**](https://github.com/rednex/rgbds/releases/): the latest **win64.zip** or **win32.zip** release. Extract it and put all the `exe` and `dll` files individually in **C:\cygwin64\usr\local\bin**. Then download [**rgbds**](https://github.com/rednex/rgbds/releases/): the latest **win64.zip** or **win32.zip** release. Extract it and put all the `exe` and `dll` files individually in **C:\cygwin64\usr\local\bin**.
**Note: If you already have an older rgbds, you will need to update to 0.3.9.** Ignore this if you have never installed rgbds before. If a version newer than 0.3.9 does not work, try downloading 0.3.9. **Note: If you already have an older rgbds, you will need to update to 0.4.0.** Ignore this if you have never installed rgbds before. If a version newer than 0.4.0 does not work, try downloading 0.4.0.
Now open the **Cygwin terminal** and enter the following commands. Now open the **Cygwin terminal** and enter the following commands.
@ -86,8 +86,8 @@ 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 -b v0.3.9 --depth=1 https://github.com/rednex/rgbds git clone -b v0.4.0 --depth=1 https://github.com/rednex/rgbds
sudo make -C rgbds CFLAGS=-O2 install sudo make -C rgbds install
``` ```
### OpenSUSE ### OpenSUSE
@ -102,8 +102,8 @@ 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 -b v0.3.9 --depth=1 https://github.com/rednex/rgbds git clone -b v0.4.0 --depth=1 https://github.com/rednex/rgbds
sudo make -C rgbds CFLAGS=-O2 install sudo make -C rgbds install
``` ```
### Arch Linux ### Arch Linux
@ -120,8 +120,8 @@ 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 -b v0.3.9 --depth=1 https://github.com/rednex/rgbds git clone -b v0.4.0 --depth=1 https://github.com/rednex/rgbds
sudo make -C rgbds CFLAGS=-O2 install sudo make -C rgbds install
``` ```
### Termux ### Termux
@ -157,8 +157,8 @@ If `rgbds` is not available, you'll also need these:
To install **rgbds**: To install **rgbds**:
```bash ```bash
git clone -b v0.3.9 --depth=1 https://github.com/rednex/rgbds git clone -b v0.4.0 --depth=1 https://github.com/rednex/rgbds
sudo make -C rgbds CFLAGS=-O2 install sudo make -C rgbds install
``` ```
Now you're ready to [build **pokecrystal**](#build-pokecrystal). Now you're ready to [build **pokecrystal**](#build-pokecrystal).

12
Makefile
View File

@ -66,16 +66,17 @@ tools:
$(MAKE) -C tools/ $(MAKE) -C tools/
$(crystal_obj): RGBASMFLAGS = RGBASMFLAGS = -L -Weverything
$(crystal11_obj): RGBASMFLAGS = -D _CRYSTAL11 $(crystal_obj): RGBASMFLAGS +=
$(crystal_au_obj): RGBASMFLAGS = -D _CRYSTAL11 -D _CRYSTAL_AU $(crystal11_obj): RGBASMFLAGS += -D _CRYSTAL11
$(crystal_au_obj): RGBASMFLAGS += -D _CRYSTAL11 -D _CRYSTAL_AU
# The dep rules have to be explicit or else missing files won't be reported. # The dep rules have to be explicit or else missing files won't be reported.
# As a side effect, they're evaluated immediately instead of when the rule is invoked. # As a side effect, they're evaluated immediately instead of when the rule is invoked.
# It doesn't look like $(shell) can be deferred so there might not be a better way. # It doesn't look like $(shell) can be deferred so there might not be a better way.
define DEP define DEP
$1: $2 $$(shell tools/scan_includes $2) $1: $2 $$(shell tools/scan_includes $2)
$$(RGBASM) $$(RGBASMFLAGS) -L -o $$@ $$< $$(RGBASM) $$(RGBASMFLAGS) -o $$@ $$<
endef endef
# Build tools when building the rom. # Build tools when building the rom.
@ -94,17 +95,14 @@ endif
pokecrystal.gbc: $(crystal_obj) pokecrystal.link pokecrystal.gbc: $(crystal_obj) pokecrystal.link
$(RGBLINK) -n pokecrystal.sym -m pokecrystal.map -l pokecrystal.link -o $@ $(crystal_obj) $(RGBLINK) -n pokecrystal.sym -m pokecrystal.map -l pokecrystal.link -o $@ $(crystal_obj)
$(RGBFIX) -Cjv -i BYTE -k 01 -l 0x33 -m 0x10 -p 0 -r 3 -t PM_CRYSTAL $@ $(RGBFIX) -Cjv -i BYTE -k 01 -l 0x33 -m 0x10 -p 0 -r 3 -t PM_CRYSTAL $@
tools/sort_symfile.sh pokecrystal.sym
pokecrystal11.gbc: $(crystal11_obj) pokecrystal.link pokecrystal11.gbc: $(crystal11_obj) pokecrystal.link
$(RGBLINK) -n pokecrystal11.sym -m pokecrystal11.map -l pokecrystal.link -o $@ $(crystal11_obj) $(RGBLINK) -n pokecrystal11.sym -m pokecrystal11.map -l pokecrystal.link -o $@ $(crystal11_obj)
$(RGBFIX) -Cjv -i BYTE -k 01 -l 0x33 -m 0x10 -n 1 -p 0 -r 3 -t PM_CRYSTAL $@ $(RGBFIX) -Cjv -i BYTE -k 01 -l 0x33 -m 0x10 -n 1 -p 0 -r 3 -t PM_CRYSTAL $@
tools/sort_symfile.sh pokecrystal11.sym
pokecrystal-au.gbc: $(crystal_au_obj) pokecrystal.link pokecrystal-au.gbc: $(crystal_au_obj) pokecrystal.link
$(RGBLINK) -n pokecrystal-au.sym -m pokecrystal-au.map -l pokecrystal.link -o $@ $(crystal_au_obj) $(RGBLINK) -n pokecrystal-au.sym -m pokecrystal-au.map -l pokecrystal.link -o $@ $(crystal_au_obj)
$(RGBFIX) -Cjv -i BYTU -k 01 -l 0x33 -m 0x10 -p 0 -r 3 -t PM_CRYSTAL $@ $(RGBFIX) -Cjv -i BYTU -k 01 -l 0x33 -m 0x10 -p 0 -r 3 -t PM_CRYSTAL $@
tools/sort_symfile.sh pokecrystal-au.sym
# For files that the compressor can't match, there will be a .lz file suffixed with the md5 hash of the correct uncompressed file. # For files that the compressor can't match, there will be a .lz file suffixed with the md5 hash of the correct uncompressed file.

4
constants.asm
View File

@ -1,3 +1,7 @@
if __RGBDS_MAJOR__ <= 0 && __RGBDS_MINOR__ < 4
fail "pokecrystal requires rgbds 0.4.0 or newer."
endc
INCLUDE "charmap.asm" INCLUDE "charmap.asm"
INCLUDE "macros.asm" INCLUDE "macros.asm"

6
constants/item_constants.asm
View File

@ -202,8 +202,7 @@ if !DEF(TM01)
TM01 EQU const_value TM01 EQU const_value
enum_start 1 enum_start 1
endc endc
define _\@_1, "TM_\1" const TM_\1
const _\@_1
enum \1_TMNUM enum \1_TMNUM
ENDM ENDM
@ -266,8 +265,7 @@ add_hm: MACRO
if !DEF(HM01) if !DEF(HM01)
HM01 EQU const_value HM01 EQU const_value
endc endc
define _\@_1, "HM_\1" const HM_\1
const _\@_1
enum \1_TMNUM enum \1_TMNUM
ENDM ENDM

1396
data/battle_anims/oam.asm
View File

File diff suppressed because it is too large Load Diff

1508
data/sprite_anims/oam.asm
View File

File diff suppressed because it is too large Load Diff

28
engine/events/heal_machine_anim.asm
View File

@ -134,25 +134,25 @@ ENDM
ret ret
.PC_ElmsLab_OAM: .PC_ElmsLab_OAM:
dsprite 4, 0, 4, 2, $7c, PAL_OW_TREE | OBP_NUM dbsprite 4, 4, 2, 0, $7c, PAL_OW_TREE | OBP_NUM
dsprite 4, 0, 4, 6, $7c, PAL_OW_TREE | OBP_NUM dbsprite 4, 4, 6, 0, $7c, PAL_OW_TREE | OBP_NUM
dsprite 4, 6, 4, 0, $7d, PAL_OW_TREE | OBP_NUM dbsprite 4, 4, 0, 6, $7d, PAL_OW_TREE | OBP_NUM
dsprite 4, 6, 5, 0, $7d, PAL_OW_TREE | OBP_NUM | X_FLIP dbsprite 5, 4, 0, 6, $7d, PAL_OW_TREE | OBP_NUM | X_FLIP
dsprite 5, 3, 4, 0, $7d, PAL_OW_TREE | OBP_NUM dbsprite 4, 5, 0, 3, $7d, PAL_OW_TREE | OBP_NUM
dsprite 5, 3, 5, 0, $7d, PAL_OW_TREE | OBP_NUM | X_FLIP dbsprite 5, 5, 0, 3, $7d, PAL_OW_TREE | OBP_NUM | X_FLIP
dsprite 6, 0, 4, 0, $7d, PAL_OW_TREE | OBP_NUM dbsprite 4, 6, 0, 0, $7d, PAL_OW_TREE | OBP_NUM
dsprite 6, 0, 5, 0, $7d, PAL_OW_TREE | OBP_NUM | X_FLIP dbsprite 5, 6, 0, 0, $7d, PAL_OW_TREE | OBP_NUM | X_FLIP
.HealMachineGFX: .HealMachineGFX:
INCBIN "gfx/overworld/heal_machine.2bpp" INCBIN "gfx/overworld/heal_machine.2bpp"
.HOF_OAM: .HOF_OAM:
dsprite 7, 4, 10, 1, $7d, PAL_OW_TREE | OBP_NUM dbsprite 10, 7, 1, 4, $7d, PAL_OW_TREE | OBP_NUM
dsprite 7, 4, 10, 6, $7d, PAL_OW_TREE | OBP_NUM dbsprite 10, 7, 6, 4, $7d, PAL_OW_TREE | OBP_NUM
dsprite 7, 3, 9, 5, $7d, PAL_OW_TREE | OBP_NUM dbsprite 9, 7, 5, 3, $7d, PAL_OW_TREE | OBP_NUM
dsprite 7, 3, 11, 2, $7d, PAL_OW_TREE | OBP_NUM dbsprite 11, 7, 2, 3, $7d, PAL_OW_TREE | OBP_NUM
dsprite 7, 1, 9, 1, $7d, PAL_OW_TREE | OBP_NUM dbsprite 9, 7, 1, 1, $7d, PAL_OW_TREE | OBP_NUM
dsprite 7, 1, 11, 5, $7d, PAL_OW_TREE | OBP_NUM dbsprite 11, 7, 5, 1, $7d, PAL_OW_TREE | OBP_NUM
.LoadPalettes: .LoadPalettes:
call IsCGB call IsCGB

4
engine/events/overworld.asm
View File

@ -750,13 +750,13 @@ Script_AskWaterfall:
EscapeRopeFunction: EscapeRopeFunction:
call FieldMoveJumptableReset call FieldMoveJumptableReset
ld a, $1 ld a, $1
jr dig_incave jr EscapeRopeOrDig
DigFunction: DigFunction:
call FieldMoveJumptableReset call FieldMoveJumptableReset
ld a, $2 ld a, $2
dig_incave EscapeRopeOrDig:
ld [wBuffer2], a ld [wBuffer2], a
.loop .loop
ld hl, .DigTable ld hl, .DigTable

284
engine/games/card_flip.asm
View File

@ -1158,29 +1158,29 @@ PlaceOAMCardBorder:
.SpriteData: .SpriteData:
db 18 db 18
dsprite 0, 0, 0, 0, $04, 0 dbsprite 0, 0, 0, 0, $04, 0
dsprite 0, 0, 1, 0, $06, 0 dbsprite 1, 0, 0, 0, $06, 0
dsprite 0, 0, 2, 0, $06, 0 dbsprite 2, 0, 0, 0, $06, 0
dsprite 0, 0, 3, 0, $06, 0 dbsprite 3, 0, 0, 0, $06, 0
dsprite 0, 0, 4, 0, $04, 0 | X_FLIP dbsprite 4, 0, 0, 0, $04, 0 | X_FLIP
dsprite 1, 0, 0, 0, $05, 0 dbsprite 0, 1, 0, 0, $05, 0
dsprite 1, 0, 4, 0, $05, 0 | X_FLIP dbsprite 4, 1, 0, 0, $05, 0 | X_FLIP
dsprite 2, 0, 0, 0, $05, 0 dbsprite 0, 2, 0, 0, $05, 0
dsprite 2, 0, 4, 0, $05, 0 | X_FLIP dbsprite 4, 2, 0, 0, $05, 0 | X_FLIP
dsprite 3, 0, 0, 0, $05, 0 dbsprite 0, 3, 0, 0, $05, 0
dsprite 3, 0, 4, 0, $05, 0 | X_FLIP dbsprite 4, 3, 0, 0, $05, 0 | X_FLIP
dsprite 4, 0, 0, 0, $05, $00 dbsprite 0, 4, 0, 0, $05, $00
dsprite 4, 0, 4, 0, $05, 0 | X_FLIP dbsprite 4, 4, 0, 0, $05, 0 | X_FLIP
dsprite 5, 0, 0, 0, $04, 0 | Y_FLIP dbsprite 0, 5, 0, 0, $04, 0 | Y_FLIP
dsprite 5, 0, 1, 0, $06, 0 | Y_FLIP dbsprite 1, 5, 0, 0, $06, 0 | Y_FLIP
dsprite 5, 0, 2, 0, $06, 0 | Y_FLIP dbsprite 2, 5, 0, 0, $06, 0 | Y_FLIP
dsprite 5, 0, 3, 0, $06, 0 | Y_FLIP dbsprite 3, 5, 0, 0, $06, 0 | Y_FLIP
dsprite 5, 0, 4, 0, $04, 0 | X_FLIP | Y_FLIP dbsprite 4, 5, 0, 0, $04, 0 | X_FLIP | Y_FLIP
ChooseCard_HandleJoypad: ChooseCard_HandleJoypad:
ld hl, hJoyLast ld hl, hJoyLast
@ -1413,145 +1413,145 @@ ENDM
.SingleTile: .SingleTile:
db 6 db 6
dsprite 0, 0, -1, 7, $00, 0 | PRIORITY dbsprite -1, 0, 7, 0, $00, 0 | PRIORITY
dsprite 0, 0, 0, 0, $02, 0 | PRIORITY dbsprite 0, 0, 0, 0, $02, 0 | PRIORITY
dsprite 0, 0, 1, 0, $03, 0 | PRIORITY dbsprite 1, 0, 0, 0, $03, 0 | PRIORITY
dsprite 0, 5, -1, 7, $00, 0 | Y_FLIP | PRIORITY dbsprite -1, 0, 7, 5, $00, 0 | Y_FLIP | PRIORITY
dsprite 0, 5, 0, 0, $02, 0 | Y_FLIP | PRIORITY dbsprite 0, 0, 0, 5, $02, 0 | Y_FLIP | PRIORITY
dsprite 0, 5, 1, 0, $03, 0 | PRIORITY dbsprite 1, 0, 0, 5, $03, 0 | PRIORITY
.PokeGroup: .PokeGroup:
db 26 db 26
dsprite 0, 0, -1, 7, $00, 0 | PRIORITY dbsprite -1, 0, 7, 0, $00, 0 | PRIORITY
dsprite 0, 0, 0, 0, $02, 0 | PRIORITY dbsprite 0, 0, 0, 0, $02, 0 | PRIORITY
dsprite 0, 0, 1, 0, $00, 0 | X_FLIP | PRIORITY dbsprite 1, 0, 0, 0, $00, 0 | X_FLIP | PRIORITY
dsprite 1, 0, -1, 7, $01, 0 | PRIORITY dbsprite -1, 1, 7, 0, $01, 0 | PRIORITY
dsprite 1, 0, 1, 0, $01, 0 | X_FLIP | PRIORITY dbsprite 1, 1, 0, 0, $01, 0 | X_FLIP | PRIORITY
dsprite 2, 0, -1, 7, $01, 0 | PRIORITY dbsprite -1, 2, 7, 0, $01, 0 | PRIORITY
dsprite 2, 0, 1, 0, $03, 0 | PRIORITY dbsprite 1, 2, 0, 0, $03, 0 | PRIORITY
dsprite 3, 0, -1, 7, $01, 0 | PRIORITY dbsprite -1, 3, 7, 0, $01, 0 | PRIORITY
dsprite 3, 0, 1, 0, $03, 0 | PRIORITY dbsprite 1, 3, 0, 0, $03, 0 | PRIORITY
dsprite 4, 0, -1, 7, $01, 0 | PRIORITY dbsprite -1, 4, 7, 0, $01, 0 | PRIORITY
dsprite 4, 0, 1, 0, $03, 0 | PRIORITY dbsprite 1, 4, 0, 0, $03, 0 | PRIORITY
dsprite 5, 0, -1, 7, $01, 0 | PRIORITY dbsprite -1, 5, 7, 0, $01, 0 | PRIORITY
dsprite 5, 0, 1, 0, $03, 0 | PRIORITY dbsprite 1, 5, 0, 0, $03, 0 | PRIORITY
dsprite 6, 0, -1, 7, $01, 0 | PRIORITY dbsprite -1, 6, 7, 0, $01, 0 | PRIORITY
dsprite 6, 0, 1, 0, $03, 0 | PRIORITY dbsprite 1, 6, 0, 0, $03, 0 | PRIORITY
dsprite 7, 0, -1, 7, $01, 0 | PRIORITY dbsprite -1, 7, 7, 0, $01, 0 | PRIORITY
dsprite 7, 0, 1, 0, $03, 0 | PRIORITY dbsprite 1, 7, 0, 0, $03, 0 | PRIORITY
dsprite 8, 0, -1, 7, $01, 0 | PRIORITY dbsprite -1, 8, 7, 0, $01, 0 | PRIORITY
dsprite 8, 0, 1, 0, $03, 0 | PRIORITY dbsprite 1, 8, 0, 0, $03, 0 | PRIORITY
dsprite 9, 0, -1, 7, $01, 0 | PRIORITY dbsprite -1, 9, 7, 0, $01, 0 | PRIORITY
dsprite 9, 0, 1, 0, $03, 0 | PRIORITY dbsprite 1, 9, 0, 0, $03, 0 | PRIORITY
dsprite 10, 0, -1, 7, $01, 0 | PRIORITY dbsprite -1, 10, 7, 0, $01, 0 | PRIORITY
dsprite 10, 0, 1, 0, $03, 0 | PRIORITY dbsprite 1, 10, 0, 0, $03, 0 | PRIORITY
dsprite 10, 1, -1, 7, $00, 0 | Y_FLIP | PRIORITY dbsprite -1, 10, 7, 1, $00, 0 | Y_FLIP | PRIORITY
dsprite 10, 1, 0, 0, $02, 0 | Y_FLIP | PRIORITY dbsprite 0, 10, 0, 1, $02, 0 | Y_FLIP | PRIORITY
dsprite 10, 1, 1, 0, $03, 0 | PRIORITY dbsprite 1, 10, 0, 1, $03, 0 | PRIORITY
.NumGroup: .NumGroup:
db 20 db 20
dsprite 0, 0, -1, 7, $00, 0 | PRIORITY dbsprite -1, 0, 7, 0, $00, 0 | PRIORITY
dsprite 0, 0, 0, 0, $02, 0 | PRIORITY dbsprite 0, 0, 0, 0, $02, 0 | PRIORITY
dsprite 0, 0, 1, 0, $02, 0 | PRIORITY dbsprite 1, 0, 0, 0, $02, 0 | PRIORITY
dsprite 0, 0, 2, 0, $03, 0 | PRIORITY dbsprite 2, 0, 0, 0, $03, 0 | PRIORITY
dsprite 0, 0, 3, 0, $02, 0 | PRIORITY dbsprite 3, 0, 0, 0, $02, 0 | PRIORITY
dsprite 0, 0, 4, 0, $03, 0 | PRIORITY dbsprite 4, 0, 0, 0, $03, 0 | PRIORITY
dsprite 0, 0, 5, 0, $02, 0 | PRIORITY dbsprite 5, 0, 0, 0, $02, 0 | PRIORITY
dsprite 0, 0, 6, 0, $03, 0 | PRIORITY dbsprite 6, 0, 0, 0, $03, 0 | PRIORITY
dsprite 0, 0, 7, 0, $02, 0 | PRIORITY dbsprite 7, 0, 0, 0, $02, 0 | PRIORITY
dsprite 0, 0, 8, 0, $03, 0 | PRIORITY dbsprite 8, 0, 0, 0, $03, 0 | PRIORITY
dsprite 0, 5, -1, 7, $00, 0 | Y_FLIP | PRIORITY dbsprite -1, 0, 7, 5, $00, 0 | Y_FLIP | PRIORITY
dsprite 0, 5, 0, 0, $02, 0 | Y_FLIP | PRIORITY dbsprite 0, 0, 0, 5, $02, 0 | Y_FLIP | PRIORITY
dsprite 0, 5, 1, 0, $02, 0 | Y_FLIP | PRIORITY dbsprite 1, 0, 0, 5, $02, 0 | Y_FLIP | PRIORITY
dsprite 0, 5, 2, 0, $03, 0 | PRIORITY dbsprite 2, 0, 0, 5, $03, 0 | PRIORITY
dsprite 0, 5, 3, 0, $02, 0 | Y_FLIP | PRIORITY dbsprite 3, 0, 0, 5, $02, 0 | Y_FLIP | PRIORITY
dsprite 0, 5, 4, 0, $03, 0 | PRIORITY dbsprite 4, 0, 0, 5, $03, 0 | PRIORITY
dsprite 0, 5, 5, 0, $02, 0 | Y_FLIP | PRIORITY dbsprite 5, 0, 0, 5, $02, 0 | Y_FLIP | PRIORITY
dsprite 0, 5, 6, 0, $03, 0 | PRIORITY dbsprite 6, 0, 0, 5, $03, 0 | PRIORITY
dsprite 0, 5, 7, 0, $02, 0 | Y_FLIP | PRIORITY dbsprite 7, 0, 0, 5, $02, 0 | Y_FLIP | PRIORITY
dsprite 0, 5, 8, 0, $03, 0 | PRIORITY dbsprite 8, 0, 0, 5, $03, 0 | PRIORITY
.NumGroupPair: .NumGroupPair:
db 30 db 30
dsprite 0, 0, 0, 0, $00, 0 | PRIORITY dbsprite 0, 0, 0, 0, $00, 0 | PRIORITY
dsprite 0, 0, 1, 0, $02, 0 | PRIORITY dbsprite 1, 0, 0, 0, $02, 0 | PRIORITY
dsprite 0, 0, 2, 0, $02, 0 | PRIORITY dbsprite 2, 0, 0, 0, $02, 0 | PRIORITY
dsprite 0, 0, 3, 0, $03, 0 | PRIORITY dbsprite 3, 0, 0, 0, $03, 0 | PRIORITY
dsprite 0, 0, 4, 0, $02, 0 | PRIORITY dbsprite 4, 0, 0, 0, $02, 0 | PRIORITY
dsprite 0, 0, 5, 0, $03, 0 | PRIORITY dbsprite 5, 0, 0, 0, $03, 0 | PRIORITY
dsprite 0, 0, 6, 0, $02, 0 | PRIORITY dbsprite 6, 0, 0, 0, $02, 0 | PRIORITY
dsprite 0, 0, 7, 0, $03, 0 | PRIORITY dbsprite 7, 0, 0, 0, $03, 0 | PRIORITY
dsprite 0, 0, 8, 0, $02, 0 | PRIORITY dbsprite 8, 0, 0, 0, $02, 0 | PRIORITY
dsprite 0, 0, 9, 0, $03, 0 | PRIORITY dbsprite 9, 0, 0, 0, $03, 0 | PRIORITY
dsprite 1, 0, 0, 0, $01, 0 | PRIORITY dbsprite 0, 1, 0, 0, $01, 0 | PRIORITY
dsprite 1, 0, 3, 0, $03, 0 | PRIORITY dbsprite 3, 1, 0, 0, $03, 0 | PRIORITY
dsprite 1, 0, 5, 0, $03, 0 | PRIORITY dbsprite 5, 1, 0, 0, $03, 0 | PRIORITY
dsprite 1, 0, 7, 0, $03, 0 | PRIORITY dbsprite 7, 1, 0, 0, $03, 0 | PRIORITY
dsprite 1, 0, 9, 0, $03, 0 | PRIORITY dbsprite 9, 1, 0, 0, $03, 0 | PRIORITY
dsprite 2, 0, 0, 0, $01, 0 | PRIORITY dbsprite 0, 2, 0, 0, $01, 0 | PRIORITY
dsprite 2, 0, 3, 0, $03, 0 | PRIORITY dbsprite 3, 2, 0, 0, $03, 0 | PRIORITY
dsprite 2, 0, 5, 0, $03, 0 | PRIORITY dbsprite 5, 2, 0, 0, $03, 0 | PRIORITY
dsprite 2, 0, 7, 0, $03, 0 | PRIORITY dbsprite 7, 2, 0, 0, $03, 0 | PRIORITY
dsprite 2, 0, 9, 0, $03, 0 | PRIORITY dbsprite 9, 2, 0, 0, $03, 0 | PRIORITY
dsprite 2, 1, 0, 0, $00, 0 | Y_FLIP | PRIORITY dbsprite 0, 2, 0, 1, $00, 0 | Y_FLIP | PRIORITY
dsprite 2, 1, 1, 0, $02, 0 | Y_FLIP | PRIORITY dbsprite 1, 2, 0, 1, $02, 0 | Y_FLIP | PRIORITY
dsprite 2, 1, 2, 0, $02, 0 | Y_FLIP | PRIORITY dbsprite 2, 2, 0, 1, $02, 0 | Y_FLIP | PRIORITY
dsprite 2, 1, 3, 0, $03, 0 | PRIORITY dbsprite 3, 2, 0, 1, $03, 0 | PRIORITY
dsprite 2, 1, 4, 0, $03, 0 | PRIORITY dbsprite 4, 2, 0, 1, $03, 0 | PRIORITY
dsprite 2, 1, 5, 0, $03, 0 | PRIORITY dbsprite 5, 2, 0, 1, $03, 0 | PRIORITY
dsprite 2, 1, 6, 0, $03, 0 | PRIORITY dbsprite 6, 2, 0, 1, $03, 0 | PRIORITY
dsprite 2, 1, 7, 0, $03, 0 | PRIORITY dbsprite 7, 2, 0, 1, $03, 0 | PRIORITY
dsprite 2, 1, 8, 0, $03, 0 | PRIORITY dbsprite 8, 2, 0, 1, $03, 0 | PRIORITY
dsprite 2, 1, 9, 0, $03, 0 | PRIORITY dbsprite 9, 2, 0, 1, $03, 0 | PRIORITY
.PokeGroupPair: .PokeGroupPair:
db 38 db 38
dsprite 0, 0, -1, 7, $00, 0 | PRIORITY dbsprite -1, 0, 7, 0, $00, 0 | PRIORITY
dsprite 0, 0, 3, 0, $00, 0 | X_FLIP | PRIORITY dbsprite 3, 0, 0, 0, $00, 0 | X_FLIP | PRIORITY
dsprite 1, 0, -1, 7, $01, 0 | PRIORITY dbsprite -1, 1, 7, 0, $01, 0 | PRIORITY
dsprite 1, 0, 3, 0, $01, 0 | X_FLIP | PRIORITY dbsprite 3, 1, 0, 0, $01, 0 | X_FLIP | PRIORITY
dsprite 2, 0, -1, 7, $01, 0 | PRIORITY dbsprite -1, 2, 7, 0, $01, 0 | PRIORITY
dsprite 2, 0, 3, 0, $01, 0 | X_FLIP | PRIORITY dbsprite 3, 2, 0, 0, $01, 0 | X_FLIP | PRIORITY
dsprite 3, 0, -1, 7, $01, 0 | PRIORITY dbsprite -1, 3, 7, 0, $01, 0 | PRIORITY
dsprite 3, 0, 1, 0, $03, 0 | PRIORITY dbsprite 1, 3, 0, 0, $03, 0 | PRIORITY
dsprite 3, 0, 3, 0, $03, 0 | PRIORITY dbsprite 3, 3, 0, 0, $03, 0 | PRIORITY
dsprite 4, 0, -1, 7, $01, 0 | PRIORITY dbsprite -1, 4, 7, 0, $01, 0 | PRIORITY
dsprite 4, 0, 1, 0, $03, 0 | PRIORITY dbsprite 1, 4, 0, 0, $03, 0 | PRIORITY
dsprite 4, 0, 3, 0, $03, 0 | PRIORITY dbsprite 3, 4, 0, 0, $03, 0 | PRIORITY
dsprite 5, 0, -1, 7, $01, 0 | PRIORITY dbsprite -1, 5, 7, 0, $01, 0 | PRIORITY
dsprite 5, 0, 1, 0, $03, 0 | PRIORITY dbsprite 1, 5, 0, 0, $03, 0 | PRIORITY
dsprite 5, 0, 3, 0, $03, 0 | PRIORITY dbsprite 3, 5, 0, 0, $03, 0 | PRIORITY
dsprite 6, 0, -1, 7, $01, 0 | PRIORITY dbsprite -1, 6, 7, 0, $01, 0 | PRIORITY
dsprite 6, 0, 1, 0, $03, 0 | PRIORITY dbsprite 1, 6, 0, 0, $03, 0 | PRIORITY
dsprite 6, 0, 3, 0, $03, 0 | PRIORITY dbsprite 3, 6, 0, 0, $03, 0 | PRIORITY
dsprite 7, 0, -1, 7, $01, 0 | PRIORITY dbsprite -1, 7, 7, 0, $01, 0 | PRIORITY
dsprite 7, 0, 1, 0, $03, 0 | PRIORITY dbsprite 1, 7, 0, 0, $03, 0 | PRIORITY
dsprite 7, 0, 3, 0, $03, 0 | PRIORITY dbsprite 3, 7, 0, 0, $03, 0 | PRIORITY
dsprite 8, 0, -1, 7, $01, 0 | PRIORITY dbsprite -1, 8, 7, 0, $01, 0 | PRIORITY
dsprite 8, 0, 1, 0, $03, 0 | PRIORITY dbsprite 1, 8, 0, 0, $03, 0 | PRIORITY
dsprite 8, 0, 3, 0, $03, 0 | PRIORITY dbsprite 3, 8, 0, 0, $03, 0 | PRIORITY
dsprite 9, 0, -1, 7, $01, 0 | PRIORITY dbsprite -1, 9, 7, 0, $01, 0 | PRIORITY
dsprite 9, 0, 1, 0, $03, 0 | PRIORITY dbsprite 1, 9, 0, 0, $03, 0 | PRIORITY
dsprite 9, 0, 3, 0, $03, 0 | PRIORITY dbsprite 3, 9, 0, 0, $03, 0 | PRIORITY
dsprite 10, 0, -1, 7, $01, 0 | PRIORITY dbsprite -1, 10, 7, 0, $01, 0 | PRIORITY
dsprite 10, 0, 1, 0, $03, 0 | PRIORITY dbsprite 1, 10, 0, 0, $03, 0 | PRIORITY
dsprite 10, 0, 3, 0, $03, 0 | PRIORITY dbsprite 3, 10, 0, 0, $03, 0 | PRIORITY
dsprite 11, 0, -1, 7, $01, 0 | PRIORITY dbsprite -1, 11, 7, 0, $01, 0 | PRIORITY
dsprite 11, 0, 1, 0, $03, 0 | PRIORITY dbsprite 1, 11, 0, 0, $03, 0 | PRIORITY
dsprite 11, 0, 3, 0, $03, 0 | PRIORITY dbsprite 3, 11, 0, 0, $03, 0 | PRIORITY
dsprite 11, 1, -1, 7, $00, 0 | Y_FLIP | PRIORITY dbsprite -1, 11, 7, 1, $00, 0 | Y_FLIP | PRIORITY
dsprite 11, 1, 0, 0, $02, 0 | Y_FLIP | PRIORITY dbsprite 0, 11, 0, 1, $02, 0 | Y_FLIP | PRIORITY
dsprite 11, 1, 1, 0, $03, 0 | Y_FLIP | PRIORITY dbsprite 1, 11, 0, 1, $03, 0 | Y_FLIP | PRIORITY
dsprite 11, 1, 2, 0, $02, 0 | Y_FLIP | PRIORITY dbsprite 2, 11, 0, 1, $02, 0 | Y_FLIP | PRIORITY
dsprite 11, 1, 3, 0, $03, 0 | X_FLIP | Y_FLIP | PRIORITY dbsprite 3, 11, 0, 1, $03, 0 | X_FLIP | Y_FLIP | PRIORITY
.Impossible: .Impossible:
db 4 db 4
dsprite 0, 0, 0, 0, $00, 0 | PRIORITY dbsprite 0, 0, 0, 0, $00, 0 | PRIORITY
dsprite 0, 0, 1, 0, $00, 0 | X_FLIP | PRIORITY dbsprite 1, 0, 0, 0, $00, 0 | X_FLIP | PRIORITY
dsprite 1, 0, 0, 0, $00, 0 | Y_FLIP | PRIORITY dbsprite 0, 1, 0, 0, $00, 0 | Y_FLIP | PRIORITY
dsprite 1, 0, 1, 0, $00, 0 | X_FLIP | Y_FLIP | PRIORITY dbsprite 1, 1, 0, 0, $00, 0 | X_FLIP | Y_FLIP | PRIORITY
CardFlip_InitAttrPals: CardFlip_InitAttrPals:
ldh a, [hCGB] ldh a, [hCGB]

39
engine/games/unown_puzzle.asm
View File

@ -115,8 +115,7 @@ InitUnownPuzzlePiecePositions:
initpuzcoord: MACRO initpuzcoord: MACRO
rept _NARG / 2 rept _NARG / 2
db \1 puzcoord \2 db \1 puzcoord \2
shift shift 2
shift
endr endr
ENDM ENDM
initpuzcoord 0,0, 0,1, 0,2, 0,3, 0,4, 0,5 initpuzcoord 0,0, 0,1, 0,2, 0,3, 0,4, 0,5
@ -553,27 +552,27 @@ RedrawUnownPuzzlePieces:
jr .loop jr .loop
.OAM_HoldingPiece: .OAM_HoldingPiece:
dsprite -1, -4, -1, -4, $00, 0 dbsprite -1, -1, -4, -4, $00, 0
dsprite -1, -4, 0, -4, $01, 0 dbsprite 0, -1, -4, -4, $01, 0
dsprite -1, -4, 0, 4, $02, 0 dbsprite 0, -1, 4, -4, $02, 0
dsprite 0, -4, -1, -4, $0c, 0 dbsprite -1, 0, -4, -4, $0c, 0
dsprite 0, -4, 0, -4, $0d, 0 dbsprite 0, 0, -4, -4, $0d, 0
dsprite 0, -4, 0, 4, $0e, 0 dbsprite 0, 0, 4, -4, $0e, 0
dsprite 0, 4, -1, -4, $18, 0 dbsprite -1, 0, -4, 4, $18, 0
dsprite 0, 4, 0, -4, $19, 0 dbsprite 0, 0, -4, 4, $19, 0
dsprite 0, 4, 0, 4, $1a, 0 dbsprite 0, 0, 4, 4, $1a, 0
db -1 db -1
.OAM_NotHoldingPiece: .OAM_NotHoldingPiece:
dsprite -1, -4, -1, -4, $00, 0 dbsprite -1, -1, -4, -4, $00, 0
dsprite -1, -4, 0, -4, $01, 0 dbsprite 0, -1, -4, -4, $01, 0
dsprite -1, -4, 0, 4, $00, 0 | X_FLIP dbsprite 0, -1, 4, -4, $00, 0 | X_FLIP
dsprite 0, -4, -1, -4, $02, 0 dbsprite -1, 0, -4, -4, $02, 0
dsprite 0, -4, 0, -4, $03, 0 dbsprite 0, 0, -4, -4, $03, 0
dsprite 0, -4, 0, 4, $02, 0 | X_FLIP dbsprite 0, 0, 4, -4, $02, 0 | X_FLIP
dsprite 0, 4, -1, -4, $00, 0 | Y_FLIP dbsprite -1, 0, -4, 4, $00, 0 | Y_FLIP
dsprite 0, 4, 0, -4, $01, 0 | Y_FLIP dbsprite 0, 0, -4, 4, $01, 0 | Y_FLIP
dsprite 0, 4, 0, 4, $00, 0 | X_FLIP | Y_FLIP dbsprite 0, 0, 4, 4, $00, 0 | X_FLIP | Y_FLIP
db -1 db -1
UnownPuzzleCoordData: UnownPuzzleCoordData:

6
engine/gfx/color.asm
View File

@ -241,21 +241,21 @@ LoadTrainerClassPaletteAsNthBGPal:
ld a, [wTrainerClass] ld a, [wTrainerClass]
call GetTrainerPalettePointer call GetTrainerPalettePointer
ld a, e ld a, e
jr got_palette_pointer_8bd7 jr LoadNthMiddleBGPal
LoadMonPaletteAsNthBGPal: LoadMonPaletteAsNthBGPal:
ld a, [wCurPartySpecies] ld a, [wCurPartySpecies]
call _GetMonPalettePointer call _GetMonPalettePointer
ld a, e ld a, e
bit 7, a bit 7, a
jr z, got_palette_pointer_8bd7 jr z, LoadNthMiddleBGPal
and $7f and $7f
inc hl inc hl
inc hl inc hl
inc hl inc hl
inc hl inc hl
got_palette_pointer_8bd7 LoadNthMiddleBGPal:
push hl push hl
ld hl, wBGPals1 ld hl, wBGPals1
ld de, 1 palettes ld de, 1 palettes

2
engine/gfx/load_pics.asm
View File

@ -247,7 +247,7 @@ FixPicBank:
; This is a thing for some reason. ; This is a thing for some reason.
PICS_FIX EQU $36 PICS_FIX EQU $36
GLOBAL PICS_FIX EXPORT PICS_FIX
push hl push hl
push bc push bc

32
engine/link/mystery_gift.asm
View File

@ -1688,22 +1688,22 @@ Function1057d7:
ret ret
.OAM_data: .OAM_data:
dsprite 2, 1, 6, 4, $00, 0 dbsprite 6, 2, 4, 1, $00, 0
dsprite 2, 1, 7, 4, $01, 0 dbsprite 7, 2, 4, 1, $01, 0
dsprite 2, 1, 8, 4, $02, 0 dbsprite 8, 2, 4, 1, $02, 0
dsprite 2, 1, 9, 4, $03, 0 dbsprite 9, 2, 4, 1, $03, 0
dsprite 3, 1, 6, 4, $04, 0 dbsprite 6, 3, 4, 1, $04, 0
dsprite 3, 1, 7, 4, $05, 0 dbsprite 7, 3, 4, 1, $05, 0
dsprite 3, 1, 8, 4, $06, 0 dbsprite 8, 3, 4, 1, $06, 0
dsprite 3, 1, 9, 4, $07, 0 dbsprite 9, 3, 4, 1, $07, 0
dsprite 0, 1, 11, 4, $00, 0 dbsprite 11, 0, 4, 1, $00, 0
dsprite 0, 1, 12, 4, $01, 0 dbsprite 12, 0, 4, 1, $01, 0
dsprite 0, 1, 13, 4, $02, 0 dbsprite 13, 0, 4, 1, $02, 0
dsprite 0, 1, 14, 4, $03, 0 dbsprite 14, 0, 4, 1, $03, 0
dsprite 1, 1, 11, 4, $04, 0 dbsprite 11, 1, 4, 1, $04, 0
dsprite 1, 1, 12, 4, $05, 0 dbsprite 12, 1, 4, 1, $05, 0
dsprite 1, 1, 13, 4, $06, 0 dbsprite 13, 1, 4, 1, $06, 0
dsprite 1, 1, 14, 4, $07, 0 dbsprite 14, 1, 4, 1, $07, 0
CardTradeGFX: CardTradeGFX:
INCBIN "gfx/mystery_gift/card_trade.2bpp" INCBIN "gfx/mystery_gift/card_trade.2bpp"

4
engine/menus/intro_menu.asm
View File

@ -110,13 +110,13 @@ _ResetWRAM:
call ByteFill call ByteFill
ldh a, [rLY] ldh a, [rLY]
ldh [hSecondsBackup], a ldh [hUnusedBackup], a
call DelayFrame call DelayFrame
ldh a, [hRandomSub] ldh a, [hRandomSub]
ld [wPlayerID], a ld [wPlayerID], a
ldh a, [rLY] ldh a, [rLY]
ldh [hSecondsBackup], a ldh [hUnusedBackup], a
call DelayFrame call DelayFrame
ldh a, [hRandomAdd] ldh a, [hRandomAdd]
ld [wPlayerID + 1], a ld [wPlayerID + 1], a

8
engine/menus/scrolling_menu.asm
View File

@ -244,16 +244,16 @@ InitScrollingMenuCursor:
ld a, [wScrollingMenuListSize] ld a, [wScrollingMenuListSize]
inc a inc a
cp b cp b
jr c, .asm_2475a jr c, .wrap
jr nc, .asm_24763 jr nc, .done
.asm_2475a .wrap
xor a xor a
ld [wMenuScrollPosition], a ld [wMenuScrollPosition], a
ld a, $1 ld a, $1
ld [wMenuCursorBuffer], a ld [wMenuCursorBuffer], a
.asm_24763 .done
ret ret
ScrollingMenu_InitFlags: ScrollingMenu_InitFlags:

16
engine/menus/trainer_card.asm
View File

@ -540,17 +540,17 @@ TrainerCard_Page2_3_OAMUpdate:
jr .loop2 jr .loop2
.facing1 .facing1
dsprite 0, 0, 0, 0, $00, 0 dbsprite 0, 0, 0, 0, $00, 0
dsprite 0, 0, 1, 0, $01, 0 dbsprite 1, 0, 0, 0, $01, 0
dsprite 1, 0, 0, 0, $02, 0 dbsprite 0, 1, 0, 0, $02, 0
dsprite 1, 0, 1, 0, $03, 0 dbsprite 1, 1, 0, 0, $03, 0
db -1 db -1
.facing2 .facing2
dsprite 0, 0, 0, 0, $01, 0 | X_FLIP dbsprite 0, 0, 0, 0, $01, 0 | X_FLIP
dsprite 0, 0, 1, 0, $00, 0 | X_FLIP dbsprite 1, 0, 0, 0, $00, 0 | X_FLIP
dsprite 1, 0, 0, 0, $03, 0 | X_FLIP dbsprite 0, 1, 0, 0, $03, 0 | X_FLIP
dsprite 1, 0, 1, 0, $02, 0 | X_FLIP dbsprite 1, 1, 0, 0, $02, 0 | X_FLIP
db -1 db -1
TrainerCard_JohtoBadgesOAM: TrainerCard_JohtoBadgesOAM:

80
engine/movie/unused_title.asm
View File

@ -113,46 +113,46 @@ UnusedTitleFG_Palettes:
INCLUDE "gfx/title/old_fg.pal" INCLUDE "gfx/title/old_fg.pal"
UnusedTitleFG_OAM: UnusedTitleFG_OAM:
dsprite 3, 0, 7, 0, $00, 1 dbsprite 7, 3, 0, 0, $00, 1
dsprite 3, 0, 8, 0, $02, 1 dbsprite 8, 3, 0, 0, $02, 1
dsprite 3, 0, 9, 0, $04, 1 dbsprite 9, 3, 0, 0, $04, 1
dsprite 3, 0, 10, 0, $06, 1 dbsprite 10, 3, 0, 0, $06, 1
dsprite 3, 0, 11, 0, $08, 1 dbsprite 11, 3, 0, 0, $08, 1
dsprite 3, 0, 12, 0, $0a, 1 dbsprite 12, 3, 0, 0, $0a, 1
dsprite 3, 0, 13, 0, $0c, 1 dbsprite 13, 3, 0, 0, $0c, 1
dsprite 3, 0, 14, 0, $0e, 1 dbsprite 14, 3, 0, 0, $0e, 1
dsprite 5, 0, 7, 0, $10, 0 dbsprite 7, 5, 0, 0, $10, 0
dsprite 5, 0, 8, 0, $12, 0 dbsprite 8, 5, 0, 0, $12, 0
dsprite 5, 0, 9, 0, $14, 0 dbsprite 9, 5, 0, 0, $14, 0
dsprite 5, 0, 10, 0, $16, 0 dbsprite 10, 5, 0, 0, $16, 0
dsprite 5, 0, 11, 0, $18, 0 dbsprite 11, 5, 0, 0, $18, 0
dsprite 5, 0, 12, 0, $1a, 0 dbsprite 12, 5, 0, 0, $1a, 0
dsprite 5, 0, 13, 0, $1c, 0 dbsprite 13, 5, 0, 0, $1c, 0
dsprite 5, 0, 14, 0, $1e, 0 dbsprite 14, 5, 0, 0, $1e, 0
dsprite 7, 0, 7, 0, $20, 0 dbsprite 7, 7, 0, 0, $20, 0
dsprite 7, 0, 8, 0, $22, 0 dbsprite 8, 7, 0, 0, $22, 0
dsprite 7, 0, 9, 0, $24, 0 dbsprite 9, 7, 0, 0, $24, 0
dsprite 7, 0, 10, 0, $26, 0 dbsprite 10, 7, 0, 0, $26, 0
dsprite 7, 0, 11, 0, $28, 0 dbsprite 11, 7, 0, 0, $28, 0
dsprite 7, 0, 12, 0, $2a, 0 dbsprite 12, 7, 0, 0, $2a, 0
dsprite 7, 0, 13, 0, $2c, 0 dbsprite 13, 7, 0, 0, $2c, 0
dsprite 7, 0, 14, 0, $2e, 0 dbsprite 14, 7, 0, 0, $2e, 0
dsprite 9, 0, 7, 0, $30, 2 dbsprite 7, 9, 0, 0, $30, 2
dsprite 9, 0, 8, 0, $32, 2 dbsprite 8, 9, 0, 0, $32, 2
dsprite 9, 0, 9, 0, $34, 2 dbsprite 9, 9, 0, 0, $34, 2
dsprite 9, 0, 10, 0, $36, 2 dbsprite 10, 9, 0, 0, $36, 2
dsprite 9, 0, 11, 0, $38, 2 dbsprite 11, 9, 0, 0, $38, 2
dsprite 9, 0, 12, 0, $3a, 2 dbsprite 12, 9, 0, 0, $3a, 2
dsprite 9, 0, 13, 0, $3c, 2 dbsprite 13, 9, 0, 0, $3c, 2
dsprite 9, 0, 14, 0, $3e, 2 dbsprite 14, 9, 0, 0, $3e, 2
dsprite 11, 0, 7, 0, $40, 1 dbsprite 7, 11, 0, 0, $40, 1
dsprite 11, 0, 8, 0, $42, 1 dbsprite 8, 11, 0, 0, $42, 1
dsprite 11, 0, 9, 0, $44, 1 dbsprite 9, 11, 0, 0, $44, 1
dsprite 11, 0, 10, 0, $46, 1 dbsprite 10, 11, 0, 0, $46, 1
dsprite 11, 0, 11, 0, $48, 1 dbsprite 11, 11, 0, 0, $48, 1
dsprite 11, 0, 12, 0, $4a, 1 dbsprite 12, 11, 0, 0, $4a, 1
dsprite 11, 0, 13, 0, $4c, 1 dbsprite 13, 11, 0, 0, $4c, 1
dsprite 11, 0, 14, 0, $4e, 1 dbsprite 14, 11, 0, 0, $4e, 1
Function10ed51: Function10ed51:
call _TitleScreen call _TitleScreen

186
engine/pokedex/pokedex.asm
View File

@ -16,7 +16,7 @@
const DEXSTATE_EXIT const DEXSTATE_EXIT
POKEDEX_SCX EQU 5 POKEDEX_SCX EQU 5
GLOBAL POKEDEX_SCX EXPORT POKEDEX_SCX
Pokedex: Pokedex:
ldh a, [hWX] ldh a, [hWX]
@ -1986,59 +1986,59 @@ Pokedex_PutOldModeCursorOAM:
ret ret
.CursorOAM: .CursorOAM:
dsprite 3, 0, 9, -1, $30, 7 dbsprite 9, 3, -1, 0, $30, 7
dsprite 2, 0, 9, -1, $31, 7 dbsprite 9, 2, -1, 0, $31, 7
dsprite 2, 0, 10, -1, $32, 7 dbsprite 10, 2, -1, 0, $32, 7
dsprite 2, 0, 11, -1, $32, 7 dbsprite 11, 2, -1, 0, $32, 7
dsprite 2, 0, 12, -1, $32, 7 dbsprite 12, 2, -1, 0, $32, 7
dsprite 2, 0, 13, -1, $33, 7 dbsprite 13, 2, -1, 0, $33, 7
dsprite 2, 0, 16, -2, $33, 7 | X_FLIP dbsprite 16, 2, -2, 0, $33, 7 | X_FLIP
dsprite 2, 0, 17, -2, $32, 7 | X_FLIP dbsprite 17, 2, -2, 0, $32, 7 | X_FLIP
dsprite 2, 0, 18, -2, $32, 7 | X_FLIP dbsprite 18, 2, -2, 0, $32, 7 | X_FLIP
dsprite 2, 0, 19, -2, $32, 7 | X_FLIP dbsprite 19, 2, -2, 0, $32, 7 | X_FLIP
dsprite 2, 0, 20, -2, $31, 7 | X_FLIP dbsprite 20, 2, -2, 0, $31, 7 | X_FLIP
dsprite 3, 0, 20, -2, $30, 7 | X_FLIP dbsprite 20, 3, -2, 0, $30, 7 | X_FLIP
dsprite 4, 0, 9, -1, $30, 7 | Y_FLIP dbsprite 9, 4, -1, 0, $30, 7 | Y_FLIP
dsprite 5, 0, 9, -1, $31, 7 | Y_FLIP dbsprite 9, 5, -1, 0, $31, 7 | Y_FLIP
dsprite 5, 0, 10, -1, $32, 7 | Y_FLIP dbsprite 10, 5, -1, 0, $32, 7 | Y_FLIP
dsprite 5, 0, 11, -1, $32, 7 | Y_FLIP dbsprite 11, 5, -1, 0, $32, 7 | Y_FLIP
dsprite 5, 0, 12, -1, $32, 7 | Y_FLIP dbsprite 12, 5, -1, 0, $32, 7 | Y_FLIP
dsprite 5, 0, 13, -1, $33, 7 | Y_FLIP dbsprite 13, 5, -1, 0, $33, 7 | Y_FLIP
dsprite 5, 0, 16, -2, $33, 7 | X_FLIP | Y_FLIP dbsprite 16, 5, -2, 0, $33, 7 | X_FLIP | Y_FLIP
dsprite 5, 0, 17, -2, $32, 7 | X_FLIP | Y_FLIP dbsprite 17, 5, -2, 0, $32, 7 | X_FLIP | Y_FLIP
dsprite 5, 0, 18, -2, $32, 7 | X_FLIP | Y_FLIP dbsprite 18, 5, -2, 0, $32, 7 | X_FLIP | Y_FLIP
dsprite 5, 0, 19, -2, $32, 7 | X_FLIP | Y_FLIP dbsprite 19, 5, -2, 0, $32, 7 | X_FLIP | Y_FLIP
dsprite 5, 0, 20, -2, $31, 7 | X_FLIP | Y_FLIP dbsprite 20, 5, -2, 0, $31, 7 | X_FLIP | Y_FLIP
dsprite 4, 0, 20, -2, $30, 7 | X_FLIP | Y_FLIP dbsprite 20, 4, -2, 0, $30, 7 | X_FLIP | Y_FLIP
db -1 db -1
.CursorAtTopOAM: .CursorAtTopOAM:
; OAM data for when the cursor is at the top of the list. The tiles at the top ; OAM data for when the cursor is at the top of the list. The tiles at the top
; are cut off so they don't show up outside the list area. ; are cut off so they don't show up outside the list area.
dsprite 3, 0, 9, -1, $30, 7 dbsprite 9, 3, -1, 0, $30, 7
dsprite 2, 0, 9, -1, $34, 7 dbsprite 9, 2, -1, 0, $34, 7
dsprite 2, 0, 10, -1, $35, 7 dbsprite 10, 2, -1, 0, $35, 7
dsprite 2, 0, 11, -1, $35, 7 dbsprite 11, 2, -1, 0, $35, 7
dsprite 2, 0, 12, -1, $35, 7 dbsprite 12, 2, -1, 0, $35, 7
dsprite 2, 0, 13, -1, $36, 7 dbsprite 13, 2, -1, 0, $36, 7
dsprite 2, 0, 16, -2, $36, 7 | X_FLIP dbsprite 16, 2, -2, 0, $36, 7 | X_FLIP
dsprite 2, 0, 17, -2, $35, 7 | X_FLIP dbsprite 17, 2, -2, 0, $35, 7 | X_FLIP
dsprite 2, 0, 18, -2, $35, 7 | X_FLIP dbsprite 18, 2, -2, 0, $35, 7 | X_FLIP
dsprite 2, 0, 19, -2, $35, 7 | X_FLIP dbsprite 19, 2, -2, 0, $35, 7 | X_FLIP
dsprite 2, 0, 20, -2, $34, 7 | X_FLIP dbsprite 20, 2, -2, 0, $34, 7 | X_FLIP
dsprite 3, 0, 20, -2, $30, 7 | X_FLIP dbsprite 20, 3, -2, 0, $30, 7 | X_FLIP
dsprite 4, 0, 9, -1, $30, 7 | Y_FLIP dbsprite 9, 4, -1, 0, $30, 7 | Y_FLIP
dsprite 5, 0, 9, -1, $31, 7 | Y_FLIP dbsprite 9, 5, -1, 0, $31, 7 | Y_FLIP
dsprite 5, 0, 10, -1, $32, 7 | Y_FLIP dbsprite 10, 5, -1, 0, $32, 7 | Y_FLIP
dsprite 5, 0, 11, -1, $32, 7 | Y_FLIP dbsprite 11, 5, -1, 0, $32, 7 | Y_FLIP
dsprite 5, 0, 12, -1, $32, 7 | Y_FLIP dbsprite 12, 5, -1, 0, $32, 7 | Y_FLIP
dsprite 5, 0, 13, -1, $33, 7 | Y_FLIP dbsprite 13, 5, -1, 0, $33, 7 | Y_FLIP
dsprite 5, 0, 16, -2, $33, 7 | X_FLIP | Y_FLIP dbsprite 16, 5, -2, 0, $33, 7 | X_FLIP | Y_FLIP
dsprite 5, 0, 17, -2, $32, 7 | X_FLIP | Y_FLIP dbsprite 17, 5, -2, 0, $32, 7 | X_FLIP | Y_FLIP
dsprite 5, 0, 18, -2, $32, 7 | X_FLIP | Y_FLIP dbsprite 18, 5, -2, 0, $32, 7 | X_FLIP | Y_FLIP
dsprite 5, 0, 19, -2, $32, 7 | X_FLIP | Y_FLIP dbsprite 19, 5, -2, 0, $32, 7 | X_FLIP | Y_FLIP
dsprite 5, 0, 20, -2, $31, 7 | X_FLIP | Y_FLIP dbsprite 20, 5, -2, 0, $31, 7 | X_FLIP | Y_FLIP
dsprite 4, 0, 20, -2, $30, 7 | X_FLIP | Y_FLIP dbsprite 20, 4, -2, 0, $30, 7 | X_FLIP | Y_FLIP
db -1 db -1
Pokedex_PutNewModeABCModeCursorOAM: Pokedex_PutNewModeABCModeCursorOAM:
@ -2047,26 +2047,26 @@ Pokedex_PutNewModeABCModeCursorOAM:
ret ret
.CursorOAM: .CursorOAM:
dsprite 3, 3, 9, -1, $30, 7 dbsprite 9, 3, -1, 3, $30, 7
dsprite 2, 3, 9, -1, $31, 7 dbsprite 9, 2, -1, 3, $31, 7
dsprite 2, 3, 10, -1, $32, 7 dbsprite 10, 2, -1, 3, $32, 7
dsprite 2, 3, 11, -1, $32, 7 dbsprite 11, 2, -1, 3, $32, 7
dsprite 2, 3, 12, -1, $33, 7 dbsprite 12, 2, -1, 3, $33, 7
dsprite 2, 3, 16, 0, $33, 7 | X_FLIP dbsprite 16, 2, 0, 3, $33, 7 | X_FLIP
dsprite 2, 3, 17, 0, $32, 7 | X_FLIP dbsprite 17, 2, 0, 3, $32, 7 | X_FLIP
dsprite 2, 3, 18, 0, $32, 7 | X_FLIP dbsprite 18, 2, 0, 3, $32, 7 | X_FLIP
dsprite 2, 3, 19, 0, $31, 7 | X_FLIP dbsprite 19, 2, 0, 3, $31, 7 | X_FLIP
dsprite 3, 3, 19, 0, $30, 7 | X_FLIP dbsprite 19, 3, 0, 3, $30, 7 | X_FLIP
dsprite 4, 3, 9, -1, $30, 7 | Y_FLIP dbsprite 9, 4, -1, 3, $30, 7 | Y_FLIP
dsprite 5, 3, 9, -1, $31, 7 | Y_FLIP dbsprite 9, 5, -1, 3, $31, 7 | Y_FLIP
dsprite 5, 3, 10, -1, $32, 7 | Y_FLIP dbsprite 10, 5, -1, 3, $32, 7 | Y_FLIP
dsprite 5, 3, 11, -1, $32, 7 | Y_FLIP dbsprite 11, 5, -1, 3, $32, 7 | Y_FLIP
dsprite 5, 3, 12, -1, $33, 7 | Y_FLIP dbsprite 12, 5, -1, 3, $33, 7 | Y_FLIP
dsprite 5, 3, 16, 0, $33, 7 | X_FLIP | Y_FLIP dbsprite 16, 5, 0, 3, $33, 7 | X_FLIP | Y_FLIP
dsprite 5, 3, 17, 0, $32, 7 | X_FLIP | Y_FLIP dbsprite 17, 5, 0, 3, $32, 7 | X_FLIP | Y_FLIP
dsprite 5, 3, 18, 0, $32, 7 | X_FLIP | Y_FLIP dbsprite 18, 5, 0, 3, $32, 7 | X_FLIP | Y_FLIP
dsprite 5, 3, 19, 0, $31, 7 | X_FLIP | Y_FLIP dbsprite 19, 5, 0, 3, $31, 7 | X_FLIP | Y_FLIP
dsprite 4, 3, 19, 0, $30, 7 | X_FLIP | Y_FLIP dbsprite 19, 4, 0, 3, $30, 7 | X_FLIP | Y_FLIP
db -1 db -1
Pokedex_UpdateSearchResultsCursorOAM: Pokedex_UpdateSearchResultsCursorOAM:
@ -2078,30 +2078,30 @@ Pokedex_UpdateSearchResultsCursorOAM:
ret ret
.CursorOAM: .CursorOAM:
dsprite 3, 3, 9, -1, $30, 7 dbsprite 9, 3, -1, 3, $30, 7
dsprite 2, 3, 9, -1, $31, 7 dbsprite 9, 2, -1, 3, $31, 7
dsprite 2, 3, 10, -1, $32, 7 dbsprite 10, 2, -1, 3, $32, 7
dsprite 2, 3, 11, -1, $32, 7 dbsprite 11, 2, -1, 3, $32, 7
dsprite 2, 3, 12, -1, $32, 7 dbsprite 12, 2, -1, 3, $32, 7
dsprite 2, 3, 13, -1, $33, 7 dbsprite 13, 2, -1, 3, $33, 7
dsprite 2, 3, 16, -2, $33, 7 | X_FLIP dbsprite 16, 2, -2, 3, $33, 7 | X_FLIP
dsprite 2, 3, 17, -2, $32, 7 | X_FLIP dbsprite 17, 2, -2, 3, $32, 7 | X_FLIP
dsprite 2, 3, 18, -2, $32, 7 | X_FLIP dbsprite 18, 2, -2, 3, $32, 7 | X_FLIP
dsprite 2, 3, 19, -2, $32, 7 | X_FLIP dbsprite 19, 2, -2, 3, $32, 7 | X_FLIP
dsprite 2, 3, 20, -2, $31, 7 | X_FLIP dbsprite 20, 2, -2, 3, $31, 7 | X_FLIP
dsprite 3, 3, 20, -2, $30, 7 | X_FLIP dbsprite 20, 3, -2, 3, $30, 7 | X_FLIP
dsprite 4, 3, 9, -1, $30, 7 | Y_FLIP dbsprite 9, 4, -1, 3, $30, 7 | Y_FLIP
dsprite 5, 3, 9, -1, $31, 7 | Y_FLIP dbsprite 9, 5, -1, 3, $31, 7 | Y_FLIP
dsprite 5, 3, 10, -1, $32, 7 | Y_FLIP dbsprite 10, 5, -1, 3, $32, 7 | Y_FLIP
dsprite 5, 3, 11, -1, $32, 7 | Y_FLIP dbsprite 11, 5, -1, 3, $32, 7 | Y_FLIP
dsprite 5, 3, 12, -1, $32, 7 | Y_FLIP dbsprite 12, 5, -1, 3, $32, 7 | Y_FLIP
dsprite 5, 3, 13, -1, $33, 7 | Y_FLIP dbsprite 13, 5, -1, 3, $33, 7 | Y_FLIP
dsprite 5, 3, 16, -2, $33, 7 | X_FLIP | Y_FLIP dbsprite 16, 5, -2, 3, $33, 7 | X_FLIP | Y_FLIP
dsprite 5, 3, 17, -2, $32, 7 | X_FLIP | Y_FLIP dbsprite 17, 5, -2, 3, $32, 7 | X_FLIP | Y_FLIP
dsprite 5, 3, 18, -2, $32, 7 | X_FLIP | Y_FLIP dbsprite 18, 5, -2, 3, $32, 7 | X_FLIP | Y_FLIP
dsprite 5, 3, 19, -2, $32, 7 | X_FLIP | Y_FLIP dbsprite 19, 5, -2, 3, $32, 7 | X_FLIP | Y_FLIP
dsprite 5, 3, 20, -2, $31, 7 | X_FLIP | Y_FLIP dbsprite 20, 5, -2, 3, $31, 7 | X_FLIP | Y_FLIP
dsprite 4, 3, 20, -2, $30, 7 | X_FLIP | Y_FLIP dbsprite 20, 4, -2, 3, $30, 7 | X_FLIP | Y_FLIP
db -1 db -1
Pokedex_LoadCursorOAM: Pokedex_LoadCursorOAM:

18
engine/pokedex/pokedex_2.asm
View File

@ -65,15 +65,15 @@ DoDexSearchSlowpokeFrame:
jr .loop jr .loop
.SlowpokeSpriteData: .SlowpokeSpriteData:
dsprite 11, 0, 9, 0, $00, 0 dbsprite 9, 11, 0, 0, $00, 0
dsprite 11, 0, 10, 0, $01, 0 dbsprite 10, 11, 0, 0, $01, 0
dsprite 11, 0, 11, 0, $02, 0 dbsprite 11, 11, 0, 0, $02, 0
dsprite 12, 0, 9, 0, $10, 0 dbsprite 9, 12, 0, 0, $10, 0
dsprite 12, 0, 10, 0, $11, 0 dbsprite 10, 12, 0, 0, $11, 0
dsprite 12, 0, 11, 0, $12, 0 dbsprite 11, 12, 0, 0, $12, 0
dsprite 13, 0, 9, 0, $20, 0 dbsprite 9, 13, 0, 0, $20, 0
dsprite 13, 0, 10, 0, $21, 0 dbsprite 10, 13, 0, 0, $21, 0
dsprite 13, 0, 11, 0, $22, 0 dbsprite 11, 13, 0, 0, $22, 0
db -1 db -1
DisplayDexEntry: DisplayDexEntry:

Some files were not shown because too many files have changed in this diff Show More