From f95cdb0911690a41d1e19d848016f0543a9b8a63 Mon Sep 17 00:00:00 2001 From: Thorn Avery Date: Sat, 23 Sep 2023 09:28:44 +1000 Subject: [PATCH] ported Red++ levelup code --- engine/battle/experience.asm | 14 ++++++++++++++ ram/wram.asm | 1 + 2 files changed, 15 insertions(+) diff --git a/engine/battle/experience.asm b/engine/battle/experience.asm index fcbabf01..77a9728e 100644 --- a/engine/battle/experience.asm +++ b/engine/battle/experience.asm @@ -174,6 +174,7 @@ GainExperience: farcall CalcLevelFromExperience pop hl ld a, [hl] ; current level + ld [wTempLevel], a cp d jp z, .nextMon ; if level didn't change, go to next mon ld a, [wCurEnemyLVL] @@ -269,7 +270,20 @@ GainExperience: ld [wMonDataLocation], a ld a, [wd0b5] ld [wd11e], a + ld a, [wCurEnemyLVL] + ld c, a + ld a, [wTempLevel] + ld b, a +.level_loop + inc b + ld a, b + ld [wCurEnemyLVL], a + push bc predef LearnMoveFromLevelUp + pop bc + ld a, b + cp c + jr nz, .level_loop ld hl, wCanEvolveFlags ld a, [wWhichPokemon] ld c, a diff --git a/ram/wram.asm b/ram/wram.asm index c55592af..ff6a5452 100644 --- a/ram/wram.asm +++ b/ram/wram.asm @@ -203,6 +203,7 @@ ENDU SECTION "Overworld Map", WRAM0 UNION +wTempLevel:: wOverworldMap:: ds 1300 wOverworldMapEnd::