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

Consistent labels for each nickname in RAM

Browse Source
This commit is contained in:
Rangi
2021-03-17 16:16:02 -04:00
parent 6c8f8609cb
commit 4522162d45
57 changed files with 382 additions and 303 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
engine/pokemon/bills_pc.asm
View File

@@ -1709,7 +1709,7 @@ BillsPC_CopyMon:
call CopySpeciesToTemp
ld hl, sBoxMonNicknames
call CopyNicknameToTemp
ld hl, sBoxMonOT
ld hl, sBoxMonOTs
call CopyOTNameToTemp
ld hl, sBoxMons
ld bc, BOXMON_STRUCT_LENGTH
@@ -1727,7 +1727,7 @@ BillsPC_CopyMon:
call CopySpeciesToTemp
ld hl, wPartyMonNicknames
call CopyNicknameToTemp
ld hl, wPartyMonOT
ld hl, wPartyMonOTs
call CopyOTNameToTemp
ld hl, wPartyMon1
ld bc, PARTYMON_STRUCT_LENGTH
@@ -1753,7 +1753,7 @@ BillsPC_CopyMon:
call CopyNicknameToTemp
pop hl
push hl
ld bc, sBoxMonOT - sBox
ld bc, sBoxMonOTs - sBox
add hl, bc
call CopyOTNameToTemp
pop hl
@@ -1772,7 +1772,7 @@ DepositPokemon:
ld [wCurPartyMon], a
ld hl, wPartyMonNicknames
ld a, [wCurPartyMon]
call GetNick
call GetNickname
ld a, PC_DEPOSIT
ld [wPokemonWithdrawDepositParameter], a
predef SendGetMonIntoFromBox
@@ -1826,7 +1826,7 @@ TryWithdrawPokemon:
call OpenSRAM
ld a, [wCurPartyMon]
ld hl, sBoxMonNicknames
call GetNick
call GetNickname
call CloseSRAM
xor a
ld [wPokemonWithdrawDepositParameter], a
@@ -2051,7 +2051,7 @@ MovePKMNWitoutMail_InsertMon:
call CopySpeciesToTemp
ld hl, sBoxMonNicknames
call CopyNicknameToTemp
ld hl, sBoxMonOT
ld hl, sBoxMonOTs
call CopyOTNameToTemp
ld hl, sBoxMons
ld bc, BOXMON_STRUCT_LENGTH
@@ -2084,7 +2084,7 @@ MovePKMNWitoutMail_InsertMon:
call CopySpeciesToTemp
ld hl, wPartyMonNicknames
call CopyNicknameToTemp
ld hl, wPartyMonOT
ld hl, wPartyMonOTs
call CopyOTNameToTemp
ld hl, wPartyMon1Species
ld bc, PARTYMON_STRUCT_LENGTH
@@ -2115,7 +2115,7 @@ CopyNicknameToTemp:
ld bc, MON_NAME_LENGTH
ld a, [wCurPartyMon]
call AddNTimes
ld de, wBufferMonNick
ld de, wBufferMonNickname
ld bc, MON_NAME_LENGTH
call CopyBytes
ret