diff options
| author | yenatch <yenatch@gmail.com> | 2018-02-03 17:15:20 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-03 17:15:20 -0500 |
| commit | b35eb72290b964b98844afbe741bb7ede34b9ef3 (patch) | |
| tree | 2cf2652bc9c3e69ae5f7b2a2632c02a12498615f /engine/learn.asm | |
| parent | 7547ad839cf1c8141b931d08ef16a894e7db68c9 (diff) | |
| parent | 32ade4ac9bf113d630d904aab51f2c49c91bf8c2 (diff) | |
Merge pull request #480 from luckytyphlosion/master
[Ready to merge] Prefix wram labels with w.
Diffstat (limited to 'engine/learn.asm')
| -rwxr-xr-x | engine/learn.asm | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/engine/learn.asm b/engine/learn.asm index 2f1038d7f..54ec8f6bb 100755 --- a/engine/learn.asm +++ b/engine/learn.asm @@ -1,17 +1,17 @@ LearnMove: ; 6508 call LoadTileMapToTempTileMap - ld a, [CurPartyMon] - ld hl, PartyMonNicknames + ld a, [wCurPartyMon] + ld hl, wPartyMonNicknames call GetNick - ld hl, StringBuffer1 + ld hl, wStringBuffer1 ld de, wMonOrItemNameBuffer ld bc, MON_NAME_LENGTH call CopyBytes .loop - ld hl, PartyMon1Moves + ld hl, wPartyMon1Moves ld bc, PARTYMON_STRUCT_LENGTH - ld a, [CurPartyMon] + ld a, [wCurPartyMon] call AddNTimes ld d, h ld e, l @@ -42,12 +42,12 @@ LearnMove: ; 6508 ld a, [wBattleMode] and a jr z, .not_disabled - ld a, [DisabledMove] + ld a, [wDisabledMove] cp b jr nz, .not_disabled xor a - ld [DisabledMove], a - ld [PlayerDisableCount], a + ld [wDisabledMove], a + ld [wPlayerDisableCount], a .not_disabled call GetMoveName @@ -79,24 +79,24 @@ LearnMove: ; 6508 and a jp z, .learned - ld a, [CurPartyMon] + ld a, [wCurPartyMon] ld b, a - ld a, [CurBattleMon] + ld a, [wCurBattleMon] cp b jp nz, .learned - ld a, [PlayerSubStatus5] + ld a, [wPlayerSubStatus5] bit SUBSTATUS_TRANSFORMED, a jp nz, .learned ld h, d ld l, e - ld de, BattleMonMoves + ld de, wBattleMonMoves ld bc, NUM_MOVES call CopyBytes - ld bc, PartyMon1PP - (PartyMon1Moves + NUM_MOVES) + ld bc, wPartyMon1PP - (wPartyMon1Moves + NUM_MOVES) add hl, bc - ld de, BattleMonPP + ld de, wBattleMonPP ld bc, NUM_MOVES call CopyBytes jp .learned @@ -143,7 +143,7 @@ ForgetMove: ; 65d3 call TextBox hlcoord 5 + 2, 2 + 2 ld a, SCREEN_WIDTH * 2 - ld [Buffer1], a + ld [wBuffer1], a predef ListMoves ; wMenuData3 ld a, $4 |