diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2020-11-05 23:50:02 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-05 23:50:02 -0500 |
| commit | 5db3bdd6551fad07066b669db1e44a6151aaa0b4 (patch) | |
| tree | ab357b894c9457b3d1d38fd49300df34412168f8 /engine/battle/experience.asm | |
| parent | Merge pull request #59 from Rangi42/master (diff) | |
| parent | Sync more with pokered (diff) | |
| download | pokeyellow-5db3bdd6551fad07066b669db1e44a6151aaa0b4.tar.gz pokeyellow-5db3bdd6551fad07066b669db1e44a6151aaa0b4.tar.xz pokeyellow-5db3bdd6551fad07066b669db1e44a6151aaa0b4.zip | |
Merge pull request #60 from Rangi42/master
Organize home and macro code
Diffstat (limited to 'engine/battle/experience.asm')
| -rw-r--r-- | engine/battle/experience.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/engine/battle/experience.asm b/engine/battle/experience.asm index bab804bb..61fbdfa3 100644 --- a/engine/battle/experience.asm +++ b/engine/battle/experience.asm @@ -43,7 +43,7 @@ GainExperience: inc de jr .nextBaseStat .maxStatExp ; if the upper byte also overflowed, then we have hit the max stat exp - dec a ; a is 0 from previous check + dec a ; ld a, $ff; a is 0 from previous check ld [de], a inc de ld [de], a @@ -234,15 +234,15 @@ GainExperience: xor a ; battle mon ld [wCalculateWhoseStats], a ld hl, CalculateModifiedStats - call Bankswitch15ToF + call CallBattleCore ld hl, ApplyBurnAndParalysisPenaltiesToPlayer - call Bankswitch15ToF + call CallBattleCore ld hl, ApplyBadgeStatBoosts - call Bankswitch15ToF + call CallBattleCore ld hl, DrawPlayerHUDAndHPBar - call Bankswitch15ToF + call CallBattleCore ld hl, PrintEmptyString - call Bankswitch15ToF + call CallBattleCore call SaveScreenTilesToBuffer1 .printGrewLevelText callabd_ModifyPikachuHappiness PIKAHAPPY_LEVELUP @@ -345,7 +345,7 @@ BoostExp: ldh [hQuotient + 2], a ret -Bankswitch15ToF: +CallBattleCore: ld b, BANK(BattleCore) jp Bankswitch |