diff options
| author | yenatch <yenatch@gmail.com> | 2014-09-20 00:57:27 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2014-09-20 00:57:27 -0400 |
| commit | dff0cdeb5a2f901dc8d1a05847d09d7faf1654ad (patch) | |
| tree | 3618582f76f4183b6bc22c5d4743b6d171d11128 /engine/battle/b_2.asm | |
| parent | Merge remote-tracking branch 'origin/master' into tentative (diff) | |
| parent | Commented/labelled misc functions (diff) | |
| download | pokeyellow-dff0cdeb5a2f901dc8d1a05847d09d7faf1654ad.tar.gz pokeyellow-dff0cdeb5a2f901dc8d1a05847d09d7faf1654ad.tar.xz pokeyellow-dff0cdeb5a2f901dc8d1a05847d09d7faf1654ad.zip | |
Merge remote-tracking branch 'YamaArashi/master'
Conflicts:
constants/misc_constants.asm
engine/battle/core.asm
engine/menu/pokedex.asm
engine/town_map.asm
home.asm
hram.asm
Diffstat (limited to 'engine/battle/b_2.asm')
| -rwxr-xr-x | engine/battle/b_2.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engine/battle/b_2.asm b/engine/battle/b_2.asm index e343f1aa..4ff8b66b 100755 --- a/engine/battle/b_2.asm +++ b/engine/battle/b_2.asm @@ -88,10 +88,10 @@ PayDayEffect_ ; 2feb8 (b:7eb8) xor a ld hl, wcd6d ld [hli], a - ld a, [$fff3] + ld a, [H_WHOSETURN] and a ld a, [wBattleMonLevel] - jr z, .asm_2fec8 ; 0x2fec3 $3 + jr z, .asm_2fec8 ld a, [wEnemyMonLevel] .asm_2fec8 add a @@ -118,10 +118,10 @@ PayDayEffect_ ; 2feb8 (b:7eb8) ld a, [$ff99] add b ld [hl], a - ld de, wcce7 + ld de, wTotalPayDayMoney + 2 ld c, $3 predef AddBCDPredef - ld hl, CoinsScatteredText ; $7f04 + ld hl, CoinsScatteredText jp PrintText CoinsScatteredText: ; 2ff04 (b:7f04) |