mirror of
https://gitlab.com/xCrystal/pokecrystal-board.git
synced 2024-09-09 09:51:34 -07:00
renamed labels and added comments
This commit is contained in:
parent
91ccb09379
commit
172a1488de
@ -39,7 +39,7 @@ PredefPointers:: ; 856b
|
|||||||
add_predef Functiond88c
|
add_predef Functiond88c
|
||||||
add_predef Functionda96
|
add_predef Functionda96
|
||||||
add_predef Functiondb3f ; $8
|
add_predef Functiondb3f ; $8
|
||||||
add_predef Functionde6e
|
add_predef SentPkmnIntoBox
|
||||||
add_predef GiveEgg
|
add_predef GiveEgg
|
||||||
add_predef Functionc6e0
|
add_predef Functionc6e0
|
||||||
add_predef Functione167
|
add_predef Functione167
|
||||||
|
@ -618,7 +618,7 @@ endr
|
|||||||
.asm_eb3c
|
.asm_eb3c
|
||||||
call ClearSprites
|
call ClearSprites
|
||||||
|
|
||||||
predef Functionde6e
|
predef SentPkmnIntoBox
|
||||||
|
|
||||||
callba Function4db83
|
callba Function4db83
|
||||||
|
|
||||||
|
18
main.asm
18
main.asm
@ -8799,10 +8799,11 @@ Functionde44: ; de44
|
|||||||
call AddNTimes
|
call AddNTimes
|
||||||
ld bc, sBoxMon1End - sBoxMon1
|
ld bc, sBoxMon1End - sBoxMon1
|
||||||
jp CopyBytes
|
jp CopyBytes
|
||||||
; de6e
|
|
||||||
|
|
||||||
|
|
||||||
Functionde6e: ; de6e
|
SentPkmnIntoBox: ; de6e
|
||||||
|
; Sents the Pkmn into one of Bills Boxes
|
||||||
|
; the data comes mainly from 'EnemyMon:'
|
||||||
ld a, BANK(sBoxCount)
|
ld a, BANK(sBoxCount)
|
||||||
call GetSRAMBank
|
call GetSRAMBank
|
||||||
ld de, sBoxCount
|
ld de, sBoxCount
|
||||||
@ -8811,6 +8812,7 @@ Functionde6e: ; de6e
|
|||||||
jp nc, Functiondf42
|
jp nc, Functiondf42
|
||||||
inc a
|
inc a
|
||||||
ld [de], a
|
ld [de], a
|
||||||
|
|
||||||
ld a, [CurPartySpecies]
|
ld a, [CurPartySpecies]
|
||||||
ld [CurSpecies], a
|
ld [CurSpecies], a
|
||||||
ld c, a
|
ld c, a
|
||||||
@ -8823,23 +8825,29 @@ Functionde6e: ; de6e
|
|||||||
ld [de], a
|
ld [de], a
|
||||||
inc a
|
inc a
|
||||||
jr nz, .asm_de85
|
jr nz, .asm_de85
|
||||||
|
|
||||||
call GetBaseData
|
call GetBaseData
|
||||||
call ShiftBoxMon
|
call ShiftBoxMon
|
||||||
|
|
||||||
ld hl, PlayerName
|
ld hl, PlayerName
|
||||||
ld de, sBoxMonOT
|
ld de, sBoxMonOT
|
||||||
ld bc, NAME_LENGTH
|
ld bc, NAME_LENGTH
|
||||||
call CopyBytes
|
call CopyBytes
|
||||||
|
|
||||||
ld a, [CurPartySpecies]
|
ld a, [CurPartySpecies]
|
||||||
ld [wd265], a
|
ld [wd265], a
|
||||||
call GetPokemonName
|
call GetPokemonName
|
||||||
|
|
||||||
ld de, sBoxMonNicknames
|
ld de, sBoxMonNicknames
|
||||||
ld hl, StringBuffer1
|
ld hl, StringBuffer1
|
||||||
ld bc, PKMN_NAME_LENGTH
|
ld bc, PKMN_NAME_LENGTH
|
||||||
call CopyBytes
|
call CopyBytes
|
||||||
|
|
||||||
ld hl, EnemyMon
|
ld hl, EnemyMon
|
||||||
ld de, sBoxMon1
|
ld de, sBoxMon1
|
||||||
ld bc, 1 + 1 + NUM_MOVES ; species + item + moves
|
ld bc, 1 + 1 + NUM_MOVES ; species + item + moves
|
||||||
call CopyBytes
|
call CopyBytes
|
||||||
|
|
||||||
ld hl, PlayerID
|
ld hl, PlayerID
|
||||||
ld a, [hli]
|
ld a, [hli]
|
||||||
ld [de], a
|
ld [de], a
|
||||||
@ -8861,6 +8869,7 @@ Functionde6e: ; de6e
|
|||||||
ld a, [$ffb6]
|
ld a, [$ffb6]
|
||||||
ld [de], a
|
ld [de], a
|
||||||
inc de
|
inc de
|
||||||
|
|
||||||
xor a
|
xor a
|
||||||
ld b, $a
|
ld b, $a
|
||||||
.asm_dee5
|
.asm_dee5
|
||||||
@ -8868,6 +8877,7 @@ Functionde6e: ; de6e
|
|||||||
inc de
|
inc de
|
||||||
dec b
|
dec b
|
||||||
jr nz, .asm_dee5
|
jr nz, .asm_dee5
|
||||||
|
|
||||||
ld hl, EnemyMonDVs
|
ld hl, EnemyMonDVs
|
||||||
ld b, 2 + NUM_MOVES ; DVs and PP ; EnemyMonHappiness - EnemyMonDVs
|
ld b, 2 + NUM_MOVES ; DVs and PP ; EnemyMonHappiness - EnemyMonDVs
|
||||||
.asm_deef
|
.asm_deef
|
||||||
@ -8876,6 +8886,7 @@ Functionde6e: ; de6e
|
|||||||
inc de
|
inc de
|
||||||
dec b
|
dec b
|
||||||
jr nz, .asm_deef
|
jr nz, .asm_deef
|
||||||
|
|
||||||
ld a, BASE_HAPPINESS
|
ld a, BASE_HAPPINESS
|
||||||
ld [de], a
|
ld [de], a
|
||||||
inc de
|
inc de
|
||||||
@ -8909,6 +8920,7 @@ Functionde6e: ; de6e
|
|||||||
call CopyBytes
|
call CopyBytes
|
||||||
ld b, 0
|
ld b, 0
|
||||||
call Functiondcb6
|
call Functiondcb6
|
||||||
|
|
||||||
call CloseSRAM
|
call CloseSRAM
|
||||||
scf
|
scf
|
||||||
ret
|
ret
|
||||||
@ -9482,7 +9494,7 @@ GivePoke:: ; e277
|
|||||||
ld a, [CurPartySpecies]
|
ld a, [CurPartySpecies]
|
||||||
ld [TempEnemyMonSpecies], a
|
ld [TempEnemyMonSpecies], a
|
||||||
callab LoadEnemyMon
|
callab LoadEnemyMon
|
||||||
call Functionde6e
|
call SentPkmnIntoBox
|
||||||
jp nc, Functione3d4
|
jp nc, Functione3d4
|
||||||
ld a, $2
|
ld a, $2
|
||||||
ld [MonType], a
|
ld [MonType], a
|
||||||
|
@ -2555,7 +2555,7 @@ Function17e026: ; 17e026
|
|||||||
push bc
|
push bc
|
||||||
push hl
|
push hl
|
||||||
callba LoadEnemyMon
|
callba LoadEnemyMon
|
||||||
callba Functionde6e
|
callba SentPkmnIntoBox
|
||||||
callba Function4db83
|
callba Function4db83
|
||||||
pop hl
|
pop hl
|
||||||
pop bc
|
pop bc
|
||||||
|
Loading…
Reference in New Issue
Block a user