mirror of
https://gitlab.com/xCrystal/pokecrystal-board.git
synced 2024-11-16 11:27:33 -08:00
Identify a few more WRAM label uses
This commit is contained in:
parent
45e3f6aca9
commit
71db95dc34
@ -747,7 +747,7 @@ DoAnimFrame:
|
|||||||
ret
|
ret
|
||||||
|
|
||||||
.IntroSuicune
|
.IntroSuicune
|
||||||
ld a, [wcf65]
|
ld a, [wIntroSceneTimer]
|
||||||
and a
|
and a
|
||||||
jr nz, .asm_8d645
|
jr nz, .asm_8d645
|
||||||
ret
|
ret
|
||||||
|
@ -776,8 +776,8 @@ BillsPC_InitRAM:
|
|||||||
call ClearSprites
|
call ClearSprites
|
||||||
call ClearTileMap
|
call ClearTileMap
|
||||||
call BillsPC_InitGFX
|
call BillsPC_InitGFX
|
||||||
ld hl, wBillsPCPokemonList
|
ld hl, wBillsPCData
|
||||||
ld bc, $338
|
ld bc, wBillsPCDataEnd - wBillsPCData
|
||||||
xor a
|
xor a
|
||||||
call ByteFill
|
call ByteFill
|
||||||
xor a
|
xor a
|
||||||
|
@ -247,12 +247,12 @@ GiveTakePartyMonItem:
|
|||||||
.loop
|
.loop
|
||||||
farcall DepositSellPack
|
farcall DepositSellPack
|
||||||
|
|
||||||
ld a, [wcf66]
|
ld a, [wPackUsedItem]
|
||||||
and a
|
and a
|
||||||
jr z, .quit
|
jr z, .quit
|
||||||
|
|
||||||
ld a, [wcf65]
|
ld a, [wCurPocket]
|
||||||
cp 2
|
cp KEY_ITEM_POCKET
|
||||||
jr z, .next
|
jr z, .next
|
||||||
|
|
||||||
call CheckTossableItem
|
call CheckTossableItem
|
||||||
|
36
wram.asm
36
wram.asm
@ -964,9 +964,23 @@ wGameboyPrinterRAMEnd::
|
|||||||
|
|
||||||
NEXTU ; c800
|
NEXTU ; c800
|
||||||
; bill's pc data
|
; bill's pc data
|
||||||
|
wBillsPCData::
|
||||||
wBillsPCPokemonList::
|
wBillsPCPokemonList::
|
||||||
; (species, box number, list index) x30
|
; (species, box number, list index) x30
|
||||||
ds 3 * 30
|
ds 3 * 30
|
||||||
|
ds 720
|
||||||
|
wBillsPC_ScrollPosition:: db
|
||||||
|
wBillsPC_CursorPosition:: db
|
||||||
|
wBillsPC_NumMonsInBox:: db
|
||||||
|
wBillsPC_NumMonsOnScreen:: db
|
||||||
|
wBillsPC_LoadedBox:: db ; 0 if party, 1 - 14 if box, 15 if active box
|
||||||
|
wBillsPC_BackupScrollPosition:: db
|
||||||
|
wBillsPC_BackupCursorPosition:: db
|
||||||
|
wBillsPC_BackupLoadedBox:: db
|
||||||
|
wBillsPC_MonHasMail:: db
|
||||||
|
ds 5
|
||||||
|
wBillsPCDataEnd::
|
||||||
|
|
||||||
|
|
||||||
NEXTU ; c800
|
NEXTU ; c800
|
||||||
; Hall of Fame data
|
; Hall of Fame data
|
||||||
@ -1095,22 +1109,12 @@ wca02:: db
|
|||||||
NEXTU ; ca00
|
NEXTU ; ca00
|
||||||
; link data
|
; link data
|
||||||
ds 191
|
ds 191
|
||||||
wcabf:: ds 79
|
wcabf:: ds 1
|
||||||
|
ENDU ; cb00
|
||||||
|
|
||||||
|
ds 14
|
||||||
wcb0e:: ds 5
|
wcb0e:: ds 5
|
||||||
wcb13:: ds 23
|
wcb13:: ds 50
|
||||||
ENDU ; cb2a
|
|
||||||
|
|
||||||
wBillsPC_ScrollPosition:: db
|
|
||||||
wBillsPC_CursorPosition:: db
|
|
||||||
wBillsPC_NumMonsInBox:: db
|
|
||||||
wBillsPC_NumMonsOnScreen:: db
|
|
||||||
wBillsPC_LoadedBox:: db ; 0 if party, 1 - 14 if box, 15 if active box
|
|
||||||
wBillsPC_BackupScrollPosition:: db
|
|
||||||
wBillsPC_BackupCursorPosition:: db
|
|
||||||
wBillsPC_BackupLoadedBox:: db
|
|
||||||
wBillsPC_MonHasMail:: db
|
|
||||||
ds 18
|
|
||||||
|
|
||||||
wcb45:: ds 20
|
wcb45:: ds 20
|
||||||
wcb59:: ds 20
|
wcb59:: ds 20
|
||||||
wcb6d:: ds 1
|
wcb6d:: ds 1
|
||||||
@ -1119,8 +1123,8 @@ wcb84:: ds 100
|
|||||||
wcbe8:: dw
|
wcbe8:: dw
|
||||||
wLinkOTPartyMonTypes:: ds 2 * PARTY_LENGTH
|
wLinkOTPartyMonTypes:: ds 2 * PARTY_LENGTH
|
||||||
ds 84
|
ds 84
|
||||||
|
|
||||||
wcc4a:: ds 22
|
wcc4a:: ds 22
|
||||||
|
|
||||||
wcc60:: ds 1
|
wcc60:: ds 1
|
||||||
wcc61:: ds 1
|
wcc61:: ds 1
|
||||||
wcc62:: ds 2
|
wcc62:: ds 2
|
||||||
|
Loading…
Reference in New Issue
Block a user