Identify the remaining (non-mobile) uses of another WRAM union

This commit is contained in:
Rangi
2020-10-29 14:45:40 -04:00
parent ea426a8879
commit bcc0d633e9
21 changed files with 259 additions and 199 deletions

View File

@@ -1377,20 +1377,20 @@ copy_box_data: MACRO
jr z, .done\@
and a
jr z, .done\@
ld [de], a
ld [de], a ; species
inc de
ld a, [wBillsPC_LoadedBox]
ld [de], a
ld [de], a ; box number
inc de
ld a, [wd003]
ld [de], a
ld a, [wBillsPCTempListIndex]
ld [de], a ; list index
inc a
ld [wd003], a
ld [wBillsPCTempListIndex], a
inc de
inc hl
ld a, [wd004]
ld a, [wBillsPCTempBoxCount]
inc a
ld [wd004], a
ld [wBillsPCTempBoxCount], a
jr .loop\@
.done\@
@@ -1399,7 +1399,7 @@ if \1
endc
ld a, -1
ld [de], a
ld a, [wd004]
ld a, [wBillsPCTempBoxCount]
inc a
ld [wBillsPC_NumMonsInBox], a
ENDM
@@ -1411,8 +1411,8 @@ CopyBoxmonSpecies:
call ByteFill
ld de, wBillsPCPokemonList
xor a
ld [wd003], a
ld [wd004], a
ld [wBillsPCTempListIndex], a
ld [wBillsPCTempBoxCount], a
ld a, [wBillsPC_LoadedBox]
and a
jr z, .party
@@ -2455,7 +2455,7 @@ BillsPC_ChangeBoxSubmenu:
.Name:
ld b, NAME_BOX
ld de, wd002
ld de, wBoxNameBuffer
farcall NamingScreen
call ClearTilemap
call LoadStandardFont
@@ -2465,13 +2465,13 @@ BillsPC_ChangeBoxSubmenu:
call GetBoxName
ld e, l
ld d, h
ld hl, wd002
ld hl, wBoxNameBuffer
ld c, BOX_NAME_LENGTH - 1
call InitString
ld a, [wMenuSelection]
dec a
call GetBoxName
ld de, wd002
ld de, wBoxNameBuffer
call CopyName2
ret

View File

@@ -512,7 +512,7 @@ FillMoves:
ld a, [wEvolutionOldSpecies]
and a
jr z, .CheckMove
ld a, [wd002]
ld a, [wPrevPartyLevel]
cp b
jr nc, .GetMove

View File

@@ -206,7 +206,7 @@ GivePokeMail::
call AddNTimes
ld d, h
ld e, l
ld hl, wd002
ld hl, wMonMailMessageBuffer
ld bc, MAIL_MSG_LENGTH + 1
ld a, BANK(sPartyMail)
call OpenSRAM

View File

@@ -780,7 +780,7 @@ RetrieveMonFromDayCareMan:
call WaitSFX
call GetBreedMon1LevelGrowth
ld a, b
ld [wd002], a
ld [wPrevPartyLevel], a
ld a, e
ld [wCurPartyLevel], a
xor a
@@ -795,12 +795,12 @@ RetrieveMonFromDayCareLady:
call WaitSFX
call GetBreedMon2LevelGrowth
ld a, b
ld [wd002], a
ld [wPrevPartyLevel], a
ld a, e
ld [wCurPartyLevel], a
ld a, PC_DEPOSIT
ld [wPokemonWithdrawDepositParameter], a
jp RetrieveBreedmon
jp RetrieveBreedmon ; pointless
RetrieveBreedmon:
ld hl, wPartyCount

View File

@@ -65,7 +65,7 @@ _SwitchPartyMons:
ld bc, PARTYMON_STRUCT_LENGTH
call AddNTimes
push hl
ld de, wd002
ld de, wSwitchMonBuffer
ld bc, PARTYMON_STRUCT_LENGTH
call CopyBytes
ld a, [wBuffer3]
@@ -77,14 +77,14 @@ _SwitchPartyMons:
ld bc, PARTYMON_STRUCT_LENGTH
call CopyBytes
pop de
ld hl, wd002
ld hl, wSwitchMonBuffer
ld bc, PARTYMON_STRUCT_LENGTH
call CopyBytes
ld a, [wBuffer2]
ld hl, wPartyMonOT
call SkipNames
push hl
call .CopyNameTowd002
call .CopyNameToSwitchMonBuffer
ld a, [wBuffer3]
ld hl, wPartyMonOT
call SkipNames
@@ -92,13 +92,13 @@ _SwitchPartyMons:
push hl
call .CopyName
pop de
ld hl, wd002
ld hl, wSwitchMonBuffer
call .CopyName
ld hl, wPartyMonNicknames
ld a, [wBuffer2]
call SkipNames
push hl
call .CopyNameTowd002
call .CopyNameToSwitchMonBuffer
ld hl, wPartyMonNicknames
ld a, [wBuffer3]
call SkipNames
@@ -106,14 +106,14 @@ _SwitchPartyMons:
push hl
call .CopyName
pop de
ld hl, wd002
ld hl, wSwitchMonBuffer
call .CopyName
ld hl, sPartyMail
ld a, [wBuffer2]
ld bc, MAIL_STRUCT_LENGTH
call AddNTimes
push hl
ld de, wd002
ld de, wSwitchMonBuffer
ld bc, MAIL_STRUCT_LENGTH
ld a, BANK(sPartyMail)
call OpenSRAM
@@ -127,7 +127,7 @@ _SwitchPartyMons:
ld bc, MAIL_STRUCT_LENGTH
call CopyBytes
pop de
ld hl, wd002
ld hl, wSwitchMonBuffer
ld bc, MAIL_STRUCT_LENGTH
call CopyBytes
call CloseSRAM
@@ -136,8 +136,8 @@ _SwitchPartyMons:
pop hl
ret
.CopyNameTowd002:
ld de, wd002
.CopyNameToSwitchMonBuffer:
ld de, wSwitchMonBuffer
.CopyName:
ld bc, NAME_LENGTH