Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move battle start animation functions to its own file

Browse Source
This commit is contained in:
PikalaxALT
2015-10-19 10:23:58 -04:00
parent 52605b764a
commit 0a244e043c
24 changed files with 1350 additions and 1673 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
items/item_effects.asm
View File

@@ -208,7 +208,7 @@ FriendBall:
MoonBall:
LoveBall:
ParkBall: ; e8a2
ld a, [IsInBattle]
ld a, [wBattleMode]
dec a
jp nz, Functionf7a0
@@ -1657,7 +1657,7 @@ Functionf0d6: ; f0d6
call Functionf30d
ld a, 1
ret nz
ld a, [IsInBattle]
ld a, [wBattleMode]
and a
jr z, .asm_f104
@@ -1936,7 +1936,7 @@ Functionf2a2: ; f2a2 (3:72a2)
ret
Functionf2a6: ; f2a6 (3:72a6)
ld a, [IsInBattle]
ld a, [wBattleMode]
and a
ret z
ld a, [CurPartyMon]
@@ -2280,7 +2280,7 @@ XAccuracy: ; f482
PokeDoll: ; f48f
ld a, [IsInBattle]
ld a, [wBattleMode]
dec a
jr nz, .asm_f4a6
inc a
@@ -2362,7 +2362,7 @@ Tablef504: ; f504
PokeFlute: ; f50c
ld a, [IsInBattle]
ld a, [wBattleMode]
and a
jr nz, .asm_f512
.asm_f512
@@ -2375,7 +2375,7 @@ PokeFlute: ; f50c
ld hl, PartyMon1Status
call .Functionf554
ld a, [IsInBattle]
ld a, [wBattleMode]
cp WILD_BATTLE
jr z, .asm_f52b
ld hl, OTPartyMon1Status
@@ -2448,7 +2448,7 @@ UnknownText_0xf576: ; 0xf576
Function_0xf57b: ; f57b
ld a, [IsInBattle]
ld a, [wBattleMode]
and a
jr nz, .asm_f58c
@@ -2600,7 +2600,7 @@ Functionf64c: ; f64c
; f652
Functionf652: ; f652
ld a, [IsInBattle]
ld a, [wBattleMode]
and a
jr z, .asm_f66c
ld a, [CurPartyMon]