diff options
| author | luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com> | 2018-01-23 17:39:09 -0500 |
|---|---|---|
| committer | luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com> | 2018-01-23 17:39:09 -0500 |
| commit | a1951cefc09035e11077a433b28ec8c66b3b03db (patch) | |
| tree | 4de98db5a6edb6d74192028d50893da2b764421f /engine/move_mon_wo_mail.asm | |
| parent | 79bd48f85c7dd1868264e290b12dad17a6e25b95 (diff) | |
Prefix wram labels with w, part 2.
Diffstat (limited to 'engine/move_mon_wo_mail.asm')
| -rwxr-xr-x | engine/move_mon_wo_mail.asm | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/engine/move_mon_wo_mail.asm b/engine/move_mon_wo_mail.asm index e5e1d6e49..5d81da8a0 100755 --- a/engine/move_mon_wo_mail.asm +++ b/engine/move_mon_wo_mail.asm @@ -25,39 +25,39 @@ InsertPokemonIntoBox: ; 51322 ld de, wBufferMon call InsertDataIntoBoxOrParty ld hl, wBufferMonMoves - ld de, TempMonMoves + ld de, wTempMonMoves ld bc, NUM_MOVES call CopyBytes ld hl, wBufferMonPP - ld de, TempMonPP + ld de, wTempMonPP ld bc, NUM_MOVES call CopyBytes - ld a, [CurPartyMon] + ld a, [wCurPartyMon] ld b, a farcall RestorePPofDepositedPokemon jp CloseSRAM InsertPokemonIntoParty: ; 5138b - ld hl, PartyCount + ld hl, wPartyCount call InsertSpeciesIntoBoxOrParty - ld a, [PartyCount] + ld a, [wPartyCount] dec a ld [wd265], a - ld hl, PartyMonNicknames + ld hl, wPartyMonNicknames ld bc, MON_NAME_LENGTH ld de, wBufferMonNick call InsertDataIntoBoxOrParty - ld a, [PartyCount] + ld a, [wPartyCount] dec a ld [wd265], a - ld hl, PartyMonOT + ld hl, wPartyMonOT ld bc, NAME_LENGTH ld de, wBufferMonOT call InsertDataIntoBoxOrParty - ld a, [PartyCount] + ld a, [wPartyCount] dec a ld [wd265], a - ld hl, PartyMons + ld hl, wPartyMons ld bc, PARTYMON_STRUCT_LENGTH ld de, wBufferMon call InsertDataIntoBoxOrParty @@ -66,11 +66,11 @@ InsertPokemonIntoParty: ; 5138b InsertSpeciesIntoBoxOrParty: ; 513cb inc [hl] inc hl - ld a, [CurPartyMon] + ld a, [wCurPartyMon] ld c, a ld b, 0 add hl, bc - ld a, [CurPartySpecies] + ld a, [wCurPartySpecies] ld c, a .loop ld a, [hl] @@ -97,7 +97,7 @@ InsertDataIntoBoxOrParty: ; 513e0 push bc ld a, [wd265] ld b, a - ld a, [CurPartyMon] + ld a, [wCurPartyMon] cp b pop bc jr z, .insert @@ -124,7 +124,7 @@ InsertDataIntoBoxOrParty: ; 513e0 .insert pop bc pop hl - ld a, [CurPartyMon] + ld a, [wCurPartyMon] call AddNTimes ld d, h ld e, l |