diff options
| author | yenatch <yenatch@gmail.com> | 2013-06-12 23:31:21 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2013-06-12 23:31:21 -0400 |
| commit | a923bf768ae2307d2ed2bc289c98e07a8de77084 (patch) | |
| tree | 20b8042fc2e6b723f8d9c9f4467a7da942ec0bc1 /main.asm | |
| parent | 6ba758aa53bbf14e2c152fd88f786a501f6bb029 (diff) | |
| parent | 723645b47011e2f7522bbcbb8304ffdc3bf774c1 (diff) | |
Merge branch 'master' of github.com:kanzure/pokecrystal
Conflicts:
extras/gfx.py
Diffstat (limited to 'main.asm')
| -rw-r--r-- | main.asm | 6 |
1 files changed, 2 insertions, 4 deletions
@@ -16728,13 +16728,11 @@ INCBIN "baserom.gbc", $bd0d0, $be699-$bd0d0 SECTION "bank30",DATA,BANK[$30] -INCBIN "baserom.gbc", $c0000, $c3fc0 - $c0000 - +INCLUDE "gfx/overworld/sprites_1.asm" SECTION "bank31",DATA,BANK[$31] -INCBIN "baserom.gbc", $c4000, $c7f80 - $c4000 - +INCLUDE "gfx/overworld/sprites_2.asm" SECTION "bank32",DATA,BANK[$32] |