diff options
| author | yenatch <yenatch@gmail.com> | 2015-02-14 04:18:47 -0500 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2015-02-14 04:18:47 -0500 |
| commit | 35644c330effcfb083591d20b3b5f780019ae24f (patch) | |
| tree | 57152bff2a77876801b4c9a21bdc1d7b76e637a1 /main.asm | |
| parent | d7bc1d12f23a6d800169b887592807cf92b4974a (diff) | |
| parent | 828d6b92f0488dc1779f4b282610cead039ffbf9 (diff) | |
Merge pull request #279 from iimarckus/crystal11
Build both the 1.0 and 1.1 ROMs.
Diffstat (limited to 'main.asm')
| -rw-r--r-- | main.asm | 16 |
1 files changed, 10 insertions, 6 deletions
@@ -38165,7 +38165,7 @@ Function4424d: ; 4424d push af call FarString pop bc - ld a, [wcf65] + ld a, [wPokedexStatus] or a ret z push bc @@ -89618,21 +89618,21 @@ Functionfb877: ; fb877 call ClearTileMap call Function1ad2 call ClearSprites - ld a, [wcf65] + ld a, [wPokedexStatus] push af ld a, [hSCX] add $5 ld [hSCX], a xor a - ld [wcf65], a + ld [wPokedexStatus], a callba Function41a7f call Functiona80 ld a, $1 - ld [wcf65], a + ld [wPokedexStatus], a callba Function4424d call Functiona80 pop af - ld [wcf65], a + ld [wPokedexStatus], a call MaxVolume call Function4b6 ld a, [hSCX] @@ -96474,5 +96474,9 @@ SECTION "bank7F", ROMX, BANK[$7F] SECTION "stadium2", ROMX[$8000-$220], BANK[$7F] -INCBIN "misc/stadium2.bin" +IF DEF(CRYSTAL11) +INCBIN "misc/stadium2_2.bin" +ELSE +INCBIN "misc/stadium2_1.bin" +ENDC |