Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/TheMostCuriousThing/pokecrystal (resolve PR #460)

Browse Source 
# Conflicts:
#	engine/battle/core.asm
#	engine/save.asm
This commit is contained in:
Remy Oukaour
2018-01-14 23:00:22 -05:00
parent 5c28d05bb4 6c5cd7a963
commit dfcca93b45
54 changed files with 298 additions and 324 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
engine/link.asm
View File

@@ -811,31 +811,24 @@ Link_PrepPartyData_Gen2: ; 28595
inc de
dec b
jr nz, .loop1
; de = $c806
ld hl, PlayerName
ld bc, NAME_LENGTH
call CopyBytes
; de = $c811
ld hl, PartyCount
ld bc, 1 + PARTY_LENGTH + 1
call CopyBytes
; de = $c819
ld hl, PlayerID
ld bc, 2
call CopyBytes
; de = $c81b
ld hl, PartyMon1Species
ld bc, PARTY_LENGTH * PARTYMON_STRUCT_LENGTH
call CopyBytes
; de = $c93b
ld hl, PartyMonOT
ld bc, PARTY_LENGTH * NAME_LENGTH
call CopyBytes
; de = $c97d
ld hl, PartyMonNicknames
ld bc, PARTY_LENGTH * PKMN_NAME_LENGTH
call CopyBytes
; de = $c9bf
; Okay, we did all that. Now, are we in the trade center?
ld a, [wLinkMode]