diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2021-05-23 22:36:18 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2021-05-23 22:36:18 -0400 |
| commit | bb9c72cbc5f2d02ab38764ece3583ee093b60b2d (patch) | |
| tree | 6142b4feb1f05a180e8daeb6f1d320045b20f887 | |
| parent | 198795bbb0b041e33320fab0f0497216ce13a855 (diff) | |
| parent | 223b7b21a45e93af4c66b050f0fe5779977df15a (diff) | |
Merge remote-tracking branch 'remotes/pokered/master'
| -rw-r--r-- | data/items/marts.asm | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/data/items/marts.asm b/data/items/marts.asm index 30eb7d9a..c8b60da1 100644 --- a/data/items/marts.asm +++ b/data/items/marts.asm @@ -1,64 +1,50 @@ ; mart inventories are below ; they are texts -; Viridian ViridianCashierText:: script_mart POKE_BALL, POTION, ANTIDOTE, PARLYZ_HEAL, BURN_HEAL -; Pewter PewterCashierText:: script_mart POKE_BALL, POTION, ESCAPE_ROPE, ANTIDOTE, BURN_HEAL, AWAKENING, PARLYZ_HEAL -; Cerulean CeruleanCashierText:: script_mart POKE_BALL, POTION, ESCAPE_ROPE, REPEL, ANTIDOTE, BURN_HEAL, AWAKENING, PARLYZ_HEAL -; Bike shop +BikeShopCashierText:: ; unreferenced script_mart BICYCLE -; Vermilion VermilionCashierText:: script_mart POKE_BALL, SUPER_POTION, ICE_HEAL, AWAKENING, PARLYZ_HEAL, REPEL -; Lavender LavenderCashierText:: script_mart GREAT_BALL, SUPER_POTION, REVIVE, ESCAPE_ROPE, SUPER_REPEL, ANTIDOTE, BURN_HEAL, ICE_HEAL, PARLYZ_HEAL -; Celadon Dept. Store 2F (1) CeladonMart2Clerk1Text:: script_mart GREAT_BALL, SUPER_POTION, REVIVE, SUPER_REPEL, ANTIDOTE, BURN_HEAL, ICE_HEAL, AWAKENING, PARLYZ_HEAL -; Celadon Dept. Store 2F (2) CeladonMart2Clerk2Text:: script_mart TM_DOUBLE_TEAM, TM_REFLECT, TM_RAZOR_WIND, TM_HORN_DRILL, TM_EGG_BOMB, TM_MEGA_PUNCH, TM_MEGA_KICK, TM_TAKE_DOWN, TM_SUBMISSION -; Celadon Dept. Store 4F CeladonMart4ClerkText:: script_mart POKE_DOLL, FIRE_STONE, THUNDER_STONE, WATER_STONE, LEAF_STONE -; Celadon Dept. Store 5F (1) CeladonMart5Clerk1Text:: script_mart X_ACCURACY, GUARD_SPEC, DIRE_HIT, X_ATTACK, X_DEFEND, X_SPEED, X_SPECIAL -; Celadon Dept. Store 5F (2) CeladonMart5Clerk2Text:: script_mart HP_UP, PROTEIN, IRON, CARBOS, CALCIUM -; Fuchsia FuchsiaCashierText:: script_mart ULTRA_BALL, GREAT_BALL, HYPER_POTION, REVIVE, FULL_HEAL, SUPER_REPEL -; unused? +UnusedCashierText:: ; unreferenced script_mart GREAT_BALL, HYPER_POTION, SUPER_POTION, FULL_HEAL, REVIVE -; Cinnabar CinnabarCashierText:: script_mart ULTRA_BALL, GREAT_BALL, HYPER_POTION, MAX_REPEL, ESCAPE_ROPE, FULL_HEAL, REVIVE -; Saffron SaffronCashierText:: script_mart GREAT_BALL, HYPER_POTION, MAX_REPEL, ESCAPE_ROPE, FULL_HEAL, REVIVE -; Indigo IndigoCashierText:: script_mart ULTRA_BALL, GREAT_BALL, FULL_RESTORE, MAX_POTION, FULL_HEAL, REVIVE, MAX_REPEL |