From 3cf945bad4fdf40c528147a8d1fd9c5565425232 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sat, 24 Jan 2015 12:41:20 -0800 Subject: Better documenting for GetMachinePrice and TechnicalMachinePrices. --- engine/items/tm_prices.asm | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'engine') diff --git a/engine/items/tm_prices.asm b/engine/items/tm_prices.asm index c55a25b4..7c5c56fa 100755 --- a/engine/items/tm_prices.asm +++ b/engine/items/tm_prices.asm @@ -1,5 +1,8 @@ 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 ret c ld d, a @@ -8,11 +11,11 @@ GetMachinePrice: ; 7bf86 (1e:7f86) ld c, a ld b, 0 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 - jr nc, .asm_7bf9d + jr nc, .highNybbleIsPrice ; is TM id odd? swap a -.asm_7bf9d +.highNybbleIsPrice and $f0 ld [H_DOWNARROWBLINKCNT2], a ; $ff8c xor a -- cgit v1.3.1-sl0p From 95f4f7b41fbb45f6e8efb42b19a5535e52c1dbb7 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sat, 24 Jan 2015 12:52:11 -0800 Subject: Clean up prizes data. --- data/prizes.asm | 25 ++++++++++++++----------- engine/menu/prize_menu.asm | 2 +- 2 files changed, 15 insertions(+), 12 deletions(-) (limited to 'engine') diff --git a/data/prizes.asm b/data/prizes.asm index 92736715..c88767d6 100755 --- a/data/prizes.asm +++ b/data/prizes.asm @@ -21,16 +21,17 @@ IF DEF(_BLUE) db NIDORINO ENDC db "@" + PrizeMenuMon1Cost: ; 5285d (14:685d) IF DEF(_RED) - db $01,$80 - db $05,$00 + db $01,$80 ; 180 Coins + db $05,$00 ; 500 Coins ENDC IF DEF(_BLUE) - db $01,$20 - db $07,$50 + db $01,$20 ; 120 Coins + db $07,$50 ; 750 Coins ENDC - db $12,$00 + db $12,$00 ; 1200 Coins db "@" PrizeMenuMon2Entries: ; 52864 (14:6864) @@ -44,16 +45,17 @@ IF DEF(_BLUE) ENDC db PORYGON db "@" + PrizeMenuMon2Cost: ; 52868 (14:6868) IF DEF(_RED) - db $28,$00 - db $55,$00 - db $99,$99 + db $28,$00 ; 2800 Coins + db $55,$00 ; 5500 Coins + db $99,$99 ; 9999 Coins ENDC IF DEF(_BLUE) - db $25,$00 - db $46,$00 - db $65,$00 + db $25,$00 ; 2500 Coins + db $46,$00 ; 4600 Coins + db $65,$00 ; 6500 Coins ENDC db "@" @@ -62,6 +64,7 @@ PrizeMenuTMsEntries: ; 5286f (14:686f) db TM_15 db TM_50 db "@" + PrizeMenuTMsCost: ; 52873 (14:6873) db $33,$00 ; 3300 Coins db $55,$00 ; 5500 Coins diff --git a/engine/menu/prize_menu.asm b/engine/menu/prize_menu.asm index 141b9beb..0e904200 100755 --- a/engine/menu/prize_menu.asm +++ b/engine/menu/prize_menu.asm @@ -6,7 +6,7 @@ CeladonPrizeMenu: ; 5271b (14:671b) jp PrintText .havingCoinCase ld hl,wd730 - set 6,[hl] + set 6,[hl] ; disable letter-printing delay ld hl,ExchangeCoinsForPrizesTextPtr call PrintText ; the following are the menu settings -- cgit v1.3.1-sl0p From c3a5bb70d2c65b7fe6033ee9bfb8fe89b6a3e431 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Tue, 3 Feb 2015 19:54:47 -0800 Subject: Use money macro for TrainerPicAndMoneyPointers. --- engine/battle/e.asm | 94 ++++++++++++++++++++++++++--------------------------- 1 file changed, 47 insertions(+), 47 deletions(-) (limited to 'engine') diff --git a/engine/battle/e.asm b/engine/battle/e.asm index 072aca49..dd227be7 100755 --- a/engine/battle/e.asm +++ b/engine/battle/e.asm @@ -435,145 +435,145 @@ TrainerPicAndMoneyPointers: ; 39914 (e:5914) ; trainer pic pointers and base money. ; money received after battle = base money × level of highest-level enemy mon dw YoungsterPic - db 0,$15,0 + money 1500 dw BugCatcherPic - db 0,$10,0 + money 1000 dw LassPic - db 0,$15,0 + money 1500 dw SailorPic - db 0,$30,0 + money 3000 dw JrTrainerMPic - db 0,$20,0 + money 2000 dw JrTrainerFPic - db 0,$20,0 + money 2000 dw PokemaniacPic - db 0,$50,0 + money 5000 dw SuperNerdPic - db 0,$25,0 + money 2500 dw HikerPic - db 0,$35,0 + money 3500 dw BikerPic - db 0,$20,0 + money 2000 dw BurglarPic - db 0,$90,0 + money 9000 dw EngineerPic - db 0,$50,0 + money 5000 dw JugglerPic - db 0,$35,0 + money 3500 dw FisherPic - db 0,$35,0 + money 3500 dw SwimmerPic - db 0,$05,0 + money 500 dw CueBallPic - db 0,$25,0 + money 2500 dw GamblerPic - db 0,$70,0 + money 7000 dw BeautyPic - db 0,$70,0 + money 7000 dw PsychicPic - db 0,$10,0 + money 1000 dw RockerPic - db 0,$25,0 + money 2500 dw JugglerPic - db 0,$35,0 + money 3500 dw TamerPic - db 0,$40,0 + money 4000 dw BirdKeeperPic - db 0,$25,0 + money 2500 dw BlackbeltPic - db 0,$25,0 + money 2500 dw Rival1Pic - db 0,$35,0 + money 3500 dw ProfOakPic - db 0,$99,0 + money 9900 dw ChiefPic - db 0,$30,0 + money 3000 dw ScientistPic - db 0,$50,0 + money 5000 dw GiovanniPic - db 0,$99,0 + money 9900 dw RocketPic - db 0,$30,0 + money 3000 dw CooltrainerMPic - db 0,$35,0 + money 3500 dw CooltrainerFPic - db 0,$35,0 + money 3500 dw BrunoPic - db 0,$99,0 + money 9900 dw BrockPic - db 0,$99,0 + money 9900 dw MistyPic - db 0,$99,0 + money 9900 dw LtSurgePic - db 0,$99,0 + money 9900 dw ErikaPic - db 0,$99,0 + money 9900 dw KogaPic - db 0,$99,0 + money 9900 dw BlainePic - db 0,$99,0 + money 9900 dw SabrinaPic - db 0,$99,0 + money 9900 dw GentlemanPic - db 0,$70,0 + money 7000 dw Rival2Pic - db 0,$65,0 + money 6500 dw Rival3Pic - db 0,$99,0 + money 9900 dw LoreleiPic - db 0,$99,0 + money 9900 dw ChannelerPic - db 0,$30,0 + money 3000 dw AgathaPic - db 0,$99,0 + money 9900 dw LancePic - db 0,$99,0 + money 9900 INCLUDE "text/trainer_names.asm" -- cgit v1.3.1-sl0p