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

Merge pull request #617 from FredrIQ/master

Browse Source 
Fix wram labeling for wPCItems
This commit is contained in:
Rangi 2019-03-30 16:51:30 -04:00 committed by GitHub
commit ec8869584f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engine/events/mom_phone.asm
View File

@ -147,7 +147,7 @@ Mom_GiveItemOrDoll:
ld [wCurItem], a ld [wCurItem], a
ld a, 1 ld a, 1
ld [wItemQuantityChangeBuffer], a ld [wItemQuantityChangeBuffer], a
ld hl, wPCItems ld hl, wNumPCItems
call ReceiveItem call ReceiveItem
ret ret

8
engine/events/pokecenter_pc.asm
View File

@ -354,7 +354,7 @@ PlayerWithdrawItemMenu:
ld [wItemQuantityChangeBuffer], a ld [wItemQuantityChangeBuffer], a
ld a, [wBuffer2] ld a, [wBuffer2]
ld [wCurItemQuantity], a ld [wCurItemQuantity], a
ld hl, wPCItems ld hl, wNumPCItems
call TossItem call TossItem
predef PartyMonItemName predef PartyMonItemName
ld hl, .WithdrewText ld hl, .WithdrewText
@ -390,7 +390,7 @@ PlayerTossItemMenu:
.loop .loop
call PCItemsJoypad call PCItemsJoypad
jr c, .quit jr c, .quit
ld de, wPCItems ld de, wNumPCItems
farcall TossItemFromPC farcall TossItemFromPC
jr .loop jr .loop
@ -509,7 +509,7 @@ PlayerDepositItemMenu:
ld [wBuffer1], a ld [wBuffer1], a
ld a, [wCurItemQuantity] ld a, [wCurItemQuantity]
ld [wBuffer2], a ld [wBuffer2], a
ld hl, wPCItems ld hl, wNumPCItems
call ReceiveItem call ReceiveItem
jr nc, .NoRoomInPC jr nc, .NoRoomInPC
ld a, [wBuffer1] ld a, [wBuffer1]
@ -628,7 +628,7 @@ PCItemsJoypad:
db SCROLLINGMENU_ENABLE_SELECT | SCROLLINGMENU_ENABLE_FUNCTION3 | SCROLLINGMENU_DISPLAY_ARROWS ; flags db SCROLLINGMENU_ENABLE_SELECT | SCROLLINGMENU_ENABLE_FUNCTION3 | SCROLLINGMENU_DISPLAY_ARROWS ; flags
db 4, 8 ; rows/cols? db 4, 8 ; rows/cols?
db 2 ; horizontal spacing? db 2 ; horizontal spacing?
dbw 0, wPCItems dbw 0, wNumPCItems
dba PlaceMenuItemName dba PlaceMenuItemName
dba PlaceMenuItemQuantity dba PlaceMenuItemQuantity
dba UpdateItemDescription dba UpdateItemDescription

4
engine/items/items.asm
View File

@ -145,10 +145,10 @@ GetPocketCapacity:
.not_bag .not_bag
ld c, MAX_PC_ITEMS ld c, MAX_PC_ITEMS
ld a, e ld a, e
cp LOW(wPCItems) cp LOW(wNumPCItems)
jr nz, .not_pc jr nz, .not_pc
ld a, d ld a, d
cp HIGH(wPCItems) cp HIGH(wNumPCItems)
ret z ret z
.not_pc .not_pc

2
engine/menus/intro_menu.asm
View File

@ -151,7 +151,7 @@ _ResetWRAM:
ld hl, wNumBalls ld hl, wNumBalls
call .InitList call .InitList
ld hl, wPCItems ld hl, wNumPCItems
call .InitList call .InitList
xor a xor a

2
mobile/mobile_12_2.asm
View File

@ -158,7 +158,7 @@ MobileCheckOwnMonAnywhere:
UnusedFindItemInPCOrBag: UnusedFindItemInPCOrBag:
ld a, [wScriptVar] ld a, [wScriptVar]
ld [wCurItem], a ld [wCurItem], a
ld hl, wPCItems ld hl, wNumPCItems
call CheckItem call CheckItem
jr c, .found jr c, .found

2
mobile/mobile_5f.asm
View File

@ -2664,7 +2664,7 @@ Function17e165:
pop hl pop hl
jr c, .asm_17e195 jr c, .asm_17e195
push hl push hl
ld hl, wPCItems ld hl, wNumPCItems
call CheckItem call CheckItem
pop hl pop hl
jr c, .asm_17e195 jr c, .asm_17e195

3
wram.asm
View File

@ -2513,11 +2513,10 @@ wNumBalls:: db ; d8d7
wBalls:: ds MAX_BALLS * 2 + 1 ; d8d8 wBalls:: ds MAX_BALLS * 2 + 1 ; d8d8
wBallsEnd:: wBallsEnd::
wNumPCItems:: db
wPCItems:: ds MAX_PC_ITEMS * 2 + 1 ; d8f1 wPCItems:: ds MAX_PC_ITEMS * 2 + 1 ; d8f1
wPCItemsEnd:: wPCItemsEnd::
ds 1
wPokegearFlags:: wPokegearFlags::
; bit 0: map ; bit 0: map
; bit 1: radio ; bit 1: radio