pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-04-09 05:44:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/pret/pokecrystal

Browse Source
This commit is contained in:
Rangi
2018-05-06 22:45:07 -04:00
parent aa51dbc612 59c4d824e6
commit 8acc8d6e30
23 changed files with 54 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
engine/pokemon/breeding.asm
View File

@@ -24,7 +24,7 @@ CheckBreedmonCompatibility: ; 16e1d
ld [wTempMonDVs], a
ld a, [wBreedMon2DVs + 1]
ld [wTempMonDVs + 1], a
ld a, $3
ld a, TEMPMON
ld [wMonType], a
predef GetGender
pop bc

2
engine/pokemon/evolve.asm
View File

@@ -18,7 +18,7 @@ EvolveAfterBattle: ; 421e6
push hl
EvolveAfterBattle_MasterLoop
EvolveAfterBattle_MasterLoop:
ld hl, wCurPartyMon
inc [hl]

4
engine/pokemon/mail.asm
View File

@@ -124,7 +124,7 @@ GetMailboxCount: ; 44648
jp CloseSRAM
; 44654
CheckPokeItem:: ; 44654
CheckPokeMail:: ; 44654
push bc
push de
farcall SelectMonFromParty
@@ -194,7 +194,7 @@ CheckPokeItem:: ; 44654
; 446cc
GivePokeItem:: ; 446cc
GivePokeMail:: ; 446cc
ld a, [wPartyCount]
dec a
push af