pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-09-09 09:51:34 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bill's PC

Browse Source
This commit is contained in:
PikalaxALT 2015-12-16 12:32:08 -05:00
parent 77ef8404a1
commit 879b430fce
6 changed files with 724 additions and 764 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1397
engine/billspc.asm
View File

File diff suppressed because it is too large Load Diff

14
engine/menu.asm
View File

@ -706,12 +706,12 @@ _ExitMenu:: ; 243e8
call PopWindow
ld a, [wMenuFlags]
bit 0, a
jr z, .next
jr z, .loop
ld d, h
ld e, l
call RestoreTileBackup
.next
.loop
call GetWindowStackTop
ld a, h
or l
@ -727,6 +727,7 @@ _ExitMenu:: ; 243e8
; 24423
Function24423: ; 24423
; Unreferenced
ld a, [VramState]
bit 0, a
ret z
@ -743,19 +744,18 @@ Function24423: ; 24423
ld hl, sScratch
decoord 0, 0
ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
.asm_2444c
.loop
ld a, [hl]
cp $61
jr c, .asm_24452
jr c, .next
ld [de], a
.asm_24452
.next
inc hl
inc de
dec bc
ld a, c
or b
jr nz, .asm_2444c
jr nz, .loop
call CloseSRAM
ret
; 2445d

8
engine/stats_screen.asm
View File

@ -220,10 +220,10 @@ Function4ddf2: ; 4ddf2 (13:5df2)
ld a, [MonType]
cp BREEDMON
jr nz, .asm_4de10
ld a, [wd018_Mon]
ld a, [wBufferMon]
ld [CurSpecies], a
call GetBaseData
ld hl, wd018_Mon
ld hl, wBufferMon
ld de, TempMon
ld bc, PARTYMON_STRUCT_LENGTH
call CopyBytes
@ -236,7 +236,7 @@ Function4ddf2: ; 4ddf2 (13:5df2)
ld a, [MonType]
cp BOXMON
jr c, .asm_4de2a
callba Function50890
callba CalcTempmonStats
.asm_4de2a
and a
ret
@ -249,7 +249,7 @@ Function4de2c: ; 4de2c (13:5e2c)
push hl
push de
push bc
callba Functione2f95
callba StatsScreenDPad
pop bc
pop de
pop hl

2
home/menu.asm
View File

@ -15,7 +15,7 @@ CopyMenuDataHeader::
ret
; 0x1d4b
Function1d4b:: ; 1d4b
StoreTo_wMenuCursorBuffer:: ; 1d4b
ld [wMenuCursorBuffer], a
ret
; 1d4f

33
main.asm
View File

@ -12314,11 +12314,11 @@ CheckPartyFullAfterContest: ; 4d9e5
xor a
ld [CurPartyMon], a
ld hl, wContestMon
ld de, wd018_Mon
ld de, wBufferMon
ld bc, BOXMON_STRUCT_LENGTH
call CopyBytes
ld hl, PlayerName
ld de, wd00d_MonOT
ld de, wBufferMonOT
ld bc, NAME_LENGTH
call CopyBytes
callab Function51322
@ -13013,17 +13013,14 @@ CopyPkmnToTempMon: ; 5084a
ret
; 5088b
Function5088b: ; 5088b
ld bc, wd018_Mon
jr Function50893
CalcwBufferMonStats: ; 5088b
ld bc, wBufferMon
jr _TempMonStatsCalculation
; 50890
Function50890: ; 50890
CalcTempmonStats: ; 50890
ld bc, TempMon
; fallthrough
; 50893
Function50893: ; 50893
_TempMonStatsCalculation: ; 50893
ld hl, MON_LEVEL
add hl, bc
ld a, [hl]
@ -13044,14 +13041,14 @@ Function50893: ; 50893
ld e, l
ld a, [CurPartySpecies]
cp EGG
jr nz, .asm_508c1
jr nz, .not_egg
xor a
ld [de], a
inc de
ld [de], a
jr .asm_508cd
jr .zero_status
.asm_508c1
.not_egg
push bc
ld hl, MON_MAXHP
add hl, bc
@ -13059,7 +13056,7 @@ Function50893: ; 50893
call CopyBytes
pop bc
.asm_508cd
.zero_status
ld hl, MON_STATUS
add hl, bc
xor a
@ -14631,13 +14628,13 @@ Function51322: ; 51322
ld [wd265], a
ld hl, sBoxMons
ld bc, BOXMON_STRUCT_LENGTH
ld de, wd018_Mon
ld de, wBufferMon
call Function513e0
ld hl, wd018_MonMoves
ld hl, wBufferMonMoves
ld de, TempMonMoves
ld bc, NUM_MOVES
call CopyBytes
ld hl, wd018_MonPP
ld hl, wBufferMonPP
ld de, TempMonPP
ld bc, NUM_MOVES
call CopyBytes
@ -14669,7 +14666,7 @@ Function5138b: ; 5138b
ld [wd265], a
ld hl, PartyMons
ld bc, PARTYMON_STRUCT_LENGTH
ld de, wd018_Mon
ld de, wBufferMon
call Function513e0
ret
; 513cb

34
wram.asm
View File

@ -1129,6 +1129,9 @@ OverworldMap:: ; c800
OverworldMapEnd::
ds OverworldMap - @
wBillsPCPokemonList::
; Pokemon, box number, list index
wMysteryGiftPartyTemp:: ; ds PARTY_LENGTH * (1 + 1 + NUM_MOVES)
wMysteryGiftStaging::
@ -1256,15 +1259,16 @@ wcb08:: ds 6
wcb0e:: ds 5
wcb13:: ds 9
wcb1c:: ds 14
wcb2a:: ds 1
wcb2b:: ds 1
wcb2c:: ds 1
wcb2d:: ds 1
wcb2e:: ds 1
wcb2f:: ds 1
wcb30:: ds 1
wcb31:: ds 1
wcb32:: ds 19
wBillsPC_ScrollPosition:: ds 1
wBillsPC_CursorPosition:: ds 1
wBillsPC_NumMonsInBox:: ds 1
wBillsPC_NumMonsOnScreen:: ds 1
wBillsPC_LoadedBox:: ds 1 ; 0 if party, 1 - 14 if box, 15 if active box
wBillsPC_BackupScrollPosition:: ds 1
wBillsPC_BackupCursorPosition:: ds 1
wBillsPC_BackupLoadedBox:: ds 1
wBillsPC_MonHasMail:: ds 1
ds 18
wcb45:: ds 20
wcb59:: ds 20
wcb6d:: ds 1
@ -1663,6 +1667,7 @@ wd000:: ds 1
DefaultSpawnpoint::
wd001:: ds 1
; d002
wTempMail:: mailmsg wTempMail
ds wTempMail - @
@ -1678,7 +1683,13 @@ wSeerCaughtData:: ds 1
wSeerCaughtGender:: ds 1
ds wSeerAction - @
wBufferMonNick:: ds PKMN_NAME_LENGTH
wBufferMonOT:: ds NAME_LENGTH
wBufferMon:: party_struct wBufferMon
ds wBufferMonNick - @
wd002::
PhoneScriptBank::
LuckyNumberDigit1Buffer::
wCurrentRadioLine::
@ -1754,11 +1765,6 @@ wd016:: ds 1
wMartItem8BCD::
wd017:: ds 1
ds wd00d - @
wd00d_MonOT:: ds NAME_LENGTH
wd018_Mon:: party_struct wd018_Mon
ds wd018_Mon - @
wd018:: ds 1
wd019:: ds 1
wMartItem9BCD::