Add a TX_MART macro for inventories.

This commit is contained in:
IIMarckus 2016-04-08 20:16:42 -06:00
parent adc6a3aac7
commit c9bed2d447
2 changed files with 25 additions and 27 deletions

View file

@ -1,75 +1,64 @@
; mart inventories are below ; mart inventories are below
; they are texts ; they are texts
; first byte $FE, next byte # of items, last byte $FF
; Viridian ; Viridian
ViridianCashierText:: ViridianCashierText::
db $FE,4,POKE_BALL,ANTIDOTE,PARLYZ_HEAL,BURN_HEAL,$FF TX_MART POKE_BALL, ANTIDOTE, PARLYZ_HEAL, BURN_HEAL
; Pewter ; Pewter
PewterCashierText:: PewterCashierText::
db $FE,7,POKE_BALL,POTION,ESCAPE_ROPE,ANTIDOTE,BURN_HEAL,AWAKENING TX_MART POKE_BALL, POTION, ESCAPE_ROPE, ANTIDOTE, BURN_HEAL, AWAKENING, PARLYZ_HEAL
db PARLYZ_HEAL,$FF
; Cerulean ; Cerulean
CeruleanCashierText:: CeruleanCashierText::
db $FE,7,POKE_BALL,POTION,REPEL,ANTIDOTE,BURN_HEAL,AWAKENING TX_MART POKE_BALL, POTION, REPEL, ANTIDOTE, BURN_HEAL, AWAKENING, PARLYZ_HEAL
db PARLYZ_HEAL,$FF
; Bike shop ; Bike shop
db $FE,1,BICYCLE,$FF TX_MART BICYCLE
; Vermilion ; Vermilion
VermilionCashierText:: VermilionCashierText::
db $FE,6,POKE_BALL,SUPER_POTION,ICE_HEAL,AWAKENING,PARLYZ_HEAL TX_MART POKE_BALL, SUPER_POTION, ICE_HEAL, AWAKENING, PARLYZ_HEAL, REPEL
db REPEL,$FF
; Lavender ; Lavender
LavenderCashierText:: LavenderCashierText::
db $FE,9,GREAT_BALL,SUPER_POTION,REVIVE,ESCAPE_ROPE,SUPER_REPEL TX_MART GREAT_BALL, SUPER_POTION, REVIVE, ESCAPE_ROPE, SUPER_REPEL, ANTIDOTE, BURN_HEAL, ICE_HEAL, PARLYZ_HEAL
db ANTIDOTE,BURN_HEAL,ICE_HEAL,PARLYZ_HEAL,$FF
; Celadon Dept. Store 2F (1) ; Celadon Dept. Store 2F (1)
CeladonMart2Clerk1Text:: CeladonMart2Clerk1Text::
db $FE,9,GREAT_BALL,SUPER_POTION,REVIVE,SUPER_REPEL,ANTIDOTE TX_MART GREAT_BALL, SUPER_POTION, REVIVE, SUPER_REPEL, ANTIDOTE, BURN_HEAL, ICE_HEAL, AWAKENING, PARLYZ_HEAL
db BURN_HEAL,ICE_HEAL,AWAKENING,PARLYZ_HEAL,$FF
; Celadon Dept. Store 2F (2) ; Celadon Dept. Store 2F (2)
CeladonMart2Clerk2Text:: CeladonMart2Clerk2Text::
db $FE,9,TM_32,TM_33,TM_02,TM_07,TM_37,TM_01,TM_05,TM_09,TM_17,$FF TX_MART TM_32, TM_33, TM_02, TM_07, TM_37, TM_01, TM_05, TM_09, TM_17
; Celadon Dept. Store 4F ; Celadon Dept. Store 4F
CeladonMart4ClerkText:: CeladonMart4ClerkText::
db $FE,5,POKE_DOLL,FIRE_STONE,THUNDER_STONE,WATER_STONE,LEAF_STONE,$FF TX_MART POKE_DOLL, FIRE_STONE, THUNDER_STONE, WATER_STONE, LEAF_STONE
; Celadon Dept. Store 5F (1) ; Celadon Dept. Store 5F (1)
CeladonMart5Clerk1Text:: CeladonMart5Clerk1Text::
db $FE,7,X_ACCURACY,GUARD_SPEC,DIRE_HIT,X_ATTACK,X_DEFEND,X_SPEED TX_MART X_ACCURACY, GUARD_SPEC, DIRE_HIT, X_ATTACK, X_DEFEND, X_SPEED, X_SPECIAL
db X_SPECIAL,$FF
; Celadon Dept. Store 5F (2) ; Celadon Dept. Store 5F (2)
CeladonMart5Clerk2Text:: CeladonMart5Clerk2Text::
db $FE,5,HP_UP,PROTEIN,IRON,CARBOS,CALCIUM,$FF TX_MART HP_UP, PROTEIN, IRON, CARBOS, CALCIUM
; Fuchsia ; Fuchsia
FuchsiaCashierText:: FuchsiaCashierText::
db $FE,6,ULTRA_BALL,GREAT_BALL,SUPER_POTION,REVIVE,FULL_HEAL TX_MART ULTRA_BALL, GREAT_BALL, SUPER_POTION, REVIVE, FULL_HEAL, SUPER_REPEL
db SUPER_REPEL,$FF
; unused? ; unused?
db $FE,5,GREAT_BALL,HYPER_POTION,SUPER_POTION,FULL_HEAL,REVIVE,$FF TX_MART GREAT_BALL, HYPER_POTION, SUPER_POTION, FULL_HEAL, REVIVE
; Cinnabar ; Cinnabar
CinnabarCashierText:: CinnabarCashierText::
db $FE,7,ULTRA_BALL,GREAT_BALL,HYPER_POTION,MAX_REPEL,ESCAPE_ROPE TX_MART ULTRA_BALL, GREAT_BALL, HYPER_POTION, MAX_REPEL, ESCAPE_ROPE, FULL_HEAL, REVIVE
db FULL_HEAL,REVIVE,$FF
; Saffron ; Saffron
SaffronCashierText:: SaffronCashierText::
db $FE,6,GREAT_BALL,HYPER_POTION,MAX_REPEL,ESCAPE_ROPE,FULL_HEAL TX_MART GREAT_BALL, HYPER_POTION, MAX_REPEL, ESCAPE_ROPE, FULL_HEAL, REVIVE
db REVIVE,$FF
; Indigo ; Indigo
IndigoCashierText:: IndigoCashierText::
db $FE,7,ULTRA_BALL,GREAT_BALL,FULL_RESTORE,MAX_POTION,FULL_HEAL TX_MART ULTRA_BALL, GREAT_BALL, FULL_RESTORE, MAX_POTION, FULL_HEAL, REVIVE, MAX_REPEL
db REVIVE,MAX_REPEL,$FF

View file

@ -214,6 +214,15 @@ TX_ASM: MACRO
db $08 db $08
ENDM ENDM
TX_MART: MACRO
db $FE, _NARG
rept _NARG
db \1
shift
endr
db $FF
ENDM
; Predef macro. ; Predef macro.
add_predef: MACRO add_predef: MACRO
\1Predef:: \1Predef::