From 77c3e22a4ecd3dc81918f00c548cef7c634f3419 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Sat, 29 Oct 2016 10:32:03 -0700 Subject: use more HRAM constants --- engine/battle/core.asm | 4 ++-- engine/battle/experience.asm | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'engine/battle') diff --git a/engine/battle/core.asm b/engine/battle/core.asm index d921fd15..153a9048 100755 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -488,8 +488,8 @@ MainInBattleLoop: jr nc, .playerMovesFirst ; if player is faster jr .enemyMovesFirst ; if enemy is faster .speedEqual ; 50/50 chance for both players - ld a, [$ffaa] - cp $2 + ld a, [hSerialConnectionStatus] + cp USING_INTERNAL_CLOCK jr z, .invertOutcome call BattleRandom cp $80 diff --git a/engine/battle/experience.asm b/engine/battle/experience.asm index 9aee8bd7..24748338 100644 --- a/engine/battle/experience.asm +++ b/engine/battle/experience.asm @@ -119,11 +119,11 @@ GainExperience: ld d, MAX_LEVEL callab CalcExperience ; get max exp ; compare max exp with current exp - ld a, [$ff96] + ld a, [hExperience] ld b, a - ld a, [$ff97] + ld a, [hExperience + 1] ld c, a - ld a, [$ff98] + ld a, [hExperience + 2] ld d, a pop hl ld a, [hld] -- cgit v1.3.1-sl0p