money won and trainer pic constants

This commit is contained in:
xCrystal 2015-04-09 13:05:57 +02:00
parent 9c93ef3bff
commit 9739c26ed7
5 changed files with 21 additions and 16 deletions

View file

@ -1023,10 +1023,11 @@ TrainerBattleVictory: ; 3c696 (f:4696)
ld c, $28
call DelayFrames
call PrintEndBattleText
; win money
ld hl, MoneyForWinningText
call PrintText
ld de, wPlayerMoney + 2
ld hl, wd07b
ld hl, wAmountMoneyWon + 2
ld c, $3
predef_jump AddBCDPredef
@ -6959,9 +6960,9 @@ InitBattle_Common: ; 3efeb (f:6feb)
_LoadTrainerPic: ; 3f04b (f:704b)
; wd033-wd034 contain pointer to pic
ld a, [wd033]
ld a, [wTrainerPicPointer] ; wd033
ld e, a
ld a, [wd034]
ld a, [wTrainerPicPointer + 1] ; wd034
ld d, a ; de contains pointer to trainer pic
ld a, [wLinkState]
and a

View file

@ -141,9 +141,10 @@ ReadTrainer: ; 39c53 (e:5c53)
.GiveStarterMove
ld a,b
ld [wEnemyMon6Moves + 2],a
.FinishUp ; XXX this needs documenting
xor a ; clear D079-D07B
ld de,wd079
.FinishUp
; clear wAmountMoneyWon addresses
xor a
ld de,wAmountMoneyWon
ld [de],a
inc de
ld [de],a
@ -152,13 +153,14 @@ ReadTrainer: ; 39c53 (e:5c53)
ld a,[W_CURENEMYLVL]
ld b,a
.LastLoop
; update wAmountMoneyWon addresses (money to win) based on enemy's level
ld hl,wd047
ld c,2
ld c,2 ; wAmountMoneyWon is a 3-byte number
push bc
predef AddBCDPredef
pop bc
inc de
inc de
dec b
jr nz,.LastLoop
jr nz,.LastLoop ; repeat W_CURENEMYLVL times
ret