thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-12-29 05:33:15 +13:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of /tmp/a/pokered

Browse source
This commit is contained in:
IIMarckus 2015-02-04 00:51:25 -07:00
parent a53b3ca561 c3a5bb70d2
commit 01e314f4f5
8 changed files with 213 additions and 171 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

194
data/item_prices.asm
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

31
data/prizes.asm
View file

@ -21,16 +21,17 @@ IF DEF(_BLUE)
db NIDORINO db NIDORINO
ENDC ENDC
db "@" db "@"
PrizeMenuMon1Cost: ; 5285d (14:685d) PrizeMenuMon1Cost: ; 5285d (14:685d)
IF DEF(_RED) IF DEF(_RED)
db $01,$80 coins 180
db $05,$00 coins 500
ENDC ENDC
IF DEF(_BLUE) IF DEF(_BLUE)
db $01,$20 coins 120
db $07,$50 coins 750
ENDC ENDC
db $12,$00 coins 1200
db "@" db "@"
PrizeMenuMon2Entries: ; 52864 (14:6864) PrizeMenuMon2Entries: ; 52864 (14:6864)
@ -44,16 +45,17 @@ IF DEF(_BLUE)
ENDC ENDC
db PORYGON db PORYGON
db "@" db "@"
PrizeMenuMon2Cost: ; 52868 (14:6868) PrizeMenuMon2Cost: ; 52868 (14:6868)
IF DEF(_RED) IF DEF(_RED)
db $28,$00 coins 2800
db $55,$00 coins 5500
db $99,$99 coins 9999
ENDC ENDC
IF DEF(_BLUE) IF DEF(_BLUE)
db $25,$00 coins 2500
db $46,$00 coins 4600
db $65,$00 coins 6500
ENDC ENDC
db "@" db "@"
@ -62,8 +64,9 @@ PrizeMenuTMsEntries: ; 5286f (14:686f)
db TM_15 db TM_15
db TM_50 db TM_50
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 "@"

30
data/tm_prices.asm
View file

@ -1,7 +1,27 @@
TechnicalMachinePrices: ; 7bfa7 (1e:7fa7) TechnicalMachinePrices: ; 7bfa7 (1e:7fa7)
; In thousands (nybbles). ; In thousands (nybbles).
db $32, $21, $34, $24, $34 dn 3, 2 ; TM_01, TM_02
db $21, $45, $55, $32, $32 dn 2, 1 ; TM_03, TM_04
db $55, $52, $54, $52, $41 dn 3, 4 ; TM_05, TM_06
db $21, $12, $42, $25, $24 dn 2, 4 ; TM_07, TM_08
db $22, $52, $24, $34, $42 dn 3, 4 ; TM_09, TM_10
dn 2, 1 ; TM_11, TM_12
dn 4, 5 ; TM_13, TM_14
dn 5, 5 ; TM_15, TM_16
dn 3, 2 ; TM_17, TM_18
dn 3, 2 ; TM_19, TM_20
dn 5, 5 ; TM_21, TM_22
dn 5, 2 ; TM_23, TM_24
dn 5, 4 ; TM_25, TM_26
dn 5, 2 ; TM_27, TM_28
dn 4, 1 ; TM_29, TM_30
dn 2, 1 ; TM_31, TM_32
dn 1, 2 ; TM_33, TM_34
dn 4, 2 ; TM_35, TM_36
dn 2, 5 ; TM_37, TM_38
dn 2, 4 ; TM_39, TM_40
dn 2, 2 ; TM_41, TM_42
dn 5, 2 ; TM_43, TM_44
dn 2, 4 ; TM_45, TM_46
dn 3, 4 ; TM_47, TM_48
dn 4, 2 ; TM_49, TM_50

94
engine/battle/e.asm
View file

