diff options
| author | YamaArashi <shadow962@live.com> | 2016-10-29 10:32:03 -0700 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2016-10-29 10:32:03 -0700 |
| commit | 77c3e22a4ecd3dc81918f00c548cef7c634f3419 (patch) | |
| tree | 8653190480bb8f7673e94b4083248e634d62fa77 | |
| parent | 4d61c351726b38b22e0606df23bd2fdfb13640cc (diff) | |
use more HRAM constants
| -rwxr-xr-x | engine/battle/core.asm | 4 | ||||
| -rw-r--r-- | engine/battle/experience.asm | 6 | ||||
| -rwxr-xr-x | engine/cable_club.asm | 4 | ||||
| -rwxr-xr-x | scripts/tradecenter.asm | 8 |
4 files changed, 11 insertions, 11 deletions
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] diff --git a/engine/cable_club.asm b/engine/cable_club.asm index 137e8406..fa99215e 100755 --- a/engine/cable_club.asm +++ b/engine/cable_club.asm @@ -551,7 +551,7 @@ TradeCenter_SelectMon: Coorda 1, 16 .cancelMenuItem_JoypadLoop call JoypadLowSensitivity - ld a, [$ffb5] + ld a, [hJoy5] and a ; pressed anything? jr z, .cancelMenuItem_JoypadLoop bit 0, a ; A button pressed? @@ -914,7 +914,7 @@ CableClub_Run: ld [wGrassRate], a inc a ; LINK_STATE_IN_CABLE_CLUB ld [wLinkState], a - ld [$ffb5], a + ld [hJoy5], a ld a, 10 ld [wAudioFadeOutControl], a ld a, BANK(Music_Celadon) diff --git a/scripts/tradecenter.asm b/scripts/tradecenter.asm index a200e719..80efe4f9 100755 --- a/scripts/tradecenter.asm +++ b/scripts/tradecenter.asm @@ -1,7 +1,7 @@ TradeCenterScript: call EnableAutoTextBoxDrawing - ld a, [$ffaa] - cp $2 + ld a, [hSerialConnectionStatus] + cp USING_INTERNAL_CLOCK ld a, SPRITE_FACING_LEFT jr z, .next ld a, SPRITE_FACING_RIGHT @@ -21,8 +21,8 @@ TradeCenterScript: ld [hl], a ld a, SPRITE_FACING_LEFT ld [wSpriteStateData1 + $19], a - ld a, [$ffaa] - cp $2 + ld a, [hSerialConnectionStatus] + cp USING_INTERNAL_CLOCK ret z ld a, $7 ld [wSpriteStateData2 + $15], a |