TypeBoostItems

2 files changed, 280 insertions, 18 deletions

diff --git a/stadiumgs/constants/item_constants.s b/stadiumgs/constants/item_constants.s
new file mode 100644
index 0000000..b631756
--- /dev/null
+++ b/stadiumgs/constants/item_constants.s
@@ -0,0 +1,261 @@
+NO_ITEM       EQU 0x00
+MASTER_BALL   EQU 0x01
+ULTRA_BALL    EQU 0x02
+BRIGHTPOWDER  EQU 0x03
+GREAT_BALL    EQU 0x04
+POKE_BALL     EQU 0x05
+BICYCLE       EQU 0x07
+MOON_STONE    EQU 0x08
+ANTIDOTE      EQU 0x09
+BURN_HEAL     EQU 0x0A
+ICE_HEAL      EQU 0x0B
+AWAKENING     EQU 0x0C
+PARLYZ_HEAL   EQU 0x0D
+FULL_RESTORE  EQU 0x0E
+MAX_POTION    EQU 0x0F
+HYPER_POTION  EQU 0x10
+SUPER_POTION  EQU 0x11
+POTION        EQU 0x12
+ESCAPE_ROPE   EQU 0x13
+REPEL         EQU 0x14
+MAX_ELIXER    EQU 0x15
+FIRE_STONE    EQU 0x16
+THUNDERSTONE  EQU 0x17
+WATER_STONE   EQU 0x18
+HP_UP         EQU 0x1A
+PROTEIN       EQU 0x1B
+IRON          EQU 0x1C
+CARBOS        EQU 0x1D
+LUCKY_PUNCH   EQU 0x1E
+CALCIUM       EQU 0x1F
+RARE_CANDY    EQU 0x20
+X_ACCURACY    EQU 0x21
+LEAF_STONE    EQU 0x22
+METAL_POWDER  EQU 0x23
+NUGGET        EQU 0x24
+POKE_DOLL     EQU 0x25
+FULL_HEAL     EQU 0x26
+REVIVE        EQU 0x27
+MAX_REVIVE    EQU 0x28
+GUARD_SPEC    EQU 0x29
+SUPER_REPEL   EQU 0x2A
+MAX_REPEL     EQU 0x2B
+DIRE_HIT      EQU 0x2C
+FRESH_WATER   EQU 0x2E
+SODA_POP      EQU 0x2F
+LEMONADE      EQU 0x30
+X_ATTACK      EQU 0x31
+X_DEFEND      EQU 0x33
+X_SPEED       EQU 0x34
+X_SPECIAL     EQU 0x35
+COIN_CASE     EQU 0x36
+ITEMFINDER    EQU 0x37
+EXP_SHARE     EQU 0x39
+OLD_ROD       EQU 0x3A
+GOOD_ROD      EQU 0x3B
+SILVER_LEAF   EQU 0x3C
+SUPER_ROD     EQU 0x3D
+PP_UP         EQU 0x3E
+ETHER         EQU 0x3F
+MAX_ETHER     EQU 0x40
+ELIXER        EQU 0x41
+RED_SCALE     EQU 0x42
+SECRETPOTION  EQU 0x43
+S_S_TICKET    EQU 0x44
+MYSTERY_EGG   EQU 0x45
+CLEAR_BELL    EQU 0x46
+SILVER_WING   EQU 0x47
+MOOMOO_MILK   EQU 0x48
+QUICK_CLAW    EQU 0x49
+PSNCUREBERRY  EQU 0x4A
+GOLD_LEAF     EQU 0x4B
+SOFT_SAND     EQU 0x4C
+SHARP_BEAK    EQU 0x4D
+PRZCUREBERRY  EQU 0x4E
+BURNT_BERRY   EQU 0x4F
+ICE_BERRY     EQU 0x50
+POISON_BARB   EQU 0x51
+KINGS_ROCK    EQU 0x52
+BITTER_BERRY  EQU 0x53
+MINT_BERRY    EQU 0x54
+RED_APRICORN  EQU 0x55
+TINYMUSHROOM  EQU 0x56
+BIG_MUSHROOM  EQU 0x57
+SILVERPOWDER  EQU 0x58
+BLU_APRICORN  EQU 0x59
+AMULET_COIN   EQU 0x5B
+YLW_APRICORN  EQU 0x5C
+GRN_APRICORN  EQU 0x5D
+CLEANSE_TAG   EQU 0x5E
+MYSTIC_WATER  EQU 0x5F
+TWISTEDSPOON  EQU 0x60
+WHT_APRICORN  EQU 0x61
+BLACKBELT     EQU 0x62
+BLK_APRICORN  EQU 0x63
+PNK_APRICORN  EQU 0x65
+BLACKGLASSES  EQU 0x66
+SLOWPOKETAIL  EQU 0x67
+PINK_BOW      EQU 0x68
+STICK         EQU 0x69
+SMOKE_BALL    EQU 0x6A
+NEVERMELTICE  EQU 0x6B
+MAGNET        EQU 0x6C
+MIRACLEBERRY  EQU 0x6D
+PEARL         EQU 0x6E
+BIG_PEARL     EQU 0x6F
+EVERSTONE     EQU 0x70
+SPELL_TAG     EQU 0x71
+RAGECANDYBAR  EQU 0x72
+GS_BALL       EQU 0x73
+BLUE_CARD     EQU 0x74
+MIRACLE_SEED  EQU 0x75
+THICK_CLUB    EQU 0x76
+FOCUS_BAND    EQU 0x77
+ENERGYPOWDER  EQU 0x79
+ENERGY_ROOT   EQU 0x7A
+HEAL_POWDER   EQU 0x7B
+REVIVAL_HERB  EQU 0x7C
+HARD_STONE    EQU 0x7D
+LUCKY_EGG     EQU 0x7E
+CARD_KEY      EQU 0x7F
+MACHINE_PART  EQU 0x80
+EGG_TICKET    EQU 0x81
+LOST_ITEM     EQU 0x82
+STARDUST      EQU 0x83
+STAR_PIECE    EQU 0x84
+BASEMENT_KEY  EQU 0x85
+PASS          EQU 0x86
+CHARCOAL      EQU 0x8A
+BERRY_JUICE   EQU 0x8B
+SCOPE_LENS    EQU 0x8C
+METAL_COAT    EQU 0x8F
+DRAGON_FANG   EQU 0x90
+LEFTOVERS     EQU 0x92
+MYSTERYBERRY  EQU 0x96
+DRAGON_SCALE  EQU 0x97
+BERSERK_GENE  EQU 0x98
+SACRED_ASH    EQU 0x9C
+HEAVY_BALL    EQU 0x9D
+FLOWER_MAIL   EQU 0x9E
+LEVEL_BALL    EQU 0x9F
+LURE_BALL     EQU 0xA0
+FAST_BALL     EQU 0xA1
+LIGHT_BALL    EQU 0xA3
+FRIEND_BALL   EQU 0xA4
+MOON_BALL     EQU 0xA5
+LOVE_BALL     EQU 0xA6
+NORMAL_BOX    EQU 0xA7
+GORGEOUS_BOX  EQU 0xA8
+SUN_STONE     EQU 0xA9
+POLKADOT_BOW  EQU 0xAA
+UP_GRADE      EQU 0xAC
+BERRY         EQU 0xAD
+GOLD_BERRY    EQU 0xAE
+SQUIRTBOTTLE  EQU 0xAF
+PARK_BALL     EQU 0xB1
+RAINBOW_WING  EQU 0xB2
+BRICK_PIECE   EQU 0xB4
+SURF_MAIL     EQU 0xB5
+LITEBLUEMAIL  EQU 0xB6
+PORTRAITMAIL  EQU 0xB7
+LOVELY_MAIL   EQU 0xB8
+EON_MAIL      EQU 0xB9
+MORPH_MAIL    EQU 0xBA
+BLUESKY_MAIL  EQU 0xBB
+MUSIC_MAIL    EQU 0xBC
+MIRAGE_MAIL   EQU 0xBD
+TM_01         EQU 0xBF
+TM_02         EQU 0xC0
+TM_03         EQU 0xC1
+TM_04         EQU 0xC2
+TM_05         EQU 0xC4
+TM_06         EQU 0xC5
+TM_07         EQU 0xC6
+TM_08         EQU 0xC7
+TM_09         EQU 0xC8
+TM_10         EQU 0xC9
+TM_11         EQU 0xCA
+TM_12         EQU 0xCB
+TM_13         EQU 0xCC
+TM_14         EQU 0xCD
+TM_15         EQU 0xCE
+TM_16         EQU 0xCF
+TM_17         EQU 0xD0
+TM_18         EQU 0xD1
+TM_19         EQU 0xD2
+TM_20         EQU 0xD3
+TM_21         EQU 0xD4
+TM_22         EQU 0xD5
+TM_23         EQU 0xD6
+TM_24         EQU 0xD7
+TM_25         EQU 0xD8
+TM_26         EQU 0xD9
+TM_27         EQU 0xDA
+TM_28         EQU 0xDB
+TM_29         EQU 0xDD
+TM_30         EQU 0xDE
+TM_31         EQU 0xDF
+TM_32         EQU 0xE0
+TM_33         EQU 0xE1
+TM_34         EQU 0xE2
+TM_35         EQU 0xE3
+TM_36         EQU 0xE4
+TM_37         EQU 0xE5
+TM_38         EQU 0xE6
+TM_39         EQU 0xE7
+TM_40         EQU 0xE8
+TM_41         EQU 0xE9
+TM_42         EQU 0xEA
+TM_43         EQU 0xEB
+TM_44         EQU 0xEC
+TM_45         EQU 0xED
+TM_46         EQU 0xEE
+TM_47         EQU 0xEF
+TM_48         EQU 0xF0
+TM_49         EQU 0xF1
+TM_50         EQU 0xF2
+HM_01         EQU 0xF3
+HM_02         EQU 0xF4
+HM_03         EQU 0xF5
+HM_04         EQU 0xF6
+HM_05         EQU 0xF7
+HM_06         EQU 0xF8
+HM_07         EQU 0xF9
+
+; held item effects
+HELD_BERRY          EQU 0x01
+HELD_LEFTOVERS      EQU 0x03
+HELD_RESTORE_PP     EQU 0x06
+HELD_CLEANSE_TAG    EQU 0x08
+HELD_HEAL_POISON    EQU 0x0a
+HELD_HEAL_FREEZE    EQU 0x0b
+HELD_HEAL_BURN      EQU 0x0c
+HELD_HEAL_SLEEP     EQU 0x0d
+HELD_HEAL_PARALYZE  EQU 0x0e
+HELD_HEAL_STATUS    EQU 0x0f
+HELD_HEAL_CONFUSION EQU 0x10
+HELD_METAL_POWDER   EQU 0x2a
+HELD_NORMAL_BOOST   EQU 0x32
+HELD_FIGHTING_BOOST EQU 0x33
+HELD_FLYING_BOOST   EQU 0x34
+HELD_POISON_BOOST   EQU 0x35
+HELD_GROUND_BOOST   EQU 0x36
+HELD_ROCK_BOOST     EQU 0x37
+HELD_BUG_BOOST      EQU 0x38
+HELD_GHOST_BOOST    EQU 0x39
+HELD_FIRE_BOOST     EQU 0x3a
+HELD_WATER_BOOST    EQU 0x3b
+HELD_GRASS_BOOST    EQU 0x3c
+HELD_ELECTRIC_BOOST EQU 0x3d
+HELD_PSYCHIC_BOOST  EQU 0x3e
+HELD_ICE_BOOST      EQU 0x3f
+HELD_DRAGON_BOOST   EQU 0x40
+HELD_DARK_BOOST     EQU 0x41
+HELD_STEEL_BOOST    EQU 0x42
+HELD_ESCAPE         EQU 0x48
+HELD_CRITICAL_UP    EQU 0x49
+HELD_QUICK_CLAW     EQU 0x4a
+HELD_TRADE_EVOLVE   EQU 0x4b
+HELD_AMULET_COIN    EQU 0x4c
+HELD_BRIGHTPOWDER   EQU 0x4d
+HELD_FOCUS_BAND     EQU 0x4f
diff --git a/stadiumgs/main.s b/stadiumgs/main.s
index 854b8ac..2f5d7cb 100644
--- a/stadiumgs/main.s
+++ b/stadiumgs/main.s
@@ -2,6 +2,7 @@
 .n64
 .include "constants/type_constants.s"
 .include "constants/move_constants.s"