@ -435,145 +435,145 @@ TrainerPicAndMoneyPointers: ; 39914 (e:5914)
; trainer pic pointers and base money. ; trainer pic pointers and base money.
; money received after battle = base money × level of highest-level enemy mon ; money received after battle = base money × level of highest-level enemy mon
dw YoungsterPic dw YoungsterPic
db 0,$15,0 money 1500
dw BugCatcherPic dw BugCatcherPic
db 0,$10,0 money 1000
dw LassPic dw LassPic
db 0,$15,0 money 1500
dw SailorPic dw SailorPic
db 0,$30,0 money 3000
dw JrTrainerMPic dw JrTrainerMPic
db 0,$20,0 money 2000
dw JrTrainerFPic dw JrTrainerFPic
db 0,$20,0 money 2000
dw PokemaniacPic dw PokemaniacPic
db 0,$50,0 money 5000
dw SuperNerdPic dw SuperNerdPic
db 0,$25,0 money 2500
dw HikerPic dw HikerPic
db 0,$35,0 money 3500
dw BikerPic dw BikerPic
db 0,$20,0 money 2000
dw BurglarPic dw BurglarPic
db 0,$90,0 money 9000
dw EngineerPic dw EngineerPic
db 0,$50,0 money 5000
dw JugglerPic dw JugglerPic
db 0,$35,0 money 3500
dw FisherPic dw FisherPic
db 0,$35,0 money 3500
dw SwimmerPic dw SwimmerPic
db 0,$05,0 money 500
dw CueBallPic dw CueBallPic
db 0,$25,0 money 2500
dw GamblerPic dw GamblerPic
db 0,$70,0 money 7000
dw BeautyPic dw BeautyPic
db 0,$70,0 money 7000
dw PsychicPic dw PsychicPic
db 0,$10,0 money 1000
dw RockerPic dw RockerPic
db 0,$25,0 money 2500
dw JugglerPic dw JugglerPic
db 0,$35,0 money 3500
dw TamerPic dw TamerPic
db 0,$40,0 money 4000
dw BirdKeeperPic dw BirdKeeperPic
db 0,$25,0 money 2500
dw BlackbeltPic dw BlackbeltPic
db 0,$25,0 money 2500
dw Rival1Pic dw Rival1Pic
db 0,$35,0 money 3500
dw ProfOakPic dw ProfOakPic
db 0,$99,0 money 9900
dw ChiefPic dw ChiefPic
db 0,$30,0 money 3000
dw ScientistPic dw ScientistPic
db 0,$50,0 money 5000
dw GiovanniPic dw GiovanniPic
db 0,$99,0 money 9900
dw RocketPic dw RocketPic
db 0,$30,0 money 3000
dw CooltrainerMPic dw CooltrainerMPic
db 0,$35,0 money 3500
dw CooltrainerFPic dw CooltrainerFPic
db 0,$35,0 money 3500
dw BrunoPic dw BrunoPic
db 0,$99,0 money 9900
dw BrockPic dw BrockPic
db 0,$99,0 money 9900
dw MistyPic dw MistyPic
db 0,$99,0 money 9900
dw LtSurgePic dw LtSurgePic
db 0,$99,0 money 9900
dw ErikaPic dw ErikaPic
db 0,$99,0 money 9900
dw KogaPic dw KogaPic
db 0,$99,0 money 9900
dw BlainePic dw BlainePic
db 0,$99,0 money 9900
dw SabrinaPic dw SabrinaPic
db 0,$99,0 money 9900
dw GentlemanPic dw GentlemanPic
db 0,$70,0 money 7000
dw Rival2Pic dw Rival2Pic
db 0,$65,0 money 6500
dw Rival3Pic dw Rival3Pic
db 0,$99,0 money 9900
dw LoreleiPic dw LoreleiPic
db 0,$99,0 money 9900
dw ChannelerPic dw ChannelerPic
db 0,$30,0 money 3000
dw AgathaPic dw AgathaPic
db 0,$99,0 money 9900
dw LancePic dw LancePic
db 0,$99,0 money 9900
INCLUDE "text/trainer_names.asm" INCLUDE "text/trainer_names.asm"

11
engine/items/tm_prices.asm
View file

@ -1,5 +1,8 @@
GetMachinePrice: ; 7bf86 (1e:7f86) GetMachinePrice: ; 7bf86 (1e:7f86)
ld a, [wcf91] ; Input: [wcf91] = Item Id of a TM
; Output: Stores the 2-byte TM price in [H_DOWNARROWBLINKCNT1] and [H_DOWNARROWBLINKCNT2]
; as a BCD
ld a, [wcf91] ; a contains TM item id
sub TM_01 sub TM_01
ret c ret c
ld d, a ld d, a
@ -8,11 +11,11 @@ GetMachinePrice: ; 7bf86 (1e:7f86)
ld c, a ld c, a
ld b, 0 ld b, 0
add hl, bc add hl, bc
ld a, [hl] ld a, [hl] ; a contains byte whose high or low nybble is the TM price (in thousands)
srl d srl d
jr nc, .asm_7bf9d jr nc, .highNybbleIsPrice ; is TM id odd?
swap a swap a
.asm_7bf9d .highNybbleIsPrice
and $f0 and $f0
ld [H_DOWNARROWBLINKCNT2], a ; $ff8c ld [H_DOWNARROWBLINKCNT2], a ; $ff8c
xor a xor a

2
engine/menu/prize_menu.asm
View file

@ -6,7 +6,7 @@ CeladonPrizeMenu: ; 5271b (14:671b)
jp PrintText jp PrintText
.havingCoinCase .havingCoinCase
ld hl,wd730 ld hl,wd730
set 6,[hl] set 6,[hl] ; disable letter-printing delay
ld hl,ExchangeCoinsForPrizesTextPtr ld hl,ExchangeCoinsForPrizesTextPtr
call PrintText call PrintText
; the following are the menu settings ; the following are the menu settings

8
home.asm
View file

@ -3335,6 +3335,8 @@ GetName:: ; 376b (0:376b)
ret ret
GetItemPrice:: ; 37df (0:37df) GetItemPrice:: ; 37df (0:37df)
; Stores item's price as BCD in [H_DOWNARROWBLINKCNT1] and [[H_DOWNARROWBLINKCNT2]
; Input: [wcf91] = item id
ld a, [H_LOADEDROMBANK] ld a, [H_LOADEDROMBANK]
push af push af
ld a, [wListMenuID] ; wListMenuID ld a, [wListMenuID] ; wListMenuID
@ -3349,9 +3351,9 @@ GetItemPrice:: ; 37df (0:37df)
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
ld a, [wcf91] ld a, [wcf91] ; a contains item id
cp HM_01 cp HM_01
jr nc, .asm_3812 jr nc, .getTMPrice
ld bc, $3 ld bc, $3
.asm_3802 .asm_3802
add hl, bc add hl, bc
@ -3365,7 +3367,7 @@ GetItemPrice:: ; 37df (0:37df)
ld a, [hl] ld a, [hl]
ld [H_DOWNARROWBLINKCNT1], a ; $ff8b ld [H_DOWNARROWBLINKCNT1], a ; $ff8b
jr .asm_381c jr .asm_381c
.asm_3812 .getTMPrice
ld a, Bank(GetMachinePrice) ld a, Bank(GetMachinePrice)
ld [H_LOADEDROMBANK], a ld [H_LOADEDROMBANK], a
ld [$2000], a ld [$2000], a

14
macros.asm
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