diff options
author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-12-20 15:43:10 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-12-20 15:43:10 -0500 |
commit | 510a5b8d350fd093ca45baad878c4c67314d5812 (patch) | |
tree | e79e07eacfe55a28c17d2c522e03fc2db209e580 /asm | |
parent | 9f604fe56c83a904c3c2eeeede3d8b73cb6f94a1 (diff) | |
parent | d6741335d61fe61cfbfff5f7ae88059502d1f63b (diff) |
Merge pull request #193 from PikalaxALT/leafgreen
Match Pokemon LeafGreen 1.0
Diffstat (limited to 'asm')
-rw-r--r-- | asm/link_rfu_2.s | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/asm/link_rfu_2.s b/asm/link_rfu_2.s index c1582c4e4..f37313210 100644 --- a/asm/link_rfu_2.s +++ b/asm/link_rfu_2.s @@ -9166,7 +9166,13 @@ _080FCB88: movs r0, 0x3D negs r0, r0 ands r0, r2 - movs r2, 0x10 + .ifdef FIRERED + movs r2, 0x10 @ VERSION_FIRE_RED << 2 + .else + .ifdef LEAFGREEN + movs r2, 0x14 @ VERSION_LEAF_GREEN << 2 + .endif + .endif orrs r0, r2 strb r0, [r7, 0x1] movs r0, 0x11 |