+.include "constants/item_constants.s"
 .incbin "baseromgs.n64",0,0x98a14
 
 TMHMMoves:
@@ -184,24 +185,24 @@ TypeMatchup:
 
 .incbin "baseromgs.n64",0x98bd8,0x98ef0-0x98bd8
 
-Types98EF0: ; XXX what is this?
-	.db 0x32, NORMAL
-	.db 0x33, FIGHTING
-	.db 0x34, FLYING
-	.db 0x35, POISON
-	.db 0x36, GROUND
-	.db 0x37, ROCK
-	.db 0x38, BUG
-	.db 0x39, GHOST
-	.db 0x3A, FIRE
-	.db 0x3B, WATER
-	.db 0x3C, GRASS
-	.db 0x3D, ELECTRIC
-	.db 0x3E, PSYCHIC
-	.db 0x3F, ICE
-	.db 0x40, DRAGON
-	.db 0x41, DARK
-	.db 0x42, STEEL
+TypeBoostItems:
+	.db HELD_NORMAL_BOOST,   NORMAL   ; Pink/Polkadot Bow
+	.db HELD_FIGHTING_BOOST, FIGHTING ; Blackbelt
+	.db HELD_FLYING_BOOST,   FLYING   ; Sharp Beak
+	.db HELD_POISON_BOOST,   POISON   ; Poison Barb
+	.db HELD_GROUND_BOOST,   GROUND   ; Soft Sand
+	.db HELD_ROCK_BOOST,     ROCK     ; Hard Stone
+	.db HELD_BUG_BOOST,      BUG      ; Silverpowder
+	.db HELD_GHOST_BOOST,    GHOST    ; Spell Tag
+	.db HELD_FIRE_BOOST,     FIRE     ; Charcoal
+	.db HELD_WATER_BOOST,    WATER    ; Mystic Water
+	.db HELD_GRASS_BOOST,    GRASS    ; Miracle Seed
+	.db HELD_ELECTRIC_BOOST, ELECTRIC ; Magnet
+	.db HELD_PSYCHIC_BOOST,  PSYCHIC  ; Twistedspoon
+	.db HELD_ICE_BOOST,      ICE      ; Nevermeltice
+	.db HELD_DRAGON_BOOST,   DRAGON   ; Dragon Scale
+	.db HELD_DARK_BOOST,     DARK     ; Blackglasses
+	.db HELD_STEEL_BOOST,    STEEL    ; Metal Coat
 	.db -1
 	.align 16