diff options
| author | dannye <33dannye@gmail.com> | 2023-11-20 00:33:27 -0600 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2023-11-20 20:23:27 -0600 |
| commit | 298e99d3776580585c3f434e5d93137ae431bdd3 (patch) | |
| tree | a808c4ffd0fd0f9bd28972bae5236e0d3345c8e5 /data/items | |
| parent | Add sound bits documentation for wOptions (#110) (diff) | |
| parent | Name 2 unnamed labels I missed in SeafoamIslandsB4F and PokemonMansion3F (#437) (diff) | |
| download | pokeyellow-298e99d3776580585c3f434e5d93137ae431bdd3.tar.gz pokeyellow-298e99d3776580585c3f434e5d93137ae431bdd3.tar.xz pokeyellow-298e99d3776580585c3f434e5d93137ae431bdd3.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'data/items')
| -rw-r--r-- | data/items/marts.asm | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/data/items/marts.asm b/data/items/marts.asm index c8b60da1..351ff7ad 100644 --- a/data/items/marts.asm +++ b/data/items/marts.asm @@ -1,50 +1,50 @@ ; mart inventories are below ; they are texts -ViridianCashierText:: +ViridianMartClerkText:: script_mart POKE_BALL, POTION, ANTIDOTE, PARLYZ_HEAL, BURN_HEAL -PewterCashierText:: +PewterMartClerkText:: script_mart POKE_BALL, POTION, ESCAPE_ROPE, ANTIDOTE, BURN_HEAL, AWAKENING, PARLYZ_HEAL -CeruleanCashierText:: +CeruleanMartClerkText:: script_mart POKE_BALL, POTION, ESCAPE_ROPE, REPEL, ANTIDOTE, BURN_HEAL, AWAKENING, PARLYZ_HEAL -BikeShopCashierText:: ; unreferenced +UnusedBikeShopClerkText:: ; unreferenced script_mart BICYCLE -VermilionCashierText:: +VermilionMartClerkText:: script_mart POKE_BALL, SUPER_POTION, ICE_HEAL, AWAKENING, PARLYZ_HEAL, REPEL -LavenderCashierText:: +LavenderMartClerkText:: script_mart GREAT_BALL, SUPER_POTION, REVIVE, ESCAPE_ROPE, SUPER_REPEL, ANTIDOTE, BURN_HEAL, ICE_HEAL, PARLYZ_HEAL -CeladonMart2Clerk1Text:: +CeladonMart2FClerk1Text:: script_mart GREAT_BALL, SUPER_POTION, REVIVE, SUPER_REPEL, ANTIDOTE, BURN_HEAL, ICE_HEAL, AWAKENING, PARLYZ_HEAL -CeladonMart2Clerk2Text:: +CeladonMart2FClerk2Text:: 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 -CeladonMart4ClerkText:: +CeladonMart4FClerkText:: script_mart POKE_DOLL, FIRE_STONE, THUNDER_STONE, WATER_STONE, LEAF_STONE -CeladonMart5Clerk1Text:: +CeladonMart5FClerk1Text:: script_mart X_ACCURACY, GUARD_SPEC, DIRE_HIT, X_ATTACK, X_DEFEND, X_SPEED, X_SPECIAL -CeladonMart5Clerk2Text:: +CeladonMart5FClerk2Text:: script_mart HP_UP, PROTEIN, IRON, CARBOS, CALCIUM -FuchsiaCashierText:: +FuchsiaMartClerkText:: script_mart ULTRA_BALL, GREAT_BALL, HYPER_POTION, REVIVE, FULL_HEAL, SUPER_REPEL -UnusedCashierText:: ; unreferenced +UnusedMartClerkText:: ; unreferenced script_mart GREAT_BALL, HYPER_POTION, SUPER_POTION, FULL_HEAL, REVIVE -CinnabarCashierText:: +CinnabarMartClerkText:: script_mart ULTRA_BALL, GREAT_BALL, HYPER_POTION, MAX_REPEL, ESCAPE_ROPE, FULL_HEAL, REVIVE -SaffronCashierText:: +SaffronMartClerkText:: script_mart GREAT_BALL, HYPER_POTION, MAX_REPEL, ESCAPE_ROPE, FULL_HEAL, REVIVE -IndigoCashierText:: +IndigoPlateauLobbyClerkText:: script_mart ULTRA_BALL, GREAT_BALL, FULL_RESTORE, MAX_POTION, FULL_HEAL, REVIVE, MAX_REPEL |