From 09a0e3aa85b22769a959e8c5b6abec38d2d770b2 Mon Sep 17 00:00:00 2001 From: Bryan Bishop Date: Fri, 27 Apr 2012 15:52:57 -0500 Subject: [PATCH] redo item constants (some were missed?) --- constants.asm | 358 ++++++++++++++++++++++++--------------- extras/item_constants.py | 6 +- 2 files changed, 227 insertions(+), 137 deletions(-) diff --git a/constants.asm b/constants.asm index d4bbe9caa..4f4916e82 100644 --- a/constants.asm +++ b/constants.asm @@ -523,140 +523,6 @@ ICE EQU $19 DRAGON EQU $1A DARK EQU $1B -; item constants -MASTER_BALL EQU $01 -BRIGHTPOWDER EQU $03 -MOON_STONE EQU $08 -ANTIDOTE EQU $09 -BURN_HEAL EQU $0A -ICE_HEAL EQU $0B -AWAKENING EQU $0C -PARALYZ_HEAL EQU $0D -FULL_RESTORE EQU $0E -MAX_POTION EQU $0F -HYPER_POTION EQU $10 -SUPER_POTION EQU $11 -POTION EQU $12 -ESCAPE_ROPE EQU $13 -REPEL EQU $14 -MAX_ELIXER EQU $15 -FIRE_STONE EQU $16 -THUNDER_STONE EQU $17 -WATER_STONE EQU $18 -HP_UP EQU $1A -PROTEIN EQU $1B -IRON EQU $1C -CARBOS EQU $1D -LUCKY_PUNCH EQU $1E -CALCIUM EQU $1F -RARE_CANDY EQU $20 -X_ACCURACY EQU $21 -LEAF_STONE EQU $22 -METALPOWDER EQU $23 -NUGGET EQU $24 -POKE_DOLL EQU $25 -FULL_HEAL EQU $26 -REVIVE EQU $27 -MAX_REVIVE EQU $28 -GUARD_SPEC EQU $29 -SUPER_REPEL EQU $2A -MAX_REPEL EQU $2B -DIRE_HIT EQU $2C -FRESH_WATER EQU $2E -SODA_POP EQU $2F -LEMONADE EQU $30 -X_ATTACK EQU $31 -X_DEFEND EQU $33 -X_SPEED EQU $34 -X_SPECIAL EQU $35 -SILVER_LEAF EQU $3C -PP_UP EQU $3E -ETHER EQU $3F -MAX_ETHER EQU $40 -ELIXER EQU $41 -MOOMOO_MILK EQU $48 -QUICK_CLAW EQU $49 -PSNCUREBERRY EQU $4A -GOLD_LEAF EQU $4B -SOFT_SAND EQU $4C -SHARP_BEAK EQU $4D -PRZCUREBERRY EQU $4E -BURNT_BERRY EQU $4F -ICE_BERRY EQU $50 -POISON_BARB EQU $51 -KINGS_ROCK EQU $52 -BITTER_BERRY EQU $53 -MINT_BERRY EQU $54 -RED_APRICORN EQU $55 -TINY_MUSHROOM EQU $56 -BIG_MUSHROOM EQU $57 -SILVERPOWDER EQU $58 -BLU_APRICORN EQU $59 -AMULENT_COIN EQU $5B -YLW_APRICORN EQU $5C -GRN_APRICORN EQU $5D -CLEANSE_TAG EQU $5E -MYSTIC_WATER EQU $5F -TWISTED_SPOON EQU $60 -WHT_APRICORN EQU $61 -BLACKBELT EQU $62 -BLK_APRICORN EQU $63 -PNK_APRICORN EQU $65 -BLACKGLASSES EQU $66 -SLOWPOKETAIL EQU $67 -PINK_BOW EQU $68 -STICK EQU $69 -SMOKE_BALL EQU $6A -NEVERMELTICE EQU $6B -MAGNET EQU $6C -MIRACLEBERRY EQU $6D -PEARL EQU $6E -BIG_PEARL EQU $6F -EVER_STONE EQU $70 -SPELL_TAG EQU $71 -RAGECANDYBAR EQU $72 -MIRACLE_SEED EQU $75 -THICK_CLUB EQU $76 -FOCUS_BAND EQU $77 -ENERGYPOWDER EQU $79 -ENERGY_ROOT EQU $7A -HEAL_POWDER EQU $7B -REVIVAL_HERB EQU $7C -HARD_STONE EQU $7D -LUCKY_EGG EQU $7E -STARDUST EQU $83 -STAR_PIECE EQU $84 -CHARCOAL EQU $8A -BERRYJUICE EQU $8B -SCOPE_LENS EQU $8C -METAL_COAT EQU $8F -DRAGON_FANG EQU $90 -LEFTOVERS EQU $92 -MYSTERYBERRY EQU $96 -DRAGON_SCALE EQU $97 -BERSERK_GENE EQU $98 -SACRED_ASH EQU $9C -FLOWER_MAIL EQU $9E -LIGHT_BALL EQU $A3 -NORMAL_BOX EQU $A7 -GORGEOUS_BOX EQU $A8 -SUN_STONE EQU $A9 -POLKADOT_BOW EQU $AA -UPGRADE EQU $AC -BERRY EQU $AD -GOLD_BERRY EQU $AE -SQUIRTBOTTLE EQU $AF -BRICK_PIECE EQU $B4 -SURF_MAIL EQU $B5 -LITEBLUEMAIL EQU $B6 -PORTRAIT_MAIL EQU $B7 -LOVELY_MAIL EQU $B8 -EON_MAIL EQU $B9 -MORPH_MAIL EQU $BA -BLUESKY_MAIL EQU $BB -MUSIC_MAIL EQU $BC -MIRAGE_MAIL EQU $BD - ; map group ids GROUP_OLIVINE_POKECENTER_1F EQU $01 GROUP_OLIVINE_GYM EQU $01 @@ -1437,3 +1303,227 @@ MAP_ROUTE_30_BERRY_SPEECH_HOUSE EQU $09 MAP_MR_POKEMONS_HOUSE EQU $0a MAP_ROUTE_31_VIOLET_GATE EQU $0b +; item constants +MASTER_BALL EQU $01 +ULTRA_BALL EQU $02 +BRIGHTPOWDER EQU $03 +GREAT_BALL EQU $04 +POKE_BALL EQU $05 +BICYCLE EQU $07 +MOON_STONE EQU $08 +ANTIDOTE EQU $09 +BURN_HEAL EQU $0A +ICE_HEAL EQU $0B +AWAKENING EQU $0C +PARLYZ_HEAL EQU $0D +FULL_RESTORE EQU $0E +MAX_POTION EQU $0F +HYPER_POTION EQU $10 +SUPER_POTION EQU $11 +POTION EQU $12 +ESCAPE_ROPE EQU $13 +REPEL EQU $14 +MAX_ELIXER EQU $15 +FIRE_STONE EQU $16 +THUNDERSTONE EQU $17 +WATER_STONE EQU $18 +HP_UP EQU $1A +PROTEIN EQU $1B +IRON EQU $1C +CARBOS EQU $1D +LUCKY_PUNCH EQU $1E +CALCIUM EQU $1F +RARE_CANDY EQU $20 +X_ACCURACY EQU $21 +LEAF_STONE EQU $22 +METAL_POWDER EQU $23 +NUGGET EQU $24 +POKE_DOLL EQU $25 +FULL_HEAL EQU $26 +REVIVE EQU $27 +MAX_REVIVE EQU $28 +GUARD_SPEC EQU $29 +SUPER_REPEL EQU $2A +MAX_REPEL EQU $2B +DIRE_HIT EQU $2C +FRESH_WATER EQU $2E +SODA_POP EQU $2F +LEMONADE EQU $30 +X_ATTACK EQU $31 +X_DEFEND EQU $33 +X_SPEED EQU $34 +X_SPECIAL EQU $35 +COIN_CASE EQU $36 +ITEMFINDER EQU $37 +EXP_SHARE EQU $39 +OLD_ROD EQU $3A +GOOD_ROD EQU $3B +SILVER_LEAF EQU $3C +SUPER_ROD EQU $3D +PP_UP EQU $3E +ETHER EQU $3F +MAX_ETHER EQU $40 +ELIXER EQU $41 +RED_SCALE EQU $42 +SECRETPOTION EQU $43 +S_S_TICKET EQU $44 +MYSTERY_EGG EQU $45 +CLEAR_BELL EQU $46 +SILVER_WING EQU $47 +MOOMOO_MILK EQU $48 +QUICK_CLAW EQU $49 +PSNCUREBERRY EQU $4A +GOLD_LEAF EQU $4B +SOFT_SAND EQU $4C +SHARP_BEAK EQU $4D +PRZCUREBERRY EQU $4E +BURNT_BERRY EQU $4F +ICE_BERRY EQU $50 +POISON_BARB EQU $51 +KINGS_ROCK EQU $52 +BITTER_BERRY EQU $53 +MINT_BERRY EQU $54 +RED_APRICORN EQU $55 +TINYMUSHROOM EQU $56 +BIG_MUSHROOM EQU $57 +SILVERPOWDER EQU $58 +BLU_APRICORN EQU $59 +AMULET_COIN EQU $5B +YLW_APRICORN EQU $5C +GRN_APRICORN EQU $5D +CLEANSE_TAG EQU $5E +MYSTIC_WATER EQU $5F +TWISTEDSPOON EQU $60 +WHT_APRICORN EQU $61 +BLACKBELT EQU $62 +BLK_APRICORN EQU $63 +PNK_APRICORN EQU $65 +BLACKGLASSES EQU $66 +SLOWPOKETAIL EQU $67 +PINK_BOW EQU $68 +STICK EQU $69 +SMOKE_BALL EQU $6A +NEVERMELTICE EQU $6B +MAGNET EQU $6C +MIRACLEBERRY EQU $6D +PEARL EQU $6E +BIG_PEARL EQU $6F +EVERSTONE EQU $70 +SPELL_TAG EQU $71 +RAGECANDYBAR EQU $72 +GS_BALL EQU $73 +BLUE_CARD EQU $74 +MIRACLE_SEED EQU $75 +THICK_CLUB EQU $76 +FOCUS_BAND EQU $77 +ENERGYPOWDER EQU $79 +ENERGY_ROOT EQU $7A +HEAL_POWDER EQU $7B +REVIVAL_HERB EQU $7C +HARD_STONE EQU $7D +LUCKY_EGG EQU $7E +CARD_KEY EQU $7F +MACHINE_PART EQU $80 +EGG_TICKET EQU $81 +LOST_ITEM EQU $82 +STARDUST EQU $83 +STAR_PIECE EQU $84 +BASEMENT_KEY EQU $85 +PASS EQU $86 +CHARCOAL EQU $8A +BERRY_JUICE EQU $8B +SCOPE_LENS EQU $8C +METAL_COAT EQU $8F +DRAGON_FANG EQU $90 +LEFTOVERS EQU $92 +MYSTERYBERRY EQU $96 +DRAGON_SCALE EQU $97 +BERSERK_GENE EQU $98 +SACRED_ASH EQU $9C +HEAVY_BALL EQU $9D +FLOWER_MAIL EQU $9E +LEVEL_BALL EQU $9F +LURE_BALL EQU $A0 +FAST_BALL EQU $A1 +LIGHT_BALL EQU $A3 +FRIEND_BALL EQU $A4 +MOON_BALL EQU $A5 +LOVE_BALL EQU $A6 +NORMAL_BOX EQU $A7 +GORGEOUS_BOX EQU $A8 +SUN_STONE EQU $A9 +POLKADOT_BOW EQU $AA +UP_GRADE EQU $AC +BERRY EQU $AD +GOLD_BERRY EQU $AE +SQUIRTBOTTLE EQU $AF +PARK_BALL EQU $B1 +RAINBOW_WING EQU $B2 +BRICK_PIECE EQU $B4 +SURF_MAIL EQU $B5 +LITEBLUEMAIL EQU $B6 +PORTRAITM_AIL EQU $B7 +LOVELY_MAIL EQU $B8 +EON_MAIL EQU $B9 +MORPH_MAIL EQU $BA +BLUESKY_MAIL EQU $BB +MUSIC_MAIL EQU $BC +MIRAGE_MAIL EQU $BD +TM_01 EQU $BF +TM_02 EQU $C0 +TM_03 EQU $C1 +TM_04 EQU $C2 +TM_05 EQU $C4 +TM_06 EQU $C5 +TM_07 EQU $C6 +TM_08 EQU $C7 +TM_09 EQU $C8 +TM_10 EQU $C9 +TM_11 EQU $CA +TM_12 EQU $CB +TM_13 EQU $CC +TM_14 EQU $CD +TM_15 EQU $CE +TM_16 EQU $CF +TM_17 EQU $D0 +TM_18 EQU $D1 +TM_19 EQU $D2 +TM_20 EQU $D3 +TM_21 EQU $D4 +TM_22 EQU $D5 +TM_23 EQU $D6 +TM_24 EQU $D7 +TM_25 EQU $D8 +TM_26 EQU $D9 +TM_27 EQU $DA +TM_28 EQU $DB +TM_29 EQU $DD +TM_30 EQU $DE +TM_31 EQU $DF +TM_32 EQU $E0 +TM_33 EQU $E1 +TM_34 EQU $E2 +TM_35 EQU $E3 +TM_36 EQU $E4 +TM_37 EQU $E5 +TM_38 EQU $E6 +TM_39 EQU $E7 +TM_40 EQU $E8 +TM_41 EQU $E9 +TM_42 EQU $EA +TM_43 EQU $EB +TM_44 EQU $EC +TM_45 EQU $ED +TM_46 EQU $EE +TM_47 EQU $EF +TM_48 EQU $F0 +TM_49 EQU $F1 +TM_50 EQU $F2 +HM_01 EQU $F3 +HM_02 EQU $F4 +HM_03 EQU $F5 +HM_04 EQU $F6 +HM_05 EQU $F7 +HM_06 EQU $F8 +HM_07 EQU $F9 + diff --git a/extras/item_constants.py b/extras/item_constants.py index 0346f5696..d60dfb1f3 100644 --- a/extras/item_constants.py +++ b/extras/item_constants.py @@ -36,7 +36,7 @@ item_constants = {1: 'MASTER_BALL', 38: 'FULL_HEAL', 39: 'REVIVE', 40: 'MAX_REVIVE', -41: 'GUARD_SPEC.', +41: 'GUARD_SPEC', 42: 'SUPER_REPEL', 43: 'MAX_REPEL', 44: 'DIRE_HIT', @@ -60,7 +60,7 @@ item_constants = {1: 'MASTER_BALL', 65: 'ELIXER', 66: 'RED_SCALE', 67: 'SECRETPOTION', -68: 'S.S.TICKET', +68: 'S_S_TICKET', 69: 'MYSTERY_EGG', 70: 'CLEAR_BELL', 71: 'SILVER_WING', @@ -74,7 +74,7 @@ item_constants = {1: 'MASTER_BALL', 79: 'BURNT_BERRY', 80: 'ICE_BERRY', 81: 'POISON_BARB', -82: "KING'S_ROCK", +82: "KINGS_ROCK", 83: 'BITTER_BERRY', 84: 'MINT_BERRY', 85: 'RED_APRICORN',