Added bcd macros with coins and money aliases.

This commit is contained in:
Marcus Huderle 2015-02-03 19:45:55 -08:00 committed by IIMarckus
parent 95f4f7b41f
commit 6143848c7e
3 changed files with 125 additions and 111 deletions

View file

@ -1,98 +1,98 @@
ItemPrices: ; 4608 (1:4608) ItemPrices: ; 4608 (1:4608)
db $00,$00,$00 money 0 ; MASTER_BALL
db $00,$12,$00 money 1200 ; ULTRA_BALL
db $00,$06,$00 money 600 ; GREAT_BALL
db $00,$02,$00 money 200 ; POKE_BALL
db $00,$00,$00 money 0 ; TOWN_MAP
db $00,$00,$00 money 0 ; BICYCLE
db $00,$00,$00 money 0 ; SURFBOARD
db $00,$10,$00 money 1000 ; SAFARI_BALL
db $00,$00,$00 money 0 ; POKEDEX
db $00,$00,$00 money 0 ; MOON_STONE
db $00,$01,$00 money 100 ; ANTIDOTE
db $00,$02,$50 money 250 ; BURN_HEAL
db $00,$02,$50 money 250 ; ICE_HEAL
db $00,$02,$00 money 200 ; AWAKENING
db $00,$02,$00 money 200 ; PARLYZ_HEAL
db $00,$30,$00 money 3000 ; FULL_RESTORE
db $00,$25,$00 money 2500 ; MAX_POTION
db $00,$15,$00 money 1500 ; HYPER_POTION
db $00,$07,$00 money 700 ; SUPER_POTION
db $00,$03,$00 money 300 ; POTION
db $00,$00,$00 money 0 ; BOULDERBADGE
db $00,$00,$00 money 0 ; CASCADEBADGE
db $00,$00,$00 money 0 ; THUNDERBADGE
db $00,$00,$00 money 0 ; RAINBOWBADGE
db $00,$00,$00 money 0 ; SOULBADGE
db $00,$00,$00 money 0 ; MARSHBADGE
db $00,$00,$00 money 0 ; VOLCANOBADGE
db $00,$00,$00 money 0 ; EARTHBADGE
db $00,$05,$50 money 550 ; ESCAPE_ROPE
db $00,$03,$50 money 350 ; REPEL
db $00,$00,$00 money 0 ; OLD_AMBER
db $00,$21,$00 money 2100 ; FIRE_STONE
db $00,$21,$00 money 2100 ; THUNDER_STONE
db $00,$21,$00 money 2100 ; WATER_STONE
db $00,$98,$00 money 9800 ; HP_UP
db $00,$98,$00 money 9800 ; PROTEIN
db $00,$98,$00 money 9800 ; IRON
db $00,$98,$00 money 9800 ; CARBOS
db $00,$98,$00 money 9800 ; CALCIUM
db $00,$48,$00 money 4800 ; RARE_CANDY
db $00,$00,$00 money 0 ; DOME_FOSSIL
db $00,$00,$00 money 0 ; HELIX_FOSSIL
db $00,$00,$00 money 0 ; SECRET_KEY
db $00,$00,$00 money 0 ; XXX
db $00,$00,$00 money 0 ; BIKE_VOUCHER
db $00,$09,$50 money 950 ; X_ACCURACY
db $00,$21,$00 money 2100 ; LEAF_STONE
db $00,$00,$00 money 0 ; CARD_KEY
db $01,$00,$00 money 10000 ; NUGGET
db $00,$98,$00 money 9800 ; XXX PP_UP
db $00,$10,$00 money 1000 ; POKE_DOLL
db $00,$06,$00 money 600 ; FULL_HEAL
db $00,$15,$00 money 1500 ; REVIVE
db $00,$40,$00 money 4000 ; MAX_REVIVE
db $00,$07,$00 money 700 ; GUARD_SPEC_
db $00,$05,$00 money 500 ; SUPER_REPEL
db $00,$07,$00 money 700 ; MAX_REPEL
db $00,$06,$50 money 650 ; DIRE_HIT
db $00,$00,$10 money 10 ; COIN
db $00,$02,$00 money 200 ; FRESH_WATER
db $00,$03,$00 money 300 ; SODA_POP
db $00,$03,$50 money 350 ; LEMONADE
db $00,$00,$00 money 0 ; S_S__TICKET
db $00,$00,$00 money 0 ; GOLD_TEETH
db $00,$05,$00 money 500 ; X_ATTACK
db $00,$05,$50 money 550 ; X_DEFEND
db $00,$03,$50 money 350 ; X_SPEED
db $00,$03,$50 money 350 ; X_SPECIAL
db $00,$00,$00 money 0 ; COIN_CASE
db $00,$00,$00 money 0 ; OAKS_PARCEL
db $00,$00,$00 money 0 ; ITEMFINDER
db $00,$00,$00 money 0 ; SILPH_SCOPE
db $00,$00,$00 money 0 ; POKE_FLUTE
db $00,$00,$00 money 0 ; LIFT_KEY
db $00,$00,$00 money 0 ; EXP__ALL
db $00,$00,$00 money 0 ; OLD_ROD
db $00,$00,$00 money 0 ; GOOD_ROD
db $00,$00,$00 money 0 ; SUPER_ROD
db $00,$00,$00 money 0 ; PP_UP
db $00,$00,$00 money 0 ; ETHER
db $00,$00,$00 money 0 ; MAX_ETHER
db $00,$00,$00 money 0 ; ELIXER
db $00,$00,$00 money 0 ; MAX_ELIXER
db $00,$00,$00 money 0 ; B2F
db $00,$00,$00 money 0 ; B1F
db $00,$00,$00 money 0 ; 1F
db $00,$00,$00 money 0 ; 2F
db $00,$00,$00 money 0 ; 3F
db $00,$00,$00 money 0 ; 4F
db $00,$00,$00 money 0 ; 5F
db $00,$00,$00 money 0 ; 6F
db $00,$00,$00 money 0 ; 7F
db $00,$00,$00 money 0 ; 8F
db $00,$00,$00 money 0 ; 9F
db $00,$00,$00 money 0 ; 10F
db $00,$00,$00 money 0 ; 11F
db $00,$00,$00 money 0 ; B4F

