diff options
Diffstat (limited to 'engine/evolve.asm')
| -rwxr-xr-x | engine/evolve.asm | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/engine/evolve.asm b/engine/evolve.asm index db7d7e946..2f7739191 100755 --- a/engine/evolve.asm +++ b/engine/evolve.asm @@ -29,7 +29,7 @@ EvolveAfterBattle_MasterLoop cp $ff jp z, .ReturnToMap - ld [Buffer1], a + ld [wEvolutionOldSpecies], a push hl ld a, [CurPartyMon] @@ -41,14 +41,13 @@ EvolveAfterBattle_MasterLoop and a jp z, EvolveAfterBattle_MasterLoop - ld a, [Buffer1] + ld a, [wEvolutionOldSpecies] dec a ld b, 0 ld c, a ld hl, EvosAttacksPointers -rept 2 add hl, bc -endr + add hl, bc ld a, [hli] ld h, [hl] ld l, a @@ -205,7 +204,7 @@ endr push hl ld a, [hl] - ld [Buffer2], a + ld [wEvolutionNewSpecies], a ld a, [CurPartyMon] ld hl, PartyMonNicknames call GetNick @@ -241,14 +240,14 @@ endr ld a, [hl] ld [CurSpecies], a ld [TempMonSpecies], a - ld [Buffer2], a + ld [wEvolutionNewSpecies], a ld [wd265], a call GetPokemonName push hl ld hl, Text_EvolvedIntoPKMN call PrintTextBoxText - callba MobileFn_106094 + callba TrainerRankings_MonsEvolved ld de, MUSIC_NONE call PlayMusic @@ -437,9 +436,8 @@ LearnLevelMoves: ; 42487 ld b, 0 ld c, a ld hl, EvosAttacksPointers -rept 2 add hl, bc -endr + add hl, bc ld a, [hli] ld h, [hl] ld l, a @@ -532,7 +530,7 @@ FillMoves: ; 424e1 ld a, [CurPartyLevel] cp b jp c, .done - ld a, [Buffer1] + ld a, [wEvolutionOldSpecies] and a jr z, .CheckMove ld a, [wd002] @@ -565,7 +563,7 @@ FillMoves: ; 424e1 ld h, d ld l, e call ShiftMoves - ld a, [Buffer1] + ld a, [wEvolutionOldSpecies] and a jr z, .ShiftedMove push de @@ -582,7 +580,7 @@ FillMoves: ; 424e1 .LearnMove: ld a, [hl] ld [de], a - ld a, [Buffer1] + ld a, [wEvolutionOldSpecies] and a jr z, .NextMove push hl @@ -638,9 +636,8 @@ GetPreEvolution: ; 42581 .loop ; For each Pokemon... ld hl, EvosAttacksPointers ld b, 0 -rept 2 add hl, bc -endr + add hl, bc ld a, [hli] ld h, [hl] ld l, a |