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

12
mobile/mobile_12_2.asm
View File

@@ -9,7 +9,7 @@ MobileCheckOwnMonAnywhere:
ld d, a
ld e, 0
ld hl, wPartyMon1Species
ld bc, wPartyMonOT
ld bc, wPartyMonOTs
.asm_4a851
call .CheckMatch
ret c
@@ -27,7 +27,7 @@ MobileCheckOwnMonAnywhere:
jr z, .asm_4a888
ld d, a
ld hl, sBoxMon1Species
ld bc, sBoxMonOT
ld bc, sBoxMonOTs
.asm_4a873
call .CheckMatch
jr nc, .asm_4a87c
@@ -72,7 +72,7 @@ MobileCheckOwnMonAnywhere:
ld e, l
pop hl
push de
ld de, sBoxMonOT - sBoxCount
ld de, sBoxMonOTs - sBoxCount
add hl, de
ld b, h
ld c, l
@@ -264,7 +264,7 @@ Function4a9c3:
Function4a9d7:
ld a, [wd002]
ld hl, wPartyMonNicknames
call GetNick
call GetNickname
ld h, d
ld l, e
ld de, wMobileParticipant1Nickname
@@ -272,7 +272,7 @@ Function4a9d7:
call CopyBytes
ld a, [wd003]
ld hl, wPartyMonNicknames
call GetNick
call GetNickname
ld h, d
ld l, e
ld de, wMobileParticipant2Nickname
@@ -280,7 +280,7 @@ Function4a9d7:
call CopyBytes
ld a, [wd004]
ld hl, wPartyMonNicknames
call GetNick
call GetNickname
ld h, d
ld l, e
ld de, wMobileParticipant3Nickname

18
mobile/mobile_40.asm
View File

@@ -2388,7 +2388,7 @@ Unknown_100fc0:
dbwww $80, wPartyCount, 1 + PARTY_LENGTH + 1, wOTPartyCount
dbwww $80, wPlayerID, 2, wOTPlayerID
dbwww $80, wPartyMons, PARTYMON_STRUCT_LENGTH * PARTY_LENGTH, wOTPartyMons
dbwww $80, wPartyMonOT, NAME_LENGTH * PARTY_LENGTH, wOTPartyMonOT
dbwww $80, wPartyMonOTs, NAME_LENGTH * PARTY_LENGTH, wOTPartyMonOTs
dbwww $80, wPartyMonNicknames, MON_NAME_LENGTH * PARTY_LENGTH, wOTPartyMonNicknames
db -1
@@ -2411,7 +2411,7 @@ Unknown_10102c:
dbwww $80, wOTPlayerName, NAME_LENGTH, NULL
dbwww $80, wOTPlayerID, 2, NULL
dbwww $80, wOTPartyMonNicknames, MON_NAME_LENGTH * PARTY_LENGTH, NULL
dbwww $80, wOTPartyMonOT, NAME_LENGTH * PARTY_LENGTH, NULL
dbwww $80, wOTPartyMonOTs, NAME_LENGTH * PARTY_LENGTH, NULL
dbwww $80, wOTPartyMons, PARTYMON_STRUCT_LENGTH * PARTY_LENGTH, NULL
db -1
@@ -2454,7 +2454,7 @@ Function10107d:
ld de, wc608 + 13
ld bc, NAME_LENGTH
call .CopyAllFromOT
ld hl, wOTPartyMonOT
ld hl, wOTPartyMonOTs
ld de, wOTClassName + 1
ld bc, NAME_LENGTH
call .CopyAllFromOT
@@ -2510,7 +2510,7 @@ LoadSelectedPartiesForColosseum:
ld de, wPartyMon1Species
call .CopyPartyStruct
ld hl, wPlayerMonSelection
ld de, wPartyMonOT
ld de, wPartyMonOTs
call .CopyName
ld hl, wPlayerMonSelection
ld de, wPartyMonNicknames
@@ -2522,7 +2522,7 @@ LoadSelectedPartiesForColosseum:
ld de, wOTPartyMon1Species
call .CopyPartyStruct
ld hl, wOTMonSelection
ld de, wOTPartyMonOT
ld de, wOTPartyMonOTs
call .CopyName
ld hl, wOTMonSelection
ld de, wOTPartyMonNicknames
@@ -6004,7 +6004,7 @@ Function102a3b:
ld [wPlayerTrademonSpecies], a
ld a, [wcd4c]
dec a
ld hl, wPartyMonOT
ld hl, wPartyMonOTs
call SkipNames
ld de, wPlayerTrademonOTName
ld bc, NAME_LENGTH
@@ -6049,7 +6049,7 @@ Function102a3b:
ld [wOTTrademonSpecies], a
ld a, [wcd4d]
dec a
ld hl, wOTPartyMonOT
ld hl, wOTPartyMonOTs
call SkipNames
ld de, wOTTrademonOTName
ld bc, NAME_LENGTH
@@ -6238,8 +6238,8 @@ Function102c21:
ret
Function102c2e:
ld hl, wPartyMonOT
ld de, wOTPartyMonOT
ld hl, wPartyMonOTs
ld de, wOTPartyMonOTs
ld bc, 11
call Function102c71
ret

16
mobile/mobile_46.asm
View File

@@ -6900,7 +6900,7 @@ Function11b483:
ld [hl], a
pop bc
ld de, NAME_LENGTH
ld hl, wPartyMonOT
ld hl, wPartyMonOTs
pop af
push af
.loop4
@@ -7191,9 +7191,9 @@ Function11b6b4:
ld [wMobileMonStructPointer + 1], a
ld a, LOW($c63d) ; OT
ld [wMobileMonOTNamePointer], a
ld [wMobileMonOTPointer], a
ld a, HIGH($c63d)
ld [wMobileMonOTNamePointer + 1], a
ld [wMobileMonOTPointer + 1], a
ld a, LOW($c642) ; Nickname
ld [wMobileMonNicknamePointer], a
@@ -7493,9 +7493,9 @@ Function11b93b:
ld [wMobileMonStructPointer + 1], a
ld a, LOW($c641)
ld [wMobileMonOTNamePointer], a
ld [wMobileMonOTPointer], a
ld a, HIGH($c641)
ld [wMobileMonOTNamePointer + 1], a
ld [wMobileMonOTPointer + 1], a
ld a, LOW($c646)
ld [wMobileMonNicknamePointer], a
@@ -7553,7 +7553,7 @@ AddMobileMonToParty:
ld bc, PARTYMON_STRUCT_LENGTH
call CopyBytes
ld hl, wPartyMonOT
ld hl, wPartyMonOTs
ld bc, NAME_LENGTH
ld a, [wMobileMonSpecies]
.loop3
@@ -7563,9 +7563,9 @@ AddMobileMonToParty:
jr nz, .loop3
ld e, l
ld d, h
ld a, [wMobileMonOTNamePointer]
ld a, [wMobileMonOTPointer]
ld l, a
ld a, [wMobileMonOTNamePointer + 1]
ld a, [wMobileMonOTPointer + 1]
ld h, a
ld bc, MON_NAME_LENGTH - 1
call CopyBytes

4
mobile/mobile_5f.asm
View File

@@ -2299,7 +2299,7 @@ Function17ded9:
push hl
ld a, [wPartyCount]
dec a
ld hl, wPartyMonOT
ld hl, wPartyMonOTs
call SkipNames
ld d, h
ld e, l
@@ -2486,7 +2486,7 @@ Function17e026:
jr z, .asm_17e08e
push bc
ld bc, $6
ld de, sBoxMonOT
ld de, sBoxMonOTs
call CopyBytes
ld a, [hli]
ld b, a