fleemons are global

This commit is contained in:
yenatch 2013-12-24 17:19:39 -05:00
parent 0cd1d2071f
commit 2172461a60
2 changed files with 22 additions and 20 deletions

View File

@ -775,7 +775,7 @@ Function3c543: ; 3c543
ld a, [TempEnemyMonSpecies] ld a, [TempEnemyMonSpecies]
ld de, 1 ld de, 1
ld hl, .Always ld hl, AlwaysFleeMons
call IsInArray call IsInArray
jr c, .Flee jr c, .Flee
@ -787,7 +787,7 @@ Function3c543: ; 3c543
push bc push bc
ld a, [TempEnemyMonSpecies] ld a, [TempEnemyMonSpecies]
ld de, 1 ld de, 1
ld hl, .Often ld hl, OftenFleeMons
call IsInArray call IsInArray
pop bc pop bc
jr c, .Flee jr c, .Flee
@ -798,7 +798,7 @@ Function3c543: ; 3c543
ld a, [TempEnemyMonSpecies] ld a, [TempEnemyMonSpecies]
ld de, 1 ld de, 1
ld hl, .Sometimes ld hl, SometimesFleeMons
call IsInArray call IsInArray
jr c, .Flee jr c, .Flee
@ -811,7 +811,9 @@ Function3c543: ; 3c543
ret ret
; 3c59a ; 3c59a
.Sometimes FleeMons:
SometimesFleeMons: ; 3c59a
db MAGNEMITE db MAGNEMITE
db GRIMER db GRIMER
db TANGELA db TANGELA
@ -825,9 +827,9 @@ Function3c543: ; 3c543
db UNOWN db UNOWN
db SNUBBULL db SNUBBULL
db HERACROSS db HERACROSS
db $ff db -1
.Often OftenFleeMons: ; 3c5a8
db CUBONE db CUBONE
db ARTICUNO db ARTICUNO
db ZAPDOS db ZAPDOS
@ -836,13 +838,13 @@ Function3c543: ; 3c543
db DELIBIRD db DELIBIRD
db PHANPY db PHANPY
db TEDDIURSA db TEDDIURSA
db $ff db -1
.Always AlwaysFleeMons: ; 3c5b1
db RAIKOU db RAIKOU
db ENTEI db ENTEI
; db SUICUNE ; db SUICUNE
db $ff db -1
; 3c5b4 ; 3c5b4

View File

@ -803,31 +803,31 @@ Function_0xed12: ; ed12
Function_0xed68: ; ed68 Function_0xed68: ; ed68
ld a, [TempEnemyMonSpecies] ld a, [TempEnemyMonSpecies]
ld c, a ld c, a
ld hl, $459a ld hl, FleeMons
ld d, $3 ld d, 3
.asm_ed71 .loop
ld a, $f ld a, BANK(FleeMons)
call GetFarByte call GetFarByte
inc hl inc hl
cp $ff cp -1
jr z, .asm_ed88 jr z, .next
cp c cp c
jr nz, .asm_ed88 jr nz, .next
sla b sla b
jr c, .asm_ed85 jr c, .max
sla b sla b
ret nc ret nc
.asm_ed85 .max
ld b, $ff ld b, $ff
ret ret
.asm_ed88 .next
dec d dec d
jr nz, .asm_ed71 jr nz, .loop
ret ret
; ed8c ; ed8c