diff options
Diffstat (limited to 'data')
| -rw-r--r-- | data/baseStats/ninetales.asm (renamed from data/baseStats/ninetails.asm) | 0 | ||||
| -rwxr-xr-x | data/base_stats.asm | 2 | ||||
| -rwxr-xr-x | data/mart_inventories.asm | 75 |
3 files changed, 33 insertions, 44 deletions
diff --git a/data/baseStats/ninetails.asm b/data/baseStats/ninetales.asm index 212f6322..212f6322 100644 --- a/data/baseStats/ninetails.asm +++ b/data/baseStats/ninetales.asm diff --git a/data/base_stats.asm b/data/base_stats.asm index 716d1118..23e85e0f 100755 --- a/data/base_stats.asm +++ b/data/base_stats.asm @@ -35,7 +35,7 @@ INCLUDE "data/baseStats/nidoking.asm" INCLUDE "data/baseStats/clefairy.asm" INCLUDE "data/baseStats/clefable.asm" INCLUDE "data/baseStats/vulpix.asm" -INCLUDE "data/baseStats/ninetails.asm" +INCLUDE "data/baseStats/ninetales.asm" INCLUDE "data/baseStats/jigglypuff.asm" INCLUDE "data/baseStats/wigglytuff.asm" INCLUDE "data/baseStats/zubat.asm" diff --git a/data/mart_inventories.asm b/data/mart_inventories.asm index 498d48d2..b821f4d7 100755 --- a/data/mart_inventories.asm +++ b/data/mart_inventories.asm @@ -1,75 +1,64 @@ ; mart inventories are below ; they are texts -; first byte $FE, next byte # of items, last byte $FF ; Viridian -ViridianMartText6:: ; 233b (0:233b) - db $FE,5,POKE_BALL,POTION,ANTIDOTE,PARLYZ_HEAL,BURN_HEAL,$FF +ViridianCashierText:: + TX_MART POKE_BALL,POTION,ANTIDOTE,PARLYZ_HEAL,BURN_HEAL ; Pewter -PewterMartText1:: ; 2343 (0:2343) - db $FE,7,POKE_BALL,POTION,ESCAPE_ROPE,ANTIDOTE,BURN_HEAL,AWAKENING - db PARLYZ_HEAL,$FF +PewterCashierText:: + TX_MART POKE_BALL,POTION,ESCAPE_ROPE,ANTIDOTE,BURN_HEAL,AWAKENING,PARLYZ_HEAL ; Cerulean -CeruleanMartText1:: ; 234d (0:234d) - db $FE,8,POKE_BALL,POTION,ESCAPE_ROPE,REPEL,ANTIDOTE,BURN_HEAL,AWAKENING - db PARLYZ_HEAL,$FF +CeruleanCashierText:: + TX_MART POKE_BALL,POTION,ESCAPE_ROPE,REPEL,ANTIDOTE,BURN_HEAL,AWAKENING,PARLYZ_HEAL -; Bike shop ; 2358 (0:2358) - db $FE,1,BICYCLE,$FF +; Bike shop + TX_MART BICYCLE ; Vermilion -VermilionMartText1:: ; 235c (0:235c) - db $FE,6,POKE_BALL,SUPER_POTION,ICE_HEAL,AWAKENING,PARLYZ_HEAL - db REPEL,$FF +VermilionCashierText:: + TX_MART POKE_BALL,SUPER_POTION,ICE_HEAL,AWAKENING,PARLYZ_HEAL,REPEL ; Lavender -LavenderMartText1:: ; 2365 (0:2365) - db $FE,9,GREAT_BALL,SUPER_POTION,REVIVE,ESCAPE_ROPE,SUPER_REPEL - db ANTIDOTE,BURN_HEAL,ICE_HEAL,PARLYZ_HEAL,$FF +LavenderCashierText:: + TX_MART GREAT_BALL,SUPER_POTION,REVIVE,ESCAPE_ROPE,SUPER_REPEL,ANTIDOTE,BURN_HEAL,ICE_HEAL,PARLYZ_HEAL ; Celadon Dept. Store 2F (1) -CeladonMart2Text1:: ; 2371 (0:2371) - db $FE,9,GREAT_BALL,SUPER_POTION,REVIVE,SUPER_REPEL,ANTIDOTE - db BURN_HEAL,ICE_HEAL,AWAKENING,PARLYZ_HEAL,$FF +CeladonMart2Clerk1Text:: + TX_MART GREAT_BALL,SUPER_POTION,REVIVE,SUPER_REPEL,ANTIDOTE,BURN_HEAL,ICE_HEAL,AWAKENING,PARLYZ_HEAL ; Celadon Dept. Store 2F (2) -CeladonMart2Text2:: ; 237d (0:237d) - db $FE,9,TM_32,TM_33,TM_02,TM_07,TM_37,TM_01,TM_05,TM_09,TM_17,$FF +CeladonMart2Clerk2Text:: + TX_MART TM_32,TM_33,TM_02,TM_07,TM_37,TM_01,TM_05,TM_09,TM_17 ; Celadon Dept. Store 4F -CeladonMart4Text1:: ; 2389 (0:2389) - db $FE,5,POKE_DOLL,FIRE_STONE,THUNDER_STONE,WATER_STONE,LEAF_STONE,$FF +CeladonMart4ClerkText:: + TX_MART POKE_DOLL,FIRE_STONE,THUNDER_STONE,WATER_STONE,LEAF_STONE ; Celadon Dept. Store 5F (1) -CeladonMart5Text3:: ; 2391 (0:2391) - db $FE,7,X_ACCURACY,GUARD_SPEC,DIRE_HIT,X_ATTACK,X_DEFEND,X_SPEED - db X_SPECIAL,$FF +CeladonMart5Clerk1Text:: + TX_MART X_ACCURACY,GUARD_SPEC,DIRE_HIT,X_ATTACK,X_DEFEND,X_SPEED,X_SPECIAL ; Celadon Dept. Store 5F (2) -CeladonMart5Text4:: ; 239b (0:239b) - db $FE,5,HP_UP,PROTEIN,IRON,CARBOS,CALCIUM,$FF +CeladonMart5Clerk2Text:: + TX_MART HP_UP,PROTEIN,IRON,CARBOS,CALCIUM ; Fuchsia -FuchsiaMartText1:: ; 23a3 (0:23a3) - db $FE,6,ULTRA_BALL,GREAT_BALL,HYPER_POTION,REVIVE,FULL_HEAL - db SUPER_REPEL,$FF +FuchsiaCashierText:: + TX_MART ULTRA_BALL,GREAT_BALL,HYPER_POTION,REVIVE,FULL_HEAL,SUPER_REPEL -; unused? 23ac (0:23ac) - db $FE,5,GREAT_BALL,HYPER_POTION,SUPER_POTION,FULL_HEAL,REVIVE,$FF +; unused? + TX_MART GREAT_BALL,HYPER_POTION,SUPER_POTION,FULL_HEAL,REVIVE ; Cinnabar -CinnabarMartText1:: ; 23b4 (0:23b4) - db $FE,7,ULTRA_BALL,GREAT_BALL,HYPER_POTION,MAX_REPEL,ESCAPE_ROPE - db FULL_HEAL,REVIVE,$FF +CinnabarCashierText:: + TX_MART ULTRA_BALL,GREAT_BALL,HYPER_POTION,MAX_REPEL,ESCAPE_ROPE,FULL_HEAL,REVIVE ; Saffron -SaffronMartText1:: ; 23be (0:23be) - db $FE,6,GREAT_BALL,HYPER_POTION,MAX_REPEL,ESCAPE_ROPE,FULL_HEAL - db REVIVE,$FF +SaffronCashierText:: + TX_MART GREAT_BALL,HYPER_POTION,MAX_REPEL,ESCAPE_ROPE,FULL_HEAL,REVIVE ; Indigo -IndigoPlateauLobbyText4:: ; 23c7 (0:23c7) - db $FE,7,ULTRA_BALL,GREAT_BALL,FULL_RESTORE,MAX_POTION,FULL_HEAL - db REVIVE,MAX_REPEL,$FF +IndigoCashierText:: + TX_MART ULTRA_BALL,GREAT_BALL,FULL_RESTORE,MAX_POTION,FULL_HEAL,REVIVE,MAX_REPEL |