summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--asm/rom3.s2
-rw-r--r--constants/constants.s1
-rw-r--r--constants/hold_effects.s18
-rw-r--r--data/data2.s21
-rw-r--r--data/items.s34
5 files changed, 56 insertions, 20 deletions
diff --git a/asm/rom3.s b/asm/rom3.s
index 06352d265..918df9366 100644
--- a/asm/rom3.s
+++ b/asm/rom3.s
@@ -99590,7 +99590,7 @@ _0803BCC0: .4byte 0x0202ff5e
_0803BCC4: .4byte 0x00000807
_0803BCC8: .4byte 0x0000080b
_0803BCCC: .4byte 0x0000080d
-_0803BCD0: .4byte gUnknown_08208263
+_0803BCD0: .4byte gHoldEffectToType
_0803BCD4:
adds r3, 0x2
adds r2, 0x1
diff --git a/constants/constants.s b/constants/constants.s
index 1cd3923f2..02c219341 100644
--- a/constants/constants.s
+++ b/constants/constants.s
@@ -21,3 +21,4 @@
.include "constants/songs.s"
.include "constants/version.s"
.include "constants/region_map_sections.s"
+ .include "constants/hold_effects.s"
diff --git a/constants/hold_effects.s b/constants/hold_effects.s
new file mode 100644
index 000000000..9e210bed9
--- /dev/null
+++ b/constants/hold_effects.s
@@ -0,0 +1,18 @@
+ .equiv HOLD_EFFECT_NONE, 0
+ .equiv HOLD_EFFECT_BUG_POWER, 31
+ .equiv HOLD_EFFECT_STEEL_POWER, 42
+ .equiv HOLD_EFFECT_GROUND_POWER, 46
+ .equiv HOLD_EFFECT_ROCK_POWER, 47
+ .equiv HOLD_EFFECT_GRASS_POWER, 48
+ .equiv HOLD_EFFECT_DARK_POWER, 49
+ .equiv HOLD_EFFECT_FIGHTING_POWER, 50
+ .equiv HOLD_EFFECT_ELECTRIC_POWER, 51
+ .equiv HOLD_EFFECT_WATER_POWER, 52
+ .equiv HOLD_EFFECT_FLYING_POWER, 53
+ .equiv HOLD_EFFECT_POISON_POWER, 54
+ .equiv HOLD_EFFECT_ICE_POWER, 55
+ .equiv HOLD_EFFECT_GHOST_POWER, 56
+ .equiv HOLD_EFFECT_PSYCHIC_POWER, 57
+ .equiv HOLD_EFFECT_FIRE_POWER, 58
+ .equiv HOLD_EFFECT_DRAGON_POWER, 59
+ .equiv HOLD_EFFECT_NORMAL_POWER, 60
diff --git a/data/data2.s b/data/data2.s
index 88c26059a..8c7142902 100644
--- a/data/data2.s
+++ b/data/data2.s
@@ -1692,8 +1692,25 @@ gStatStageRatios:: @ 8208244
@ abbreviation of Game Freak
.string "ゲーフリ$"
-gUnknown_08208263:: @ 8208263
- .incbin "baserom.gba", 0x00208263, 0x25
+gHoldEffectToType:: @ 8208263
+ .byte HOLD_EFFECT_BUG_POWER, TYPE_BUG
+ .byte HOLD_EFFECT_STEEL_POWER, TYPE_STEEL
+ .byte HOLD_EFFECT_GROUND_POWER, TYPE_GROUND
+ .byte HOLD_EFFECT_ROCK_POWER, TYPE_ROCK
+ .byte HOLD_EFFECT_GRASS_POWER, TYPE_GRASS
+ .byte HOLD_EFFECT_DARK_POWER, TYPE_DARK
+ .byte HOLD_EFFECT_FIGHTING_POWER, TYPE_FIGHTING
+ .byte HOLD_EFFECT_ELECTRIC_POWER, TYPE_ELECTRIC
+ .byte HOLD_EFFECT_WATER_POWER, TYPE_WATER
+ .byte HOLD_EFFECT_FLYING_POWER, TYPE_FLYING
+ .byte HOLD_EFFECT_POISON_POWER, TYPE_POISON
+ .byte HOLD_EFFECT_ICE_POWER, TYPE_ICE
+ .byte HOLD_EFFECT_GHOST_POWER, TYPE_GHOST
+ .byte HOLD_EFFECT_PSYCHIC_POWER, TYPE_PSYCHIC
+ .byte HOLD_EFFECT_FIRE_POWER, TYPE_FIRE
+ .byte HOLD_EFFECT_DRAGON_POWER, TYPE_DRAGON
+ .byte HOLD_EFFECT_NORMAL_POWER, TYPE_NORMAL
+ .byte 0, 0
.align 2
gSpriteTemplate_8208288:: @ 8208288
diff --git a/data/items.s b/data/items.s
index c3869728b..276d59607 100644
--- a/data/items.s
+++ b/data/items.s
@@ -2823,7 +2823,7 @@ gItems:: @ 83C5564
.string "SILVERPOWDER$", 14
.2byte ITEM_SILVER_POWDER
.2byte 100 @ price
- .byte 31
+ .byte HOLD_EFFECT_BUG_POWER
.byte 10
.4byte gItemDescription_SilverPowder
.byte 0
@@ -2988,7 +2988,7 @@ gItems:: @ 83C5564
.string "METAL COAT$", 14
.2byte ITEM_METAL_COAT
.2byte 100 @ price
- .byte 42
+ .byte HOLD_EFFECT_STEEL_POWER
.byte 10
.4byte gItemDescription_MetalCoat
.byte 0
@@ -3048,7 +3048,7 @@ gItems:: @ 83C5564
.string "SOFT SAND$", 14
.2byte ITEM_SOFT_SAND
.2byte 100 @ price
- .byte 46
+ .byte HOLD_EFFECT_GROUND_POWER
.byte 10
.4byte gItemDescription_SoftSand
.byte 0
@@ -3063,7 +3063,7 @@ gItems:: @ 83C5564
.string "HARD STONE$", 14
.2byte ITEM_HARD_STONE
.2byte 100 @ price
- .byte 47
+ .byte HOLD_EFFECT_ROCK_POWER
.byte 10
.4byte gItemDescription_HardStone
.byte 0
@@ -3078,7 +3078,7 @@ gItems:: @ 83C5564
.string "MIRACLE SEED$", 14
.2byte ITEM_MIRACLE_SEED
.2byte 100 @ price
- .byte 48
+ .byte HOLD_EFFECT_GRASS_POWER
.byte 10
.4byte gItemDescription_MiracleSeed
.byte 0
@@ -3093,7 +3093,7 @@ gItems:: @ 83C5564
.string "BLACKGLASSES$", 14
.2byte ITEM_BLACK_GLASSES
.2byte 100 @ price
- .byte 49
+ .byte HOLD_EFFECT_DARK_POWER
.byte 10
.4byte gItemDescription_BlackGlasses
.byte 0
@@ -3108,7 +3108,7 @@ gItems:: @ 83C5564
.string "BLACK BELT$", 14
.2byte ITEM_BLACK_BELT
.2byte 100 @ price
- .byte 50
+ .byte HOLD_EFFECT_FIGHTING_POWER
.byte 10
.4byte gItemDescription_BlackBelt
.byte 0
@@ -3123,7 +3123,7 @@ gItems:: @ 83C5564
.string "MAGNET$", 14
.2byte ITEM_MAGNET
.2byte 100 @ price
- .byte 51
+ .byte HOLD_EFFECT_ELECTRIC_POWER
.byte 10
.4byte gItemDescription_Magnet
.byte 0
@@ -3138,7 +3138,7 @@ gItems:: @ 83C5564
.string "MYSTIC WATER$", 14
.2byte ITEM_MYSTIC_WATER
.2byte 100 @ price
- .byte 52
+ .byte HOLD_EFFECT_WATER_POWER
.byte 10
.4byte gItemDescription_MysticWater
.byte 0
@@ -3153,7 +3153,7 @@ gItems:: @ 83C5564
.string "SHARP BEAK$", 14
.2byte ITEM_SHARP_BEAK
.2byte 100 @ price
- .byte 53
+ .byte HOLD_EFFECT_FLYING_POWER
.byte 10
.4byte gItemDescription_SharpBeak
.byte 0
@@ -3168,7 +3168,7 @@ gItems:: @ 83C5564
.string "POISON BARB$", 14
.2byte ITEM_POISON_BARB
.2byte 100 @ price
- .byte 54
+ .byte HOLD_EFFECT_POISON_POWER
.byte 10
.4byte gItemDescription_PoisonBarb
.byte 0
@@ -3183,7 +3183,7 @@ gItems:: @ 83C5564
.string "NEVERMELTICE$", 14
.2byte ITEM_NEVER_MELT_ICE
.2byte 100 @ price
- .byte 55
+ .byte HOLD_EFFECT_ICE_POWER
.byte 10
.4byte gItemDescription_NeverMeltIce
.byte 0
@@ -3198,7 +3198,7 @@ gItems:: @ 83C5564
.string "SPELL TAG$", 14
.2byte ITEM_SPELL_TAG
.2byte 100 @ price
- .byte 56
+ .byte HOLD_EFFECT_GHOST_POWER
.byte 10
.4byte gItemDescription_SpellTag
.byte 0
@@ -3213,7 +3213,7 @@ gItems:: @ 83C5564
.string "TWISTEDSPOON$", 14
.2byte ITEM_TWISTED_SPOON
.2byte 100 @ price
- .byte 57
+ .byte HOLD_EFFECT_PSYCHIC_POWER
.byte 10
.4byte gItemDescription_TwistedSpoon
.byte 0
@@ -3228,7 +3228,7 @@ gItems:: @ 83C5564
.string "CHARCOAL$", 14
.2byte ITEM_CHARCOAL
.2byte 9800 @ price
- .byte 58
+ .byte HOLD_EFFECT_FIRE_POWER
.byte 10
.4byte gItemDescription_Charcoal
.byte 0
@@ -3243,7 +3243,7 @@ gItems:: @ 83C5564
.string "DRAGON FANG$", 14
.2byte ITEM_DRAGON_FANG
.2byte 100 @ price
- .byte 59
+ .byte HOLD_EFFECT_DRAGON_POWER
.byte 10
.4byte gItemDescription_DragonFang
.byte 0
@@ -3258,7 +3258,7 @@ gItems:: @ 83C5564
.string "SILK SCARF$", 14
.2byte ITEM_SILK_SCARF
.2byte 100 @ price
- .byte 60
+ .byte HOLD_EFFECT_NORMAL_POWER
.byte 10
.4byte gItemDescription_SilkScarf
.byte 0
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-17 06:55:00 +0000