diff options
| author | Bryan Bishop <kanzure@gmail.com> | 2012-12-23 02:56:46 -0600 |
|---|---|---|
| committer | Bryan Bishop <kanzure@gmail.com> | 2012-12-23 02:57:21 -0600 |
| commit | 3b20ea29160760a85db9d84f61a92a957d14efb3 (patch) | |
| tree | 9009dd8d7c7610027b53cdf8a6f85e245904dd2e /main.asm | |
| parent | 5e928616596b556194f3c2291ce0470ab0fb6ffd (diff) | |
| parent | 8092f62cf42e20915ba608861e77588b38a36517 (diff) | |
Merge remote branch 'remotes/yenatch/master'
fixes #49
Diffstat (limited to 'main.asm')
| -rw-r--r-- | main.asm | 16 |
1 files changed, 8 insertions, 8 deletions
@@ -11414,7 +11414,7 @@ INCBIN "baserom.gbc",$3ddc8,$3e8eb - $3ddc8 Function3e8eb: ; 3e8eb ;part of battle init xor a - ld hl, EnemyMonSpecies2 + ld hl, EnemyMonSpecies ld bc, $0027 call ByteFill ld a, [InLinkBattle] @@ -11423,8 +11423,8 @@ Function3e8eb: ; 3e8eb ld a, [$cfc0] bit 0, a jp nz, $5abd - ld a, [EnemyMonSpecies] - ld [EnemyMonSpecies2], a + ld a, [TempEnemyMonSpecies] + ld [EnemyMonSpecies], a ld [$cf60], a ld [$d108], a call $3856 @@ -11515,7 +11515,7 @@ Function3e8eb: ; 3e8eb ld a, [$d22d] dec a jr nz, .asm_3ea1a - ld a, [EnemyMonSpecies] + ld a, [TempEnemyMonSpecies] cp a, UNOWN jr nz, .notunown ld hl, EnemyMonDVs @@ -11524,7 +11524,7 @@ Function3e8eb: ; 3e8eb call CheckUnownLetter jr c, .asm_3e9a0 .notunown - ld a, [EnemyMonSpecies] + ld a, [TempEnemyMonSpecies] cp a, MAGIKARP jr nz, .asm_3ea1a ld de, EnemyMonDVs @@ -11679,7 +11679,7 @@ Function3e8eb: ; 3e8eb inc de ld a, [$d240] ld [de], a - ld a, [EnemyMonSpecies] + ld a, [TempEnemyMonSpecies] ld [$d265], a call $343b ld a, [$d22d] @@ -11689,7 +11689,7 @@ Function3e8eb: ; 3e8eb ld de, $c616 ld bc, $000b call CopyBytes - ld a, [EnemyMonSpecies] + ld a, [TempEnemyMonSpecies] dec a ld c, a ld b, $01 @@ -11715,7 +11715,7 @@ CheckSleepingTreeMon: ; 3eb38 jr z, .check ld hl, SleepingTreeMonNiteTable .check - ld a, [EnemyMonSpecies] + ld a, [TempEnemyMonSpecies] ld de, $0001 call IsInArray ret c |