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

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"
 

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

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