pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-09-08 08:13:02 -07:00
Code Issues 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

50
engine/pokemon/move_mon.asm
View File

@@ -34,11 +34,11 @@ TryAddMonToParty:
ld a, -1
ld [de], a
; Now let's load the OT name.
ld hl, wPartyMonOT
ld hl, wPartyMonOTs
ld a, [wMonType]
and $f
jr z, .loadOTname
ld hl, wOTPartyMonOT
ld hl, wOTPartyMonOTs
.loadOTname
ldh a, [hMoveMon] ; Restore index from backup
@@ -419,13 +419,13 @@ AddTempmonToParty:
ld hl, wTempMonSpecies
call CopyBytes
ld hl, wPartyMonOT
ld hl, wPartyMonOTs
ld a, [wPartyCount]
dec a
call SkipNames
ld d, h
ld e, l
ld hl, wOTPartyMonOT
ld hl, wOTPartyMonOTs
ld a, [wCurPartyMon]
call SkipNames
ld bc, NAME_LENGTH
@@ -565,10 +565,10 @@ SendGetMonIntoFromBox:
ld de, wBreedMon1OT
jr z, .okay5
dec a
ld hl, wPartyMonOT
ld hl, wPartyMonOTs
ld a, [wPartyCount]
jr nz, .okay6
ld hl, sBoxMonOT
ld hl, sBoxMonOTs
ld a, [sBoxCount]
.okay6
@@ -578,14 +578,14 @@ SendGetMonIntoFromBox:
ld e, l
.okay5
ld hl, sBoxMonOT
ld hl, sBoxMonOTs
ld a, [wPokemonWithdrawDepositParameter]
and a
jr z, .okay7
ld hl, wBreedMon1OT
cp DAY_CARE_WITHDRAW
jr z, .okay8
ld hl, wPartyMonOT
ld hl, wPartyMonOTs
.okay7
ld a, [wCurPartyMon]
@@ -596,7 +596,7 @@ SendGetMonIntoFromBox:
call CopyBytes
ld a, [wPokemonWithdrawDepositParameter]
cp DAY_CARE_DEPOSIT
ld de, wBreedMon1Nick
ld de, wBreedMon1Nickname
jr z, .okay9
dec a
ld hl, wPartyMonNicknames
@@ -616,7 +616,7 @@ SendGetMonIntoFromBox:
ld a, [wPokemonWithdrawDepositParameter]
and a
jr z, .okay11
ld hl, wBreedMon1Nick
ld hl, wBreedMon1Nickname
cp DAY_CARE_WITHDRAW
jr z, .okay12
ld hl, wPartyMonNicknames
@@ -819,10 +819,10 @@ RetrieveBreedmon:
ld a, [wPokemonWithdrawDepositParameter]
and a
ld a, [wBreedMon1Species]
ld de, wBreedMon1Nick
ld de, wBreedMon1Nickname
jr z, .okay
ld a, [wBreedMon2Species]
ld de, wBreedMon2Nick
ld de, wBreedMon2Nickname
.okay
ld [hli], a
@@ -839,7 +839,7 @@ RetrieveBreedmon:
pop de
call CopyBytes
push hl
ld hl, wPartyMonOT
ld hl, wPartyMonOTs
ld a, [wPartyCount]
dec a
call SkipNames
@@ -909,14 +909,14 @@ GetLastPartyMon:
ret
DepositMonWithDayCareMan:
ld de, wBreedMon1Nick
ld de, wBreedMon1Nickname
call DepositBreedmon
xor a ; REMOVE_PARTY
ld [wPokemonWithdrawDepositParameter], a
jp RemoveMonFromPartyOrBox
DepositMonWithDayCareLady:
ld de, wBreedMon2Nick
ld de, wBreedMon2Nickname
call DepositBreedmon
xor a ; REMOVE_PARTY
ld [wPokemonWithdrawDepositParameter], a
@@ -928,7 +928,7 @@ DepositBreedmon:
call SkipNames
call CopyBytes
ld a, [wCurPartyMon]
ld hl, wPartyMonOT
ld hl, wPartyMonOTs
call SkipNames
call CopyBytes
ld a, [wCurPartyMon]
@@ -967,7 +967,7 @@ SendMonIntoBox:
call ShiftBoxMon
ld hl, wPlayerName
ld de, sBoxMonOT
ld de, sBoxMonOTs
ld bc, NAME_LENGTH
call CopyBytes
@@ -1071,7 +1071,7 @@ SendMonIntoBox:
ret
ShiftBoxMon:
ld hl, sBoxMonOT
ld hl, sBoxMonOTs
ld bc, NAME_LENGTH
call .shift
@@ -1246,12 +1246,12 @@ RemoveMonFromPartyOrBox:
ld [hli], a
inc a
jr nz, .loop
ld hl, wPartyMonOT
ld hl, wPartyMonOTs
ld d, PARTY_LENGTH - 1
ld a, [wPokemonWithdrawDepositParameter]
and a
jr z, .party
ld hl, sBoxMonOT
ld hl, sBoxMonOTs
ld d, MONS_PER_BOX - 1
.party
@@ -1296,13 +1296,13 @@ RemoveMonFromPartyOrBox:
jr z, .party5
ld bc, BOXMON_STRUCT_LENGTH
add hl, bc
ld bc, sBoxMonOT
ld bc, sBoxMonOTs
jr .copy
.party5
ld bc, PARTYMON_STRUCT_LENGTH
add hl, bc
ld bc, wPartyMonOT
ld bc, wPartyMonOTs
.copy
call CopyDataUntil
; Shift the nicknames
@@ -1705,7 +1705,7 @@ GivePoke::
push hl
ld a, [wCurPartyMon]
ld hl, wPartyMonOT
ld hl, wPartyMonOTs
call SkipNames
ld d, h
ld e, l
@@ -1734,9 +1734,9 @@ GivePoke::
jr .skip_nickname
.send_to_box
ld a, BANK(sBoxMonOT)
ld a, BANK(sBoxMonOTs)
call OpenSRAM
ld de, sBoxMonOT
ld de, sBoxMonOTs
.loop
ld a, [wScriptBank]
call GetFarByte