Rooba
/
pokecrystal
mirror of https://github.com/pret/pokecrystal.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Explicit NO_LIMITS instead of 0

This commit is contained in:
Rangi 2018-05-05 19:19:51 -04:00
parent 5a9975c541
commit de0b344be4
2 changed files with 35 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
constants/item_data_constants.asm
View File

@ -28,6 +28,7 @@ ITEMMENU_CLOSE EQU 6
CANT_SELECT_F EQU 6
CANT_TOSS_F EQU 7
NO_LIMITS EQU 0
CANT_SELECT EQU 1 << CANT_SELECT_F
CANT_TOSS EQU 1 << CANT_TOSS_F

68
data/items/attributes.asm
View File

@ -18,7 +18,7 @@ ItemAttributes: ; 67c1
; POKE_BALL
item_attribute 200, HELD_NONE, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE
; TOWN_MAP
item_attribute $9999, HELD_NONE, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; BICYCLE
item_attribute 0, HELD_NONE, 0, CANT_TOSS, KEY_ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE
; MOON_STONE
@ -56,7 +56,7 @@ ItemAttributes: ; 67c1
; WATER_STONE
item_attribute 2100, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; ITEM_19
item_attribute $9999, HELD_NONE, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; HP_UP
item_attribute 9800, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; PROTEIN
@ -96,7 +96,7 @@ ItemAttributes: ; 67c1
; DIRE_HIT
item_attribute 650, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_CLOSE
; ITEM_2D
item_attribute $9999, HELD_NONE, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; FRESH_WATER
item_attribute 200, HELD_NONE, 50, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
; SODA_POP
@ -106,7 +106,7 @@ ItemAttributes: ; 67c1
; X_ATTACK
item_attribute 500, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_CLOSE
; ITEM_32
item_attribute $9999, HELD_NONE, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; X_DEFEND
item_attribute 550, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_CLOSE
; X_SPEED
@ -118,7 +118,7 @@ ItemAttributes: ; 67c1
; ITEMFINDER
item_attribute 0, HELD_NONE, 0, CANT_TOSS, KEY_ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE
; POKE_FLUTE
item_attribute $9999, HELD_NONE, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; EXP_SHARE
item_attribute 3000, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; OLD_ROD
@ -186,7 +186,7 @@ ItemAttributes: ; 67c1
; BLU_APRICORN
item_attribute 200, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; ITEM_5A
item_attribute $9999, HELD_NONE, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; AMULET_COIN
item_attribute 100, HELD_AMULET_COIN, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; YLW_APRICORN
@ -206,7 +206,7 @@ ItemAttributes: ; 67c1
; BLK_APRICORN
item_attribute 200, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; ITEM_64
item_attribute $9999, HELD_NONE, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; PNK_APRICORN
item_attribute 200, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; BLACKGLASSES
@ -246,7 +246,7 @@ ItemAttributes: ; 67c1
; FOCUS_BAND
item_attribute 200, HELD_FOCUS_BAND, 30, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; ITEM_78
item_attribute $9999, HELD_NONE, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; ENERGYPOWDER
item_attribute 500, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
; ENERGY_ROOT
@ -276,11 +276,11 @@ ItemAttributes: ; 67c1
; PASS
item_attribute 0, HELD_NONE, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; ITEM_87
item_attribute $9999, HELD_NONE, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; ITEM_88
item_attribute $9999, HELD_NONE, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; ITEM_89
item_attribute $9999, HELD_NONE, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; CHARCOAL
item_attribute 9800, HELD_FIRE_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; BERRY_JUICE
@ -288,23 +288,23 @@ ItemAttributes: ; 67c1
; SCOPE_LENS
item_attribute 200, HELD_CRITICAL_UP, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; ITEM_8D
item_attribute $9999, HELD_NONE, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; ITEM_8E
item_attribute $9999, HELD_NONE, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; METAL_COAT
item_attribute 100, HELD_STEEL_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; DRAGON_FANG
item_attribute 100, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; ITEM_91
item_attribute $9999, HELD_NONE, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; LEFTOVERS
item_attribute 200, HELD_LEFTOVERS, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; ITEM_93
item_attribute $9999, HELD_NONE, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; ITEM_94
item_attribute $9999, HELD_NONE, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; ITEM_95
item_attribute $9999, HELD_NONE, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; MYSTERYBERRY
item_attribute 10, HELD_RESTORE_PP, -1, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
; DRAGON_SCALE
@ -312,11 +312,11 @@ ItemAttributes: ; 67c1
; BERSERK_GENE
item_attribute 200, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; ITEM_99
item_attribute $9999, HELD_NONE, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; ITEM_9A
item_attribute $9999, HELD_NONE, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; ITEM_9B
item_attribute $9999, HELD_NONE, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; SACRED_ASH
item_attribute 200, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE
; HEAVY_BALL
@ -330,7 +330,7 @@ ItemAttributes: ; 67c1
; FAST_BALL
item_attribute 150, HELD_NONE, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE
; ITEM_A2
item_attribute $9999, HELD_NONE, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; LIGHT_BALL
item_attribute 100, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; FRIEND_BALL
@ -348,7 +348,7 @@ ItemAttributes: ; 67c1
; POLKADOT_BOW
item_attribute 100, HELD_NORMAL_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; ITEM_AB
item_attribute $9999, HELD_NONE, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; UP_GRADE
item_attribute 2100, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; BERRY
@ -358,13 +358,13 @@ ItemAttributes: ; 67c1
; SQUIRTBOTTLE
item_attribute 0, HELD_NONE, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE
; ITEM_B0
item_attribute $9999, HELD_NONE, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; PARK_BALL
item_attribute 0, HELD_NONE, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE
; RAINBOW_WING
item_attribute 0, HELD_NONE, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; ITEM_B3
item_attribute $9999, HELD_NONE, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; BRICK_PIECE
item_attribute 50, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; SURF_MAIL
@ -386,7 +386,7 @@ ItemAttributes: ; 67c1
; MIRAGE_MAIL
item_attribute 50, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; ITEM_BE
item_attribute $9999, HELD_NONE, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; TM01
item_attribute 3000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; TM02
@ -396,7 +396,7 @@ ItemAttributes: ; 67c1
; TM04
item_attribute 2000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; ITEM_C3
item_attribute $9999, HELD_NONE, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; TM05
item_attribute 1000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; TM06
@ -446,7 +446,7 @@ ItemAttributes: ; 67c1
; TM28
item_attribute 2000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; ITEM_DC
item_attribute $9999, HELD_NONE, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; TM29
item_attribute 2000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; TM30
@ -506,16 +506,16 @@ ItemAttributes: ; 67c1
; HM07
item_attribute 0, HELD_NONE, 0, CANT_SELECT | CANT_TOSS, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; ITEM_FA
item_attribute $9999, HELD_NONE, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; $fb
item_attribute $9999, HELD_NONE, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; $fc
item_attribute $9999, HELD_NONE, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; $fd
item_attribute $9999, HELD_NONE, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; $fe
item_attribute $9999, HELD_NONE, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; $ff
item_attribute $9999, HELD_NONE, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; $00
item_attribute $9999, HELD_NONE, 0, 0, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE