You've already forked pokecrystal-board
mirror of
https://gitlab.com/xCrystal/pokecrystal-board.git
synced 2025-04-09 05:44:44 -07:00
Add constants for unused items, including Town Map and Poke Flute.
This commit is contained in:
@@ -4,6 +4,7 @@ ULTRA_BALL EQU $02
|
|||||||
BRIGHTPOWDER EQU $03
|
BRIGHTPOWDER EQU $03
|
||||||
GREAT_BALL EQU $04
|
GREAT_BALL EQU $04
|
||||||
POKE_BALL EQU $05
|
POKE_BALL EQU $05
|
||||||
|
TOWN_MAP EQU $06
|
||||||
BICYCLE EQU $07
|
BICYCLE EQU $07
|
||||||
MOON_STONE EQU $08
|
MOON_STONE EQU $08
|
||||||
ANTIDOTE EQU $09
|
ANTIDOTE EQU $09
|
||||||
@@ -22,6 +23,7 @@ MAX_ELIXER EQU $15
|
|||||||
FIRE_STONE EQU $16
|
FIRE_STONE EQU $16
|
||||||
THUNDERSTONE EQU $17
|
THUNDERSTONE EQU $17
|
||||||
WATER_STONE EQU $18
|
WATER_STONE EQU $18
|
||||||
|
ITEM_19 EQU $19
|
||||||
HP_UP EQU $1A
|
HP_UP EQU $1A
|
||||||
PROTEIN EQU $1B
|
PROTEIN EQU $1B
|
||||||
IRON EQU $1C
|
IRON EQU $1C
|
||||||
@@ -41,15 +43,18 @@ GUARD_SPEC EQU $29
|
|||||||
SUPER_REPEL EQU $2A
|
SUPER_REPEL EQU $2A
|
||||||
MAX_REPEL EQU $2B
|
MAX_REPEL EQU $2B
|
||||||
DIRE_HIT EQU $2C
|
DIRE_HIT EQU $2C
|
||||||
|
ITEM_2D EQU $2D
|
||||||
FRESH_WATER EQU $2E
|
FRESH_WATER EQU $2E
|
||||||
SODA_POP EQU $2F
|
SODA_POP EQU $2F
|
||||||
LEMONADE EQU $30
|
LEMONADE EQU $30
|
||||||
X_ATTACK EQU $31
|
X_ATTACK EQU $31
|
||||||
|
ITEM_32 EQU $32
|
||||||
X_DEFEND EQU $33
|
X_DEFEND EQU $33
|
||||||
X_SPEED EQU $34
|
X_SPEED EQU $34
|
||||||
X_SPECIAL EQU $35
|
X_SPECIAL EQU $35
|
||||||
COIN_CASE EQU $36
|
COIN_CASE EQU $36
|
||||||
ITEMFINDER EQU $37
|
ITEMFINDER EQU $37
|
||||||
|
POKE_FLUTE EQU $38
|
||||||
EXP_SHARE EQU $39
|
EXP_SHARE EQU $39
|
||||||
OLD_ROD EQU $3A
|
OLD_ROD EQU $3A
|
||||||
GOOD_ROD EQU $3B
|
GOOD_ROD EQU $3B
|
||||||
@@ -83,6 +88,7 @@ TINYMUSHROOM EQU $56
|
|||||||
BIG_MUSHROOM EQU $57
|
BIG_MUSHROOM EQU $57
|
||||||
SILVERPOWDER EQU $58
|
SILVERPOWDER EQU $58
|
||||||
BLU_APRICORN EQU $59
|
BLU_APRICORN EQU $59
|
||||||
|
ITEM_5A EQU $5A
|
||||||
AMULET_COIN EQU $5B
|
AMULET_COIN EQU $5B
|
||||||
YLW_APRICORN EQU $5C
|
YLW_APRICORN EQU $5C
|
||||||
GRN_APRICORN EQU $5D
|
GRN_APRICORN EQU $5D
|
||||||
@@ -92,6 +98,7 @@ TWISTEDSPOON EQU $60
|
|||||||
WHT_APRICORN EQU $61
|
WHT_APRICORN EQU $61
|
||||||
BLACKBELT EQU $62
|
BLACKBELT EQU $62
|
||||||
BLK_APRICORN EQU $63
|
BLK_APRICORN EQU $63
|
||||||
|
ITEM_64 EQU $64
|
||||||
PNK_APRICORN EQU $65
|
PNK_APRICORN EQU $65
|
||||||
BLACKGLASSES EQU $66
|
BLACKGLASSES EQU $66
|
||||||
SLOWPOKETAIL EQU $67
|
SLOWPOKETAIL EQU $67
|
||||||
@@ -111,6 +118,7 @@ BLUE_CARD EQU $74
|
|||||||
MIRACLE_SEED EQU $75
|
MIRACLE_SEED EQU $75
|
||||||
THICK_CLUB EQU $76
|
THICK_CLUB EQU $76
|
||||||
FOCUS_BAND EQU $77
|
FOCUS_BAND EQU $77
|
||||||
|
ITEM_78 EQU $78
|
||||||
ENERGYPOWDER EQU $79
|
ENERGYPOWDER EQU $79
|
||||||
ENERGY_ROOT EQU $7A
|
ENERGY_ROOT EQU $7A
|
||||||
HEAL_POWDER EQU $7B
|
HEAL_POWDER EQU $7B
|
||||||
@@ -125,21 +133,34 @@ STARDUST EQU $83
|
|||||||
STAR_PIECE EQU $84
|
STAR_PIECE EQU $84
|
||||||
BASEMENT_KEY EQU $85
|
BASEMENT_KEY EQU $85
|
||||||
PASS EQU $86
|
PASS EQU $86
|
||||||
|
ITEM_87 EQU $87
|
||||||
|
ITEM_88 EQU $88
|
||||||
|
ITEM_89 EQU $89
|
||||||
CHARCOAL EQU $8A
|
CHARCOAL EQU $8A
|
||||||
BERRY_JUICE EQU $8B
|
BERRY_JUICE EQU $8B
|
||||||
SCOPE_LENS EQU $8C
|
SCOPE_LENS EQU $8C
|
||||||
|
ITEM_8D EQU $8D
|
||||||
|
ITEM_8E EQU $8E
|
||||||
METAL_COAT EQU $8F
|
METAL_COAT EQU $8F
|
||||||
DRAGON_FANG EQU $90
|
DRAGON_FANG EQU $90
|
||||||
|
ITEM_91 EQU $91
|
||||||
LEFTOVERS EQU $92
|
LEFTOVERS EQU $92
|
||||||
|
ITEM_93 EQU $93
|
||||||
|
ITEM_94 EQU $94
|
||||||
|
ITEM_95 EQU $95
|
||||||
MYSTERYBERRY EQU $96
|
MYSTERYBERRY EQU $96
|
||||||
DRAGON_SCALE EQU $97
|
DRAGON_SCALE EQU $97
|
||||||
BERSERK_GENE EQU $98
|
BERSERK_GENE EQU $98
|
||||||
|
ITEM_99 EQU $99
|
||||||
|
ITEM_9A EQU $9A
|
||||||
|
ITEM_9B EQU $9B
|
||||||
SACRED_ASH EQU $9C
|
SACRED_ASH EQU $9C
|
||||||
HEAVY_BALL EQU $9D
|
HEAVY_BALL EQU $9D
|
||||||
FLOWER_MAIL EQU $9E
|
FLOWER_MAIL EQU $9E
|
||||||
LEVEL_BALL EQU $9F
|
LEVEL_BALL EQU $9F
|
||||||
LURE_BALL EQU $A0
|
LURE_BALL EQU $A0
|
||||||
FAST_BALL EQU $A1
|
FAST_BALL EQU $A1
|
||||||
|
ITEM_A2 EQU $A2
|
||||||
LIGHT_BALL EQU $A3
|
LIGHT_BALL EQU $A3
|
||||||
FRIEND_BALL EQU $A4
|
FRIEND_BALL EQU $A4
|
||||||
MOON_BALL EQU $A5
|
MOON_BALL EQU $A5
|
||||||
@@ -148,12 +169,15 @@ NORMAL_BOX EQU $A7
|
|||||||
GORGEOUS_BOX EQU $A8
|
GORGEOUS_BOX EQU $A8
|
||||||
SUN_STONE EQU $A9
|
SUN_STONE EQU $A9
|
||||||
POLKADOT_BOW EQU $AA
|
POLKADOT_BOW EQU $AA
|
||||||
|
ITEM_AB EQU $AB
|
||||||
UP_GRADE EQU $AC
|
UP_GRADE EQU $AC
|
||||||
BERRY EQU $AD
|
BERRY EQU $AD
|
||||||
GOLD_BERRY EQU $AE
|
GOLD_BERRY EQU $AE
|
||||||
SQUIRTBOTTLE EQU $AF
|
SQUIRTBOTTLE EQU $AF
|
||||||
|
ITEM_B0 EQU $B0
|
||||||
PARK_BALL EQU $B1
|
PARK_BALL EQU $B1
|
||||||
RAINBOW_WING EQU $B2
|
RAINBOW_WING EQU $B2
|
||||||
|
ITEM_B3 EQU $B3
|
||||||
BRICK_PIECE EQU $B4
|
BRICK_PIECE EQU $B4
|
||||||
SURF_MAIL EQU $B5
|
SURF_MAIL EQU $B5
|
||||||
LITEBLUEMAIL EQU $B6
|
LITEBLUEMAIL EQU $B6
|
||||||
@@ -164,10 +188,12 @@ MORPH_MAIL EQU $BA
|
|||||||
BLUESKY_MAIL EQU $BB
|
BLUESKY_MAIL EQU $BB
|
||||||
MUSIC_MAIL EQU $BC
|
MUSIC_MAIL EQU $BC
|
||||||
MIRAGE_MAIL EQU $BD
|
MIRAGE_MAIL EQU $BD
|
||||||
|
ITEM_BE EQU $BE
|
||||||
TM_01 EQU $BF
|
TM_01 EQU $BF
|
||||||
TM_02 EQU $C0
|
TM_02 EQU $C0
|
||||||
TM_03 EQU $C1
|
TM_03 EQU $C1
|
||||||
TM_04 EQU $C2
|
TM_04 EQU $C2
|
||||||
|
ITEM_C3 EQU $C3
|
||||||
TM_05 EQU $C4
|
TM_05 EQU $C4
|
||||||
TM_06 EQU $C5
|
TM_06 EQU $C5
|
||||||
TM_07 EQU $C6
|
TM_07 EQU $C6
|
||||||
@@ -192,6 +218,7 @@ TM_25 EQU $D8
|
|||||||
TM_26 EQU $D9
|
TM_26 EQU $D9
|
||||||
TM_27 EQU $DA
|
TM_27 EQU $DA
|
||||||
TM_28 EQU $DB
|
TM_28 EQU $DB
|
||||||
|
ITEM_DC EQU $DC
|
||||||
TM_29 EQU $DD
|
TM_29 EQU $DD
|
||||||
TM_30 EQU $DE
|
TM_30 EQU $DE
|
||||||
TM_31 EQU $DF
|
TM_31 EQU $DF
|
||||||
@@ -221,6 +248,7 @@ HM_04 EQU $F6
|
|||||||
HM_05 EQU $F7
|
HM_05 EQU $F7
|
||||||
HM_06 EQU $F8
|
HM_06 EQU $F8
|
||||||
HM_07 EQU $F9
|
HM_07 EQU $F9
|
||||||
|
HM_08 EQU $FA
|
||||||
|
|
||||||
NUM_TMS EQU HM_01 - TM_01 - 2
|
NUM_TMS EQU HM_01 - TM_01 - 2
|
||||||
|
|
||||||
@@ -231,8 +259,8 @@ BALL EQU 3
|
|||||||
TM_HM EQU 4
|
TM_HM EQU 4
|
||||||
|
|
||||||
; item actions
|
; item actions
|
||||||
CANT_SELECT EQU %01000000
|
CANT_SELECT EQU 1 << 6
|
||||||
CANT_TOSS EQU %10000000
|
CANT_TOSS EQU 1 << 7
|
||||||
|
|
||||||
; held item effects
|
; held item effects
|
||||||
HELD_BERRY EQU $01
|
HELD_BERRY EQU $01
|
||||||
|
@@ -19,7 +19,7 @@ ItemEffects: ; e73c
|
|||||||
dw Brightpowder
|
dw Brightpowder
|
||||||
dw GreatBall
|
dw GreatBall
|
||||||
dw PokeBall
|
dw PokeBall
|
||||||
dw Item06
|
dw TownMap
|
||||||
dw Bicycle
|
dw Bicycle
|
||||||
dw MoonStone
|
dw MoonStone
|
||||||
dw Antidote
|
dw Antidote
|
||||||
@@ -69,7 +69,7 @@ ItemEffects: ; e73c
|
|||||||
dw XSpecial
|
dw XSpecial
|
||||||
dw CoinCase
|
dw CoinCase
|
||||||
dw Itemfinder
|
dw Itemfinder
|
||||||
dw Item38
|
dw PokeFlute
|
||||||
dw ExpShare
|
dw ExpShare
|
||||||
dw OldRod
|
dw OldRod
|
||||||
dw GoodRod
|
dw GoodRod
|
||||||
@@ -1152,7 +1152,7 @@ Functionedfa: ; edfa (3:6dfa)
|
|||||||
callba Function2715c
|
callba Function2715c
|
||||||
ret
|
ret
|
||||||
|
|
||||||
Item06: ; ee01
|
TownMap: ; ee01
|
||||||
callba Function91ae1
|
callba Function91ae1
|
||||||
ret
|
ret
|
||||||
; ee08
|
; ee08
|
||||||
@@ -2374,7 +2374,7 @@ Tablef504: ; f504
|
|||||||
; f50c
|
; f50c
|
||||||
|
|
||||||
|
|
||||||
Item38: ; f50c
|
PokeFlute: ; f50c
|
||||||
ld a, [IsInBattle]
|
ld a, [IsInBattle]
|
||||||
and a
|
and a
|
||||||
jr nz, .asm_f512
|
jr nz, .asm_f512
|
||||||
|
24
main.asm
24
main.asm
@@ -37376,18 +37376,18 @@ Function28771: ; 28771
|
|||||||
|
|
||||||
Unknown_28785: ; 28785
|
Unknown_28785: ; 28785
|
||||||
; Alternate mappings for unused items.
|
; Alternate mappings for unused items.
|
||||||
db $19, LEFTOVERS
|
db ITEM_19, LEFTOVERS
|
||||||
db $2d, BITTER_BERRY
|
db ITEM_2D, BITTER_BERRY
|
||||||
db $32, GOLD_BERRY
|
db ITEM_32, GOLD_BERRY
|
||||||
db $5a, BERRY
|
db ITEM_5A, BERRY
|
||||||
db $64, BERRY
|
db ITEM_64, BERRY
|
||||||
db $78, BERRY
|
db ITEM_78, BERRY
|
||||||
db $87, BERRY
|
db ITEM_87, BERRY
|
||||||
db $be, BERRY
|
db ITEM_BE, BERRY
|
||||||
db $c3, BERRY
|
db ITEM_C3, BERRY
|
||||||
db $dc, BERRY
|
db ITEM_DC, BERRY
|
||||||
db $fa, BERRY
|
db HM_08, BERRY
|
||||||
db $ff, BERRY
|
db $ff, BERRY
|
||||||
db $00
|
db $00
|
||||||
; 2879e
|
; 2879e
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user