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 /data | |
| 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 'data')
| -rw-r--r-- | data/battle_tower.asm | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/data/battle_tower.asm b/data/battle_tower.asm index efbc2f64f..778051b83 100644 --- a/data/battle_tower.asm +++ b/data/battle_tower.asm @@ -19,8 +19,13 @@ Function1f8000: ; 1f8000 ld a, [hRandomAdd] add b ld b, a +IF DEF(CRYSTAL11) + and $7f + cp $46 +ELSE and $1f cp $15 +ENDC jr nc, .asm_1f8022 ld b, a ld a, $1 |