From 32f7cf12de9f841f76a3f2010caf6d7a80d47bcc Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Sat, 7 Feb 2015 18:37:40 -0800 Subject: Named wram symbols --- engine/evos_moves.asm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'engine/evos_moves.asm') diff --git a/engine/evos_moves.asm b/engine/evos_moves.asm index 2c504104..2eef7ba7 100755 --- a/engine/evos_moves.asm +++ b/engine/evos_moves.asm @@ -88,7 +88,7 @@ Evolution_PartyMonLoop: ; loop over party mons jp nz, .nextEvoEntry1 ; if not trading, go to the next evolution entry ld a, [hli] ; level requirement ld b, a - ld a, [wcfb9] + ld a, [wLoadedMonLevel] cp b ; is the mon's level greater than the evolution requirement? jp c, Evolution_PartyMonLoop ; if so, go the next mon jr .asm_3adb6 @@ -101,7 +101,7 @@ Evolution_PartyMonLoop: ; loop over party mons .checkLevel ld a, [hli] ; level requirement ld b, a - ld a, [wcfb9] + ld a, [wLoadedMonLevel] cp b ; is the mon's level greater than the evolution requirement? jp c, .nextEvoEntry2 ; if so, go the next evolution entry .asm_3adb6 @@ -136,7 +136,7 @@ Evolution_PartyMonLoop: ; loop over party mons pop hl ld a, [hl] ld [wd0b5], a - ld [wcf98], a + ld [wLoadedMonSpecies], a ld [wHPBarMaxHP + 1], a ld a, MONSTER_NAME ld [W_LISTTYPE], a @@ -169,8 +169,8 @@ Evolution_PartyMonLoop: ; loop over party mons ld [W_MONHDEXNUM], a pop af ld [wd11e], a - ld hl, wcfa8 - ld de, wcfba + ld hl, wLoadedMonHPExp - 1 + ld de, wLoadedMonStats ld b, $1 call CalcStats ld a, [wWhichPokemon] @@ -186,14 +186,14 @@ Evolution_PartyMonLoop: ; loop over party mons ld a, [hli] ld b, a ld c, [hl] - ld hl, wcfbb + ld hl, wLoadedMonMaxHP + 1 ld a, [hld] sub c ld c, a ld a, [hl] sbc b ld b, a - ld hl, wcf9a + ld hl, wLoadedMonHP + 1 ld a, [hl] add c ld [hld], a @@ -226,7 +226,7 @@ Evolution_PartyMonLoop: ; loop over party mons call Evolution_FlagAction pop de pop hl - ld a, [wcf98] + ld a, [wLoadedMonSpecies] ld [hl], a push hl ld l, e -- cgit v1.2.3 From 1347023128e141dc4cfc71ee6bc689f909e96919 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Sun, 8 Feb 2015 00:17:03 -0800 Subject: move-related things --- engine/evos_moves.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engine/evos_moves.asm') diff --git a/engine/evos_moves.asm b/engine/evos_moves.asm index 2eef7ba7..86b49d30 100755 --- a/engine/evos_moves.asm +++ b/engine/evos_moves.asm @@ -364,7 +364,7 @@ LearnMoveFromLevelUp: ; 3af5b (e:6f5b) dec b jr nz, .checkCurrentMovesLoop ld a, d - ld [wd0e0], a + ld [wMoveNum], a ld [wd11e], a call GetMoveName call CopyStringToCF4B -- cgit v1.2.3 From 3870f5e10a1e17f35c78b176272df6b1f516f24e Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Sun, 8 Feb 2015 01:44:41 -0800 Subject: named misc functions --- engine/evos_moves.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engine/evos_moves.asm') diff --git a/engine/evos_moves.asm b/engine/evos_moves.asm index 86b49d30..23bffa8d 100755 --- a/engine/evos_moves.asm +++ b/engine/evos_moves.asm @@ -139,7 +139,7 @@ Evolution_PartyMonLoop: ; loop over party mons ld [wLoadedMonSpecies], a ld [wHPBarMaxHP + 1], a ld a, MONSTER_NAME - ld [W_LISTTYPE], a + ld [wNameListType], a ld a, BANK(TrainerNames) ; bank is not used for monster names ld [wPredefBank], a call GetName -- cgit v1.2.3