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 | |
| parent | cdd34eb45b5093e595455b4f4556bed643cceafa (diff) | |
Clean up some bank 3 functions and rename flag action functions.
Diffstat (limited to 'engine/battle')
| -rwxr-xr-x | engine/battle/15.asm | 16 | ||||
| -rwxr-xr-x | engine/battle/core.asm | 32 |
2 files changed, 24 insertions, 24 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] diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 67eeb2ff..a0e8f3ee 100755 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -320,12 +320,12 @@ Func_3c1ad: ; 3c1ad (f:41ad) ld b, $1 push bc ld hl, W_PLAYERMONSALIVEFLAGS - ld a, $10 - call Predef ; indirect jump to HandleBitArray (f666 (3:7666)) + ld a, $10 ; FlagActionPredef + call Predef ld hl, $ccf5 pop bc - ld a, $10 - call Predef ; indirect jump to HandleBitArray (f666 (3:7666)) + ld a, $10 ; FlagActionPredef + call Predef call Func_3cba6 call LoadScreenTilesFromBuffer1 call Func_3cc91 @@ -1053,8 +1053,8 @@ Func_3c741: ; 3c741 (f:4741) ld c, a ld hl, W_PLAYERMONSALIVEFLAGS ; clear fainted mon's alive flag ld b, $0 - ld a, $10 - call Predef ; indirect jump to HandleBitArray (f666 (3:7666)) + ld a, $10 ; FlagActionPredef + call Predef ld hl, W_ENEMYBATTSTATUS1 ; $d067 res 2, [hl] ; reset "attacking multiple times" flag ld a, [$d083] @@ -1153,12 +1153,12 @@ Func_3c7d8: ; 3c7d8 (f:47d8) ld hl, W_PLAYERMONSALIVEFLAGS ld b, $1 push bc - ld a, $10 - call Predef ; indirect jump to HandleBitArray (f666 (3:7666)) + ld a, $10 ; FlagActionPredef + call Predef pop bc ld hl, $ccf5 - ld a, $10 - call Predef ; indirect jump to HandleBitArray (f666 (3:7666)) + ld a, $10 ; FlagActionPredef + call Predef call Func_3cba6 call GBPalWhiteOut call Func_3ee5b @@ -2440,12 +2440,12 @@ Func_3d1ba: ; 3d1ba (f:51ba) ld b, $1 push bc ld hl, W_PLAYERMONSALIVEFLAGS - ld a, $10 - call Predef ; indirect jump to HandleBitArray (f666 (3:7666)) + ld a, $10 ; FlagActionPredef + call Predef pop bc ld hl, $ccf5 - ld a, $10 - call Predef ; indirect jump to HandleBitArray (f666 (3:7666)) + ld a, $10 ; FlagActionPredef + call Predef call Func_3cba6 call Func_3cc91 call SaveScreenTilesToBuffer1 @@ -6185,8 +6185,8 @@ Func_3eb01: ; 3eb01 (f:6b01) ld c, a ld b, $1 ld hl, wPokedexSeen ; $d30a - ld a, $10 - call Predef ; indirect jump to HandleBitArray (f666 (3:7666)) + ld a, $10 ; FlagActionPredef + call Predef ld hl, W_ENEMYMONLEVEL ; $cff3 ld de, $cd23 ld bc, $b |