constants for flag actions

This commit is contained in:
YamaArashi 2015-07-19 20:45:34 -07:00
parent 1d86932cc9
commit db7d941d22
16 changed files with 57 additions and 51 deletions

View file

@ -10,7 +10,7 @@ HiddenItemNear: ; 7481f (1d:481f)
push hl
ld hl, wObtainedHiddenItemsFlags
ld c, b
ld b, $2
ld b, FLAG_TEST
predef FlagActionPredef
ld a, c
pop hl

View file

@ -400,15 +400,15 @@ ItemUseBall: ; d687 (3:5687)
ld a,[wd11e]
dec a
ld c,a
ld b,2
ld hl,wPokedexOwned ;Dex_own_flags (pokemon)
ld b,FLAG_TEST
ld hl,wPokedexOwned
predef FlagActionPredef
ld a,c
push af
ld a,[wd11e]
dec a
ld c,a
ld b,1
ld b,FLAG_SET
predef FlagActionPredef
pop af
and a
@ -804,7 +804,7 @@ ItemUseMedicine: ; dabb (3:5abb)
ld a,[wUsedItemOnWhichPokemon]
ld c,a
ld hl,wPartyFoughtCurrentEnemyFlags
ld b,$02
ld b,FLAG_TEST
predef FlagActionPredef
ld a,c
and a
@ -812,7 +812,7 @@ ItemUseMedicine: ; dabb (3:5abb)
ld a,[wUsedItemOnWhichPokemon]
ld c,a
ld hl,wPartyGainExpFlags
ld b,$01
ld b,FLAG_SET
predef FlagActionPredef
.next
pop bc
@ -2550,8 +2550,8 @@ IsKeyItem_: ; e764 (3:6764)
dec a
ld c,a
ld hl,wHPBarMaxHP
ld b,$02 ; test bit
predef FlagActionPredef ; bitfield operation function
ld b,FLAG_TEST
predef FlagActionPredef
ld a,c
and a
ret nz

View file

@ -17,7 +17,7 @@ CanLearnTM: ; 1373e (4:773e)
jr .findTMloop
.TMfoundLoop
pop hl
ld b, $2 ; read corresponding bit from TM compatibility array
ld b, FLAG_TEST
predef_jump FlagActionPredef
; converts TM/HM number in wd11e into move number