pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity

Identify a few more WRAM label uses

Browse Source
This commit is contained in:
Rangi 2019-04-19 18:55:04 -04:00
parent 45e3f6aca9
commit 71db95dc34
4 changed files with 28 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engine/gfx/sprite_anims.asm
View File

@ -747,7 +747,7 @@ DoAnimFrame:
ret
.IntroSuicune
ld a, [wcf65]
ld a, [wIntroSceneTimer]
and a
jr nz, .asm_8d645
ret

4
engine/pokemon/bills_pc.asm
View File

@ -776,8 +776,8 @@ BillsPC_InitRAM:
call ClearSprites
call ClearTileMap
call BillsPC_InitGFX
ld hl, wBillsPCPokemonList
ld bc, $338
ld hl, wBillsPCData
ld bc, wBillsPCDataEnd - wBillsPCData
xor a
call ByteFill
xor a

6
engine/pokemon/mon_menu.asm
View File

@ -247,12 +247,12 @@ GiveTakePartyMonItem:
.loop
farcall DepositSellPack
ld a, [wcf66]
ld a, [wPackUsedItem]
and a
jr z, .quit
ld a, [wcf65]
cp 2
ld a, [wCurPocket]
cp KEY_ITEM_POCKET
jr z, .next
call CheckTossableItem

40
wram.asm
View File

@ -964,9 +964,23 @@ wGameboyPrinterRAMEnd::
NEXTU ; c800
; bill's pc data
wBillsPCData::
wBillsPCPokemonList::
; (species, box number, list index) x30
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
; Hall of Fame data
@ -980,9 +994,9 @@ wLinkDataEnd::
NEXTU ; c800
; link data members
wLinkPlayerName:: ds NAME_LENGTH
wLinkPartyCount:: db
wLinkPartyCount:: db
wLinkPartySpecies:: ds PARTY_LENGTH
wLinkPartyEnd:: db ; older code doesn't check PartyCount
wLinkPartyEnd:: db ; older code doesn't check PartyCount
UNION ; c813
; time capsule party data
@ -1095,22 +1109,12 @@ wca02:: db
NEXTU ; ca00
; link data
ds 191
wcabf:: ds 79
wcabf:: ds 1
ENDU ; cb00
ds 14
wcb0e:: ds 5
wcb13:: ds 23
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
wcb13:: ds 50
wcb45:: ds 20
wcb59:: ds 20
wcb6d:: ds 1
@ -1119,8 +1123,8 @@ wcb84:: ds 100
wcbe8:: dw
wLinkOTPartyMonTypes:: ds 2 * PARTY_LENGTH
ds 84
wcc4a:: ds 22
wcc60:: ds 1
wcc61:: ds 1
wcc62:: ds 2