View file

@ -24,14 +24,14 @@ ENDC
PrizeMenuMon1Cost: ; 5285d (14:685d) PrizeMenuMon1Cost: ; 5285d (14:685d)
IF DEF(_RED) IF DEF(_RED)
db $01,$80 ; 180 Coins coins 180
db $05,$00 ; 500 Coins coins 500
ENDC ENDC
IF DEF(_BLUE) IF DEF(_BLUE)
db $01,$20 ; 120 Coins coins 120
db $07,$50 ; 750 Coins coins 750
ENDC ENDC
db $12,$00 ; 1200 Coins coins 1200
db "@" db "@"
PrizeMenuMon2Entries: ; 52864 (14:6864) PrizeMenuMon2Entries: ; 52864 (14:6864)
@ -48,14 +48,14 @@ ENDC
PrizeMenuMon2Cost: ; 52868 (14:6868) PrizeMenuMon2Cost: ; 52868 (14:6868)
IF DEF(_RED) IF DEF(_RED)
db $28,$00 ; 2800 Coins coins 2800
db $55,$00 ; 5500 Coins coins 5500
db $99,$99 ; 9999 Coins coins 9999
ENDC ENDC
IF DEF(_BLUE) IF DEF(_BLUE)
db $25,$00 ; 2500 Coins coins 2500
db $46,$00 ; 4600 Coins coins 4600
db $65,$00 ; 6500 Coins coins 6500
ENDC ENDC
db "@" db "@"
@ -66,7 +66,7 @@ PrizeMenuTMsEntries: ; 5286f (14:686f)
db "@" db "@"
PrizeMenuTMsCost: ; 52873 (14:6873) PrizeMenuTMsCost: ; 52873 (14:6873)
db $33,$00 ; 3300 Coins coins 3300
db $55,$00 ; 5500 Coins coins 5500
db $77,$00 ; 7700 Coins coins 7700
db "@" db "@"

View file

@ -49,6 +49,20 @@ callab: MACRO
call Bankswitch call Bankswitch
ENDM ENDM
bcd2: MACRO
dn ((\1) / 1000) % 10, ((\1) / 100) % 10
dn ((\1) / 10) % 10, (\1) % 10
ENDM
bcd3: MACRO
dn ((\1) / 100000) % 10, ((\1) / 10000) % 10
dn ((\1) / 1000) % 10, ((\1) / 100) % 10
dn ((\1) / 10) % 10, (\1) % 10
ENDM
coins equs "bcd2"
money equs "bcd3"
;\1 = X ;\1 = X
;\2 = Y ;\2 = Y
hlCoord: MACRO hlCoord: MACRO