Sync with pokered

9 files changed, 453 insertions, 0 deletions

diff --git a/data/items/guard_drink_items.asm b/data/items/guard_drink_items.asm
new file mode 100644
index 00000000..e76d1f77
--- /dev/null
+++ b/data/items/guard_drink_items.asm
@@ -0,0 +1,5 @@
+GuardDrinksList:
+	db FRESH_WATER
+	db SODA_POP
+	db LEMONADE
+	db 0 ; end
diff --git a/data/items/key_items.asm b/data/items/key_items.asm
new file mode 100755
index 00000000..aca8cf81
--- /dev/null
+++ b/data/items/key_items.asm
@@ -0,0 +1,103 @@
+key_item_bits: MACRO
+_bit = 0
+_byte = 0
+REPT _NARG
+_byte = _byte | ((\1) << _bit)
+_bit = _bit + 1
+IF _bit == 8
+	db _byte
+_byte = 0
+_bit = 0
+ENDC
+SHIFT
+ENDR
+IF _bit > 0
+	db _byte
+ENDC
+ENDM
+
+KeyItemBitfield:
+	key_item_bits \
+	FALSE, \ ; MASTER_BALL
+	FALSE, \ ; ULTRA_BALL
+	FALSE, \ ; GREAT_BALL
+	FALSE, \ ; POKE_BALL
+	TRUE,  \ ; TOWN_MAP
+	TRUE,  \ ; BICYCLE
+	TRUE,  \ ; SURFBOARD
+	TRUE,  \ ; SAFARI_BALL
+	TRUE,  \ ; POKEDEX
+	FALSE, \ ; MOON_STONE
+	FALSE, \ ; ANTIDOTE
+	FALSE, \ ; BURN_HEAL
+	FALSE, \ ; ICE_HEAL
+	FALSE, \ ; AWAKENING
+	FALSE, \ ; PARLYZ_HEAL
+	FALSE, \ ; FULL_RESTORE
+	FALSE, \ ; MAX_POTION
+	FALSE, \ ; HYPER_POTION
+	FALSE, \ ; SUPER_POTION
+	FALSE, \ ; POTION
+	TRUE,  \ ; BOULDERBADGE
+	TRUE,  \ ; CASCADEBADGE
+	TRUE,  \ ; THUNDERBADGE
+	TRUE,  \ ; RAINBOWBADGE
+	TRUE,  \ ; SOULBADGE
+	TRUE,  \ ; MARSHBADGE
+	TRUE,  \ ; VOLCANOBADGE
+	TRUE,  \ ; EARTHBADGE
+	FALSE, \ ; ESCAPE_ROPE
+	FALSE, \ ; REPEL
+	TRUE,  \ ; OLD_AMBER
+	FALSE, \ ; FIRE_STONE
+	FALSE, \ ; THUNDER_STONE
+	FALSE, \ ; WATER_STONE
+	FALSE, \ ; HP_UP
+	FALSE, \ ; PROTEIN
+	FALSE, \ ; IRON
+	FALSE, \ ; CARBOS
+	FALSE, \ ; CALCIUM
+	FALSE, \ ; RARE_CANDY
+	TRUE,  \ ; DOME_FOSSIL
+	TRUE,  \ ; HELIX_FOSSIL
+	TRUE,  \ ; SECRET_KEY
+	TRUE,  \ ; UNUSED_ITEM
+	TRUE,  \ ; BIKE_VOUCHER
+	FALSE, \ ; X_ACCURACY
+	FALSE, \ ; LEAF_STONE
+	TRUE,  \ ; CARD_KEY
+	FALSE, \ ; NUGGET
+	FALSE, \ ; PP_UP_2
+	FALSE, \ ; POKE_DOLL
+	FALSE, \ ; FULL_HEAL
+	FALSE, \ ; REVIVE
+	FALSE, \ ; MAX_REVIVE
+	FALSE, \ ; GUARD_SPEC
+	FALSE, \ ; SUPER_REPEL
+	FALSE, \ ; MAX_REPEL
+	FALSE, \ ; DIRE_HIT
+	FALSE, \ ; COIN
+	FALSE, \ ; FRESH_WATER
+	FALSE, \ ; SODA_POP
+	FALSE, \ ; LEMONADE
+	TRUE,  \ ; S_S_TICKET
+	TRUE,  \ ; GOLD_TEETH
+	FALSE, \ ; X_ATTACK
+	FALSE, \ ; X_DEFEND
+	FALSE, \ ; X_SPEED
+	FALSE, \ ; X_SPECIAL
+	TRUE,  \ ; COIN_CASE
+	TRUE,  \ ; OAKS_PARCEL
+	TRUE,  \ ; ITEMFINDER
+	TRUE,  \ ; SILPH_SCOPE
+	TRUE,  \ ; POKE_FLUTE
+	TRUE,  \ ; LIFT_KEY
+	FALSE, \ ; EXP_ALL
+	TRUE,  \ ; OLD_ROD
+	TRUE,  \ ; GOOD_ROD
+	TRUE,  \ ; SUPER_ROD
+	FALSE, \ ; PP_UP
+	FALSE, \ ; ETHER
+	FALSE, \ ; MAX_ETHER
+	FALSE, \ ; ELIXER
+	FALSE    ; MAX_ELIXER
diff --git a/data/items/marts.asm b/data/items/marts.asm
new file mode 100755
index 00000000..30eb7d9a
--- /dev/null
+++ b/data/items/marts.asm
@@ -0,0 +1,64 @@
+; 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
+	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?
+	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
diff --git a/data/items/names.asm b/data/items/names.asm
new file mode 100755
index 00000000..0c07fe5d
--- /dev/null
+++ b/data/items/names.asm
@@ -0,0 +1,98 @@
+ItemNames::
+	db "MASTER BALL@"
+	db "ULTRA BALL@"
+	db "GREAT BALL@"
+	db "POKé BALL@"
+	db "TOWN MAP@"
+	db "BICYCLE@"
+	db "?????@"
+	db "SAFARI BALL@"
+	db "POKéDEX@"
+	db "MOON STONE@"
+	db "ANTIDOTE@"
+	db "BURN HEAL@"
+	db "ICE HEAL@"
+	db "AWAKENING@"
+	db "PARLYZ HEAL@"
+	db "FULL RESTORE@"
+	db "MAX POTION@"
+	db "HYPER POTION@"
+	db "SUPER POTION@"
+	db "POTION@"
+	db "BOULDERBADGE@"
+	db "CASCADEBADGE@"
+	db "THUNDERBADGE@"
+	db "RAINBOWBADGE@"
+	db "SOULBADGE@"
+	db "MARSHBADGE@"
+	db "VOLCANOBADGE@"
+	db "EARTHBADGE@"
+	db "ESCAPE ROPE@"
+	db "REPEL@"
+	db "OLD AMBER@"
+	db "FIRE STONE@"
+	db "THUNDERSTONE@"
+	db "WATER STONE@"
+	db "HP UP@"
+	db "PROTEIN@"
+	db "IRON@"
+	db "CARBOS@"
+	db "CALCIUM@"
+	db "RARE CANDY@"
+	db "DOME FOSSIL@"
+	db "HELIX FOSSIL@"
+	db "SECRET KEY@"
+	db "?????@"
+	db "BIKE VOUCHER@"
+	db "X ACCURACY@"
+	db "LEAF STONE@"
+	db "CARD KEY@"
+	db "NUGGET@"
+	db "PP UP@"
+	db "POKé DOLL@"
+	db "FULL HEAL@"
+	db "REVIVE@"
+	db "MAX REVIVE@"
+	db "GUARD SPEC.@"
+	db "SUPER REPEL@"
+	db "MAX REPEL@"
+	db "DIRE HIT@"
+	db "COIN@"
+	db "FRESH WATER@"
+	db "SODA POP@"
+	db "LEMONADE@"
+	db "S.S.TICKET@"
+	db "GOLD TEETH@"
+	db "X ATTACK@"
+	db "X DEFEND@"
+	db "X SPEED@"
+	db "X SPECIAL@"
+	db "COIN CASE@"
+	db "OAK's PARCEL@"
+	db "ITEMFINDER@"
+	db "SILPH SCOPE@"
+	db "POKé FLUTE@"
+	db "LIFT KEY@"
+	db "EXP.ALL@"
+	db "OLD ROD@"
+	db "GOOD ROD@"
+	db "SUPER ROD@"
+	db "PP UP@"
+	db "ETHER@"
+	db "MAX ETHER@"
+	db "ELIXER@"
+	db "MAX ELIXER@"
+	db "B2F@"
+	db "B1F@"
+	db "1F@"
+	db "2F@"
+	db "3F@"
+	db "4F@"
+	db "5F@"
+	db "6F@"
+	db "7F@"
+	db "8F@"
+	db "9F@"
+	db "10F@"
+	db "11F@"
+	db "B4F@"
diff --git a/data/items/prices.asm b/data/items/prices.asm
new file mode 100755
index 00000000..f3d8f76b
--- /dev/null
+++ b/data/items/prices.asm
@@ -0,0 +1,98 @@
+ItemPrices::
+	money 0     ; MASTER_BALL
+	money 1200  ; ULTRA_BALL
+	money 600   ; GREAT_BALL
+	money 200   ; POKE_BALL
+	money 0     ; TOWN_MAP
+	money 0     ; BICYCLE
+	money 0     ; SURFBOARD
+	money 1000  ; SAFARI_BALL
+	money 0     ; POKEDEX
+	money 0     ; MOON_STONE
+	money 100   ; ANTIDOTE
+	money 250   ; BURN_HEAL
+	money 250   ; ICE_HEAL
+	money 200   ; AWAKENING
+	money 200   ; PARLYZ_HEAL
+	money 3000  ; FULL_RESTORE
+	money 2500  ; MAX_POTION
+	money 1500  ; HYPER_POTION
+	money 700   ; SUPER_POTION
+	money 300   ; POTION
+	money 0     ; BOULDERBADGE
+	money 0     ; CASCADEBADGE
+	money 0     ; THUNDERBADGE
+	money 0     ; RAINBOWBADGE
+	money 0     ; SOULBADGE
+	money 0     ; MARSHBADGE
+	money 0     ; VOLCANOBADGE
+	money 0     ; EARTHBADGE
+	money 550   ; ESCAPE_ROPE
+	money 350   ; REPEL
+	money 0     ; OLD_AMBER
+	money 2100  ; FIRE_STONE
+	money 2100  ; THUNDER_STONE
+	money 2100  ; WATER_STONE
+	money 9800  ; HP_UP
+	money 9800  ; PROTEIN
+	money 9800  ; IRON
+	money 9800  ; CARBOS
+	money 9800  ; CALCIUM
+	money 4800  ; RARE_CANDY
+	money 0     ; DOME_FOSSIL
+	money 0     ; HELIX_FOSSIL
+	money 0     ; SECRET_KEY
+	money 0     ; XXX
+	money 0     ; BIKE_VOUCHER
+	money 950   ; X_ACCURACY
+	money 2100  ; LEAF_STONE
+	money 0     ; CARD_KEY
+	money 10000 ; NUGGET
+	money 9800  ; XXX PP_UP
+	money 1000  ; POKE_DOLL
+	money 600   ; FULL_HEAL
+	money 1500  ; REVIVE
+	money 4000  ; MAX_REVIVE
+	money 700   ; GUARD_SPEC
+	money 500   ; SUPER_REPEL
+	money 700   ; MAX_REPEL
+	money 650   ; DIRE_HIT
+	money 10    ; COIN
+	money 200   ; FRESH_WATER
+	money 300   ; SODA_POP
+	money 350   ; LEMONADE
+	money 0     ; S_S_TICKET
+	money 0     ; GOLD_TEETH
+	money 500   ; X_ATTACK
+	money 550   ; X_DEFEND
+	money 350   ; X_SPEED
+	money 350   ; X_SPECIAL
+	money 0     ; COIN_CASE
+	money 0     ; OAKS_PARCEL
+	money 0     ; ITEMFINDER
+	money 0     ; SILPH_SCOPE
+	money 0     ; POKE_FLUTE
+	money 0     ; LIFT_KEY
+	money 0     ; EXP_ALL
+	money 0     ; OLD_ROD
+	money 0     ; GOOD_ROD
+	money 0     ; SUPER_ROD
+	money 0     ; PP_UP
+	money 0     ; ETHER
+	money 0     ; MAX_ETHER
+	money 0     ; ELIXER
+	money 0     ; MAX_ELIXER
+	money 0     ; FLOOR_B2F
+	money 0     ; FLOOR_B1F
+	money 0     ; FLOOR_1F
+	money 0     ; FLOOR_2F
+	money 0     ; FLOOR_3F
+	money 0     ; FLOOR_4F
+	money 0     ; FLOOR_5F
+	money 0     ; FLOOR_6F
+	money 0     ; FLOOR_7F
+	money 0     ; FLOOR_8F
+	money 0     ; FLOOR_9F
+	money 0     ; FLOOR_10F
+	money 0     ; FLOOR_11F
+	money 0     ; FLOOR_B4F
diff --git a/data/items/tm_prices.asm b/data/items/tm_prices.asm
new file mode 100755
index 00000000..7f007e9d
--- /dev/null
+++ b/data/items/tm_prices.asm
@@ -0,0 +1,27 @@
+TechnicalMachinePrices:
+; In thousands (nybbles).
+	dn 3, 2  ; TM01, TM02
+	dn 2, 1  ; TM03, TM04
+	dn 3, 4  ; TM05, TM06
+	dn 2, 4  ; TM07, TM08
+	dn 3, 4  ; TM09, TM10
+	dn 2, 1  ; TM11, TM12
+	dn 4, 5  ; TM13, TM14
+	dn 5, 5  ; TM15, TM16
+	dn 3, 2  ; TM17, TM18
+	dn 3, 2  ; TM19, TM20
+	dn 5, 5  ; TM21, TM22
+	dn 5, 2  ; TM23, TM24
+	dn 5, 4  ; TM25, TM26
+	dn 5, 2  ; TM27, TM28
+	dn 4, 1  ; TM29, TM30
+	dn 2, 1  ; TM31, TM32
+	dn 1, 2  ; TM33, TM34
+	dn 4, 2  ; TM35, TM36
+	dn 2, 5  ; TM37, TM38
+	dn 2, 4  ; TM39, TM40
+	dn 2, 2  ; TM41, TM42
+	dn 5, 2  ; TM43, TM44
+	dn 2, 4  ; TM45, TM46
+	dn 3, 4  ; TM47, TM48
+	dn 4, 2  ; TM49, TM50
diff --git a/data/items/use_overworld.asm b/data/items/use_overworld.asm
new file mode 100644
index 00000000..5a2ba102
--- /dev/null
+++ b/data/items/use_overworld.asm
@@ -0,0 +1,9 @@
+; items which close the item menu when used
+UsableItems_CloseMenu:
+	db ESCAPE_ROPE
+	db ITEMFINDER
+	db POKE_FLUTE
+	db OLD_ROD
+	db GOOD_ROD
+	db SUPER_ROD
+	db -1 ; end
diff --git a/data/items/use_party.asm b/data/items/use_party.asm
new file mode 100644
index 00000000..e8da68be
--- /dev/null
+++ b/data/items/use_party.asm
@@ -0,0 +1,39 @@
+; items which bring up the party menu when used
+UsableItems_PartyMenu:
+	db MOON_STONE
+	db ANTIDOTE
+	db BURN_HEAL
+	db ICE_HEAL
+	db AWAKENING
+	db PARLYZ_HEAL
+	db FULL_RESTORE
+	db MAX_POTION
+	db HYPER_POTION
+	db SUPER_POTION
+	db POTION
+	db FIRE_STONE
+	db THUNDER_STONE
+	db WATER_STONE
+	db HP_UP
+	db PROTEIN
+	db IRON
+	db CARBOS
+	db CALCIUM
+	db RARE_CANDY
+	db LEAF_STONE
+	db FULL_HEAL
+	db REVIVE
+	db MAX_REVIVE
+	db FRESH_WATER
+	db SODA_POP
+	db LEMONADE
+	db X_ATTACK
+	db X_DEFEND
+	db X_SPEED
+	db X_SPECIAL
+	db PP_UP
+	db ETHER
+	db MAX_ETHER
+	db ELIXER
+	db MAX_ELIXER
+	db -1 ; end
diff --git a/data/items/vending_prices.asm b/data/items/vending_prices.asm
new file mode 100644
index 00000000..131d525d
--- /dev/null
+++ b/data/items/vending_prices.asm
@@ -0,0 +1,10 @@
+vend_item: MACRO
+	db \1
+	money \2
+ENDM
+
+VendingPrices:
+	; item id, price
+	vend_item FRESH_WATER, 200
+	vend_item SODA_POP,    300
+	vend_item LEMONADE,    350