summaryrefslogtreecommitdiff
path: root/data/items
diff options
context:
space:
mode:
Diffstat (limited to 'data/items')
-rw-r--r--data/items/apricorn_balls.asm3
-rw-r--r--data/items/attributes.asm4
-rw-r--r--data/items/bargain_shop.asm3
-rw-r--r--data/items/buena_prizes.asm3
-rw-r--r--data/items/catch_rate_items.asm5
-rw-r--r--data/items/fruit_trees.asm3
-rw-r--r--data/items/heal_hp.asm3
-rw-r--r--data/items/heal_status.asm3
-rw-r--r--data/items/mail_items.asm3
-rw-r--r--data/items/marts.asm109
-rw-r--r--data/items/mom_phone.asm8
-rw-r--r--data/items/mystery_gift_items.asm3
-rw-r--r--data/items/rooftop_sale.asm5
-rw-r--r--data/items/x_stats.asm3
14 files changed, 55 insertions, 103 deletions
diff --git a/data/items/apricorn_balls.asm b/data/items/apricorn_balls.asm
index 57e7d04bb..814aeab2f 100644
--- a/data/items/apricorn_balls.asm
+++ b/data/items/apricorn_balls.asm
@@ -1,4 +1,4 @@
-ApricornBalls: ; 24ca0
+ApricornBalls:
; apricorn, ball
db RED_APRICORN, LEVEL_BALL
db BLU_APRICORN, LURE_BALL
@@ -8,4 +8,3 @@ ApricornBalls: ; 24ca0
db BLK_APRICORN, HEAVY_BALL
db PNK_APRICORN, LOVE_BALL
db -1
-; 24caf
diff --git a/data/items/attributes.asm b/data/items/attributes.asm
index 9f669e979..806a2ef28 100644
--- a/data/items/attributes.asm
+++ b/data/items/attributes.asm
@@ -5,7 +5,7 @@ item_attribute: MACRO
dn \6, \7
ENDM
-ItemAttributes: ; 67c1
+ItemAttributes:
; entries correspond to item ids
; MASTER_BALL
item_attribute 0, HELD_NONE, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE
@@ -269,7 +269,7 @@ ItemAttributes: ; 67c1
item_attribute 0, HELD_NONE, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; STARDUST
item_attribute 2000, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
-; STAR PIECE
+; STAR_PIECE
item_attribute 9800, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; BASEMENT_KEY
item_attribute 0, HELD_NONE, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE
diff --git a/data/items/bargain_shop.asm b/data/items/bargain_shop.asm
index e4da96210..a17db6550 100644
--- a/data/items/bargain_shop.asm
+++ b/data/items/bargain_shop.asm
@@ -1,4 +1,4 @@
-BargainShopData: ; 15c51
+BargainShopData:
db 5
dbw NUGGET, 4500
dbw PEARL, 650
@@ -6,4 +6,3 @@ BargainShopData: ; 15c51
dbw STARDUST, 900
dbw STAR_PIECE, 4600
db -1
-; 15c62
diff --git a/data/items/buena_prizes.asm b/data/items/buena_prizes.asm
index baac8a56d..b0737aee2 100644
--- a/data/items/buena_prizes.asm
+++ b/data/items/buena_prizes.asm
@@ -1,4 +1,4 @@
-BuenaPrizeItems: ; 8b15e
+BuenaPrizeItems:
; there are NUM_BUENA_PRIZES items (see engine/events/buena.asm)
db ULTRA_BALL, 2
db FULL_RESTORE, 2
@@ -10,4 +10,3 @@ BuenaPrizeItems: ; 8b15e
db CALCIUM, 5
db HP_UP, 5
.End
-; 8b170
diff --git a/data/items/catch_rate_items.asm b/data/items/catch_rate_items.asm
index fbab7d434..9c39afac3 100644
--- a/data/items/catch_rate_items.asm
+++ b/data/items/catch_rate_items.asm
@@ -2,7 +2,7 @@
; catch rate as an item. However, if the catch rate appears in this table, the
; item associated with the table entry is used instead.
-TimeCapsule_CatchRateItems: ; 28785
+TimeCapsule_CatchRateItems:
db ITEM_19, LEFTOVERS
db ITEM_2D, BITTER_BERRY
db ITEM_32, GOLD_BERRY
@@ -15,5 +15,4 @@ TimeCapsule_CatchRateItems: ; 28785
db ITEM_DC, BERRY
db ITEM_FA, BERRY
db -1, BERRY
- db 0 ; end
-; 2879e
+ db 0 ; end
diff --git a/data/items/fruit_trees.asm b/data/items/fruit_trees.asm
index 67b8f51ad..9c4e4793d 100644
--- a/data/items/fruit_trees.asm
+++ b/data/items/fruit_trees.asm
@@ -1,4 +1,4 @@
-FruitTreeItems: ; 44097
+FruitTreeItems:
; entries correspond to FRUITTREE_* constants
db BERRY ; ROUTE_29
db BERRY ; ROUTE_30_1
@@ -30,4 +30,3 @@ FruitTreeItems: ; 44097
db ICE_BERRY ; PEWTER_CITY_1
db MINT_BERRY ; PEWTER_CITY_2
db BURNT_BERRY ; FUCHSIA_CITY
-; 440b5
diff --git a/data/items/heal_hp.asm b/data/items/heal_hp.asm
index a84670450..cc3da2367 100644
--- a/data/items/heal_hp.asm
+++ b/data/items/heal_hp.asm
@@ -1,4 +1,4 @@
-HealingHPAmounts: ; f3af
+HealingHPAmounts:
dbw FRESH_WATER, 50
dbw SODA_POP, 60
dbw LEMONADE, 80
@@ -15,4 +15,3 @@ HealingHPAmounts: ; f3af
dbw RAGECANDYBAR, 20
dbw BERRY_JUICE, 20
dbw -1, 0 ; end
-; f3df
diff --git a/data/items/heal_status.asm b/data/items/heal_status.asm
index 29bb872e1..b39f2f80d 100644
--- a/data/items/heal_status.asm
+++ b/data/items/heal_status.asm
@@ -1,6 +1,6 @@
; See also data/battle/held_heal_status.asm
-StatusHealingActions: ; f071
+StatusHealingActions:
; item, party menu action text, status
db ANTIDOTE, PARTYMENUTEXT_HEAL_PSN, 1 << PSN
db BURN_HEAL, PARTYMENUTEXT_HEAL_BRN, 1 << BRN
@@ -17,4 +17,3 @@ StatusHealingActions: ; f071
db MINT_BERRY, PARTYMENUTEXT_HEAL_SLP, SLP
db MIRACLEBERRY, PARTYMENUTEXT_HEAL_ALL, %11111111
db -1, 0, 0 ; end
-; f09e
diff --git a/data/items/mail_items.asm b/data/items/mail_items.asm
index 64b4216ca..388613d98 100644
--- a/data/items/mail_items.asm
+++ b/data/items/mail_items.asm
@@ -1,4 +1,4 @@
-MailItems: ; b9e80
+MailItems:
db FLOWER_MAIL
db SURF_MAIL
db LITEBLUEMAIL
@@ -10,4 +10,3 @@ MailItems: ; b9e80
db MUSIC_MAIL
db MIRAGE_MAIL
db -1
-; b9e8b
diff --git a/data/items/marts.asm b/data/items/marts.asm
index a9fad3e69..1d48ea532 100644
--- a/data/items/marts.asm
+++ b/data/items/marts.asm
@@ -1,4 +1,4 @@
-Marts: ; 160a9
+Marts:
; entries correspond to MART_* constants
dw MartCherrygrove
dw MartCherrygroveDex
@@ -35,19 +35,16 @@ Marts: ; 160a9
dw MartIndigoPlateau
dw MartUnderground
.End
-; 160ed
-
-MartCherrygrove: ; 160ed
+MartCherrygrove:
db 4 ; # items
db POTION
db ANTIDOTE
db PARLYZ_HEAL
db AWAKENING
db -1 ; end
-; 160f3
-MartCherrygroveDex: ; 160f3
+MartCherrygroveDex:
db 5 ; # items
db POKE_BALL
db POTION
@@ -55,9 +52,8 @@ MartCherrygroveDex: ; 160f3
db PARLYZ_HEAL
db AWAKENING
db -1 ; end
-; 160fa
-MartViolet: ; 160fa
+MartViolet:
db 10 ; # items
db POKE_BALL
db POTION
@@ -70,9 +66,8 @@ MartViolet: ; 160fa
db X_SPEED
db FLOWER_MAIL
db -1 ; end
-; 16106
-MartAzalea: ; 16106
+MartAzalea:
db 9 ; # items
db CHARCOAL
db POKE_BALL
@@ -84,9 +79,8 @@ MartAzalea: ; 16106
db PARLYZ_HEAL
db FLOWER_MAIL
db -1 ; end
-; 16111
-MartCianwood: ; 16111
+MartCianwood:
db 5 ; # items
db POTION
db SUPER_POTION
@@ -94,9 +88,8 @@ MartCianwood: ; 16111
db FULL_HEAL
db REVIVE
db -1 ; end
-; 16118
-MartGoldenrod2F1: ; 16118
+MartGoldenrod2F1:
db 7 ; # items
db POTION
db SUPER_POTION
@@ -106,9 +99,8 @@ MartGoldenrod2F1: ; 16118
db BURN_HEAL
db ICE_HEAL
db -1 ; end
-; 16121
-MartGoldenrod2F2: ; 16121
+MartGoldenrod2F2:
db 8 ; # items
db POKE_BALL
db GREAT_BALL
@@ -119,9 +111,8 @@ MartGoldenrod2F2: ; 16121
db POKE_DOLL
db FLOWER_MAIL
db -1 ; end
-; 1612b
-MartGoldenrod3F: ; 1612b
+MartGoldenrod3F:
db 7 ; # items
db X_SPEED
db X_SPECIAL
@@ -131,9 +122,8 @@ MartGoldenrod3F: ; 1612b
db GUARD_SPEC
db X_ACCURACY
db -1 ; end
-; 16134
-MartGoldenrod4F: ; 16134
+MartGoldenrod4F:
db 5 ; # items
db PROTEIN
db IRON
@@ -141,35 +131,31 @@ MartGoldenrod4F: ; 16134
db CALCIUM
db HP_UP
db -1 ; end
-; 1613b
-MartGoldenrod5F1: ; 1613b
+MartGoldenrod5F1:
db 3 ; # items
db TM_THUNDERPUNCH
db TM_FIRE_PUNCH
db TM_ICE_PUNCH
db -1 ; end
-; 16140
-MartGoldenrod5F2: ; 16140
+MartGoldenrod5F2:
db 4 ; # items
db TM_THUNDERPUNCH
db TM_FIRE_PUNCH
db TM_ICE_PUNCH
db TM_HEADBUTT
db -1 ; end
-; 16146
-MartGoldenrod5F3: ; 16146
+MartGoldenrod5F3:
db 4 ; # items
db TM_THUNDERPUNCH
db TM_FIRE_PUNCH
db TM_ICE_PUNCH
db TM_ROCK_SMASH
db -1 ; end
-; 1614c
-MartGoldenrod5F4: ; 1614c
+MartGoldenrod5F4:
db 5 ; # items
db TM_THUNDERPUNCH
db TM_FIRE_PUNCH
@@ -177,9 +163,8 @@ MartGoldenrod5F4: ; 1614c
db TM_HEADBUTT
db TM_ROCK_SMASH
db -1 ; end
-; 16153
-MartOlivine: ; 16153
+MartOlivine:
db 9 ; # items
db GREAT_BALL
db SUPER_POTION
@@ -191,9 +176,8 @@ MartOlivine: ; 16153
db SUPER_REPEL
db SURF_MAIL
db -1 ; end
-; 1615e
-MartEcruteak: ; 1615e
+MartEcruteak:
db 10 ; # items
db POKE_BALL
db GREAT_BALL
@@ -206,18 +190,16 @@ MartEcruteak: ; 1615e
db ICE_HEAL
db REVIVE
db -1 ; end
-; 1616a
-MartMahogany1: ; 1616a
+MartMahogany1:
db 4 ; # items
db TINYMUSHROOM
db SLOWPOKETAIL
db POKE_BALL
db POTION
db -1 ; end
-; 16170
-MartMahogany2: ; 16170
+MartMahogany2:
db 9 ; # items
db RAGECANDYBAR
db GREAT_BALL
@@ -229,9 +211,8 @@ MartMahogany2: ; 16170
db REVIVE
db FLOWER_MAIL
db -1 ; end
-; 1617b
-MartBlackthorn: ; 1617b
+MartBlackthorn:
db 9 ; # items
db GREAT_BALL
db ULTRA_BALL
@@ -243,9 +224,8 @@ MartBlackthorn: ; 1617b
db X_DEFEND
db X_ATTACK
db -1 ; end
-; 16186
-MartViridian: ; 16186
+MartViridian:
db 9 ; # items
db ULTRA_BALL
db HYPER_POTION
@@ -257,9 +237,8 @@ MartViridian: ; 16186
db BURN_HEAL
db FLOWER_MAIL
db -1 ; end
-; 16191
-MartPewter: ; 16191
+MartPewter:
db 7 ; # items
db GREAT_BALL
db SUPER_POTION
@@ -269,9 +248,8 @@ MartPewter: ; 16191
db AWAKENING
db BURN_HEAL
db -1 ; end
-; 1619a
-MartCerulean: ; 1619a
+MartCerulean:
db 9 ; # items
db GREAT_BALL
db ULTRA_BALL
@@ -283,9 +261,8 @@ MartCerulean: ; 1619a
db DIRE_HIT
db SURF_MAIL
db -1 ; end
-; 161a5
-MartLavender: ; 161a5
+MartLavender:
db 8 ; # items
db GREAT_BALL
db POTION
@@ -296,9 +273,8 @@ MartLavender: ; 161a5
db AWAKENING
db BURN_HEAL
db -1 ; end
-; 161af
-MartVermilion: ; 161af
+MartVermilion:
db 8 ; # items
db ULTRA_BALL
db SUPER_POTION
@@ -309,9 +285,8 @@ MartVermilion: ; 161af
db BURN_HEAL
db LITEBLUEMAIL
db -1 ; end
-; 161b9
-MartCeladon2F1: ; 161b9
+MartCeladon2F1:
db 7 ; # items
db POTION
db SUPER_POTION
@@ -321,9 +296,8 @@ MartCeladon2F1: ; 161b9
db SUPER_REPEL
db MAX_REPEL
db -1 ; end
-; 161c2
-MartCeladon2F2: ; 161c2
+MartCeladon2F2:
db 10 ; # items
db POKE_BALL
db GREAT_BALL
@@ -336,9 +310,8 @@ MartCeladon2F2: ; 161c2
db AWAKENING
db PARLYZ_HEAL
db -1 ; end
-; 161ce
-MartCeladon3F: ; 161ce
+MartCeladon3F:
db 5 ; # items
db TM_HIDDEN_POWER
db TM_SUNNY_DAY
@@ -346,17 +319,15 @@ MartCeladon3F: ; 161ce
db TM_RAIN_DANCE
db TM_SANDSTORM
db -1 ; end
-; 161d5
-MartCeladon4F: ; 161d5
+MartCeladon4F:
db 3 ; # items
db POKE_DOLL
db LOVELY_MAIL
db SURF_MAIL
db -1 ; end
-; 161da
-MartCeladon5F1: ; 161da
+MartCeladon5F1:
db 5 ; # items
db HP_UP
db PROTEIN
@@ -364,9 +335,8 @@ MartCeladon5F1: ; 161da
db CARBOS
db CALCIUM
db -1 ; end
-; 161e1
-MartCeladon5F2: ; 161e1
+MartCeladon5F2:
db 7 ; # items
db X_ACCURACY
db GUARD_SPEC
@@ -376,9 +346,8 @@ MartCeladon5F2: ; 161e1
db X_SPEED
db X_SPECIAL
db -1 ; end
-; 161ea
-MartFuchsia: ; 161ea
+MartFuchsia:
db 7 ; # items
db GREAT_BALL
db ULTRA_BALL
@@ -388,9 +357,8 @@ MartFuchsia: ; 161ea
db MAX_REPEL
db FLOWER_MAIL
db -1 ; end
-; 161f3
-MartSaffron: ; 161f3
+MartSaffron:
db 8 ; # items
db GREAT_BALL
db ULTRA_BALL
@@ -401,9 +369,8 @@ MartSaffron: ; 161f3
db X_DEFEND
db FLOWER_MAIL
db -1 ; end
-; 161fd
-MartMtMoon: ; 161fd
+MartMtMoon:
db 6 ; # items
db POKE_DOLL
db FRESH_WATER
@@ -412,9 +379,8 @@ MartMtMoon: ; 161fd
db REPEL
db PORTRAITMAIL
db -1 ; end
-; 16205
-MartIndigoPlateau: ; 16205
+MartIndigoPlateau:
db 7 ; # items
db ULTRA_BALL
db MAX_REPEL
@@ -424,20 +390,17 @@ MartIndigoPlateau: ; 16205
db REVIVE
db FULL_HEAL
db -1 ; end
-; 1620e
-MartUnderground: ; 1620e
+MartUnderground:
db 4 ; # items
db ENERGYPOWDER
db ENERGY_ROOT
db HEAL_POWDER
db REVIVAL_HERB
db -1 ; end
-; 16214
-DefaultMart: ; 16214
+DefaultMart:
db 2 ; # items
db POKE_BALL
db POTION
db -1 ; end
-; 16218
diff --git a/data/items/mom_phone.asm b/data/items/mom_phone.asm
index 5a5087c0e..407a9a016 100644
--- a/data/items/mom_phone.asm
+++ b/data/items/mom_phone.asm
@@ -5,15 +5,15 @@ momitem: MACRO
db \3, \4
ENDM
-MomItems_1: ; fd136
+MomItems_1:
momitem 0, 600, MOM_ITEM, SUPER_POTION
momitem 0, 90, MOM_ITEM, ANTIDOTE
momitem 0, 180, MOM_ITEM, POKE_BALL
momitem 0, 450, MOM_ITEM, ESCAPE_ROPE
momitem 0, 500, MOM_ITEM, GREAT_BALL
-.End ; fd15e
+.End
-MomItems_2: ; fd15e
+MomItems_2:
momitem 900, 600, MOM_ITEM, SUPER_POTION
momitem 4000, 270, MOM_ITEM, REPEL
momitem 7000, 600, MOM_ITEM, SUPER_POTION
@@ -24,4 +24,4 @@ MomItems_2: ; fd15e
momitem 40000, 900, MOM_ITEM, HYPER_POTION
momitem 50000, 8000, MOM_DOLL, DECO_PIKACHU_DOLL
momitem 100000, 22800, MOM_DOLL, DECO_BIG_SNORLAX_DOLL
-.End ; fd1ae
+.End
diff --git a/data/items/mystery_gift_items.asm b/data/items/mystery_gift_items.asm
index 7f7125ef7..242035eac 100644
--- a/data/items/mystery_gift_items.asm
+++ b/data/items/mystery_gift_items.asm
@@ -1,4 +1,4 @@
-MysteryGiftItems: ; 2c725
+MysteryGiftItems:
db BERRY
db PRZCUREBERRY
db MINT_BERRY
@@ -37,4 +37,3 @@ MysteryGiftItems: ; 2c725
db BLUESKY_MAIL
db MIRAGE_MAIL
.End
-; 2c74a
diff --git a/data/items/rooftop_sale.asm b/data/items/rooftop_sale.asm
index 87165fa5a..9606ef21e 100644
--- a/data/items/rooftop_sale.asm
+++ b/data/items/rooftop_sale.asm
@@ -1,4 +1,4 @@
-RooftopSaleMart1: ; 15aee
+RooftopSaleMart1:
db 5
dbw POKE_BALL, 150
dbw GREAT_BALL, 500
@@ -7,7 +7,7 @@ RooftopSaleMart1: ; 15aee
dbw REVIVE, 1200
db -1
-RooftopSaleMart2: ; 15aff
+RooftopSaleMart2:
db 5
dbw HYPER_POTION, 1000
dbw FULL_RESTORE, 2000
@@ -15,4 +15,3 @@ RooftopSaleMart2: ; 15aff
dbw ULTRA_BALL, 1000
dbw PROTEIN, 7800
db -1
-; 15b10
diff --git a/data/items/x_stats.asm b/data/items/x_stats.asm
index ac2d0ad27..255542098 100644
--- a/data/items/x_stats.asm
+++ b/data/items/x_stats.asm
@@ -1,7 +1,6 @@
-XItemStats: ; f504
+XItemStats:
; item, stat
db X_ATTACK, ATTACK
db X_DEFEND, DEFENSE
db X_SPEED, SPEED
db X_SPECIAL, SP_ATTACK
-; f50c
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-01 16:50:58 +0000