diff options
author | yenatch <yenatch@gmail.com> | 2014-05-25 10:09:39 -0700 |
---|---|---|
committer | yenatch <yenatch@gmail.com> | 2014-05-25 10:09:39 -0700 |
commit | d307c854991f5eb24e12935e6906ad81ed244334 (patch) | |
tree | 02b55a1baafe17e29dec3070076cf5e4578a658e /engine/battle/15.asm | |
parent | cdd34eb45b5093e595455b4f4556bed643cceafa (diff) |
Clean up some bank 3 functions and rename flag action functions.
Diffstat (limited to 'engine/battle/15.asm')
-rwxr-xr-x | engine/battle/15.asm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/engine/battle/15.asm b/engine/battle/15.asm index d2e93ab1..9d4bab4b 100755 --- a/engine/battle/15.asm +++ b/engine/battle/15.asm @@ -17,8 +17,8 @@ Func_5525f: ; 5525f (15:525f) ld a, [wWhichPokemon] ; $cf92 ld c, a ld b, $2 - ld a, $10 - call Predef ; indirect jump to HandleBitArray (f666 (3:7666)) + ld a, $10 ; FlagActionPredef + call Predef ld a, c and a pop hl @@ -251,8 +251,8 @@ Func_5525f: ; 5525f (15:525f) ld a, [wWhichPokemon] ; $cf92 ld c, a ld b, $1 - ld a, $10 - call Predef ; indirect jump to HandleBitArray (f666 (3:7666)) + ld a, $10 ; FlagActionPredef + call Predef pop hl pop af ld [W_CURENEMYLVL], a ; $d127 @@ -277,14 +277,14 @@ Func_55436: ; 55436 (15:5436) ld c, a ld b, $1 push bc - ld a, $10 - call Predef ; indirect jump to HandleBitArray (f666 (3:7666)) + ld a, $10 ; FlagActionPredef + call Predef ld hl, $ccf5 xor a ld [hl], a pop bc - ld a, $10 - jp Predef ; indirect jump to HandleBitArray (f666 (3:7666)) + ld a, $10 ; FlagActionPredef + jp Predef Func_5546c: ; 5546c (15:546c) ld a, [W_PLAYERMONSALIVEFLAGS] |