expand on battle ram

This commit is contained in:
padz
2012-12-14 03:00:10 -05:00
parent 3bae3a5313
commit 8092f62cf4
2 changed files with 636 additions and 277 deletions

View File

@@ -11414,7 +11414,7 @@ INCBIN "baserom.gbc",$3ddc8,$3e8eb - $3ddc8
Function3e8eb: ; 3e8eb Function3e8eb: ; 3e8eb
;part of battle init ;part of battle init
xor a xor a
ld hl, EnemyMonSpecies2 ld hl, EnemyMonSpecies
ld bc, $0027 ld bc, $0027
call ByteFill call ByteFill
ld a, [InLinkBattle] ld a, [InLinkBattle]
@@ -11423,8 +11423,8 @@ Function3e8eb: ; 3e8eb
ld a, [$cfc0] ld a, [$cfc0]
bit 0, a bit 0, a
jp nz, $5abd jp nz, $5abd
ld a, [EnemyMonSpecies] ld a, [TempEnemyMonSpecies]
ld [EnemyMonSpecies2], a ld [EnemyMonSpecies], a
ld [$cf60], a ld [$cf60], a
ld [$d108], a ld [$d108], a
call $3856 call $3856
@@ -11515,7 +11515,7 @@ Function3e8eb: ; 3e8eb
ld a, [$d22d] ld a, [$d22d]
dec a dec a
jr nz, .asm_3ea1a jr nz, .asm_3ea1a
ld a, [EnemyMonSpecies] ld a, [TempEnemyMonSpecies]
cp a, UNOWN cp a, UNOWN
jr nz, .notunown jr nz, .notunown
ld hl, EnemyMonDVs ld hl, EnemyMonDVs
@@ -11524,7 +11524,7 @@ Function3e8eb: ; 3e8eb
call CheckUnownLetter call CheckUnownLetter
jr c, .asm_3e9a0 jr c, .asm_3e9a0
.notunown .notunown
ld a, [EnemyMonSpecies] ld a, [TempEnemyMonSpecies]
cp a, MAGIKARP cp a, MAGIKARP
jr nz, .asm_3ea1a jr nz, .asm_3ea1a
ld de, EnemyMonDVs ld de, EnemyMonDVs
@@ -11679,7 +11679,7 @@ Function3e8eb: ; 3e8eb
inc de inc de
ld a, [$d240] ld a, [$d240]
ld [de], a ld [de], a
ld a, [EnemyMonSpecies] ld a, [TempEnemyMonSpecies]
ld [$d265], a ld [$d265], a
call $343b call $343b
ld a, [$d22d] ld a, [$d22d]
@@ -11689,7 +11689,7 @@ Function3e8eb: ; 3e8eb
ld de, $c616 ld de, $c616
ld bc, $000b ld bc, $000b
call CopyBytes call CopyBytes
ld a, [EnemyMonSpecies] ld a, [TempEnemyMonSpecies]
dec a dec a
ld c, a ld c, a
ld b, $01 ld b, $01
@@ -11715,7 +11715,7 @@ CheckSleepingTreeMon: ; 3eb38
jr z, .check jr z, .check
ld hl, SleepingTreeMonNiteTable ld hl, SleepingTreeMonNiteTable
.check .check
ld a, [EnemyMonSpecies] ld a, [TempEnemyMonSpecies]
ld de, $0001 ld de, $0001
call IsInArray call IsInArray
ret c ret c

897
wram.asm

File diff suppressed because it is too large Load Diff