Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459)

Browse Source 
# Conflicts:
#	data/items/descriptions.asm
#	data/sprite_anims/framesets.asm
#	engine/crystal_colors.asm
#	engine/events/kurt.asm
#	engine/events/special.asm
#	engine/events/std_scripts.asm
#	engine/events_3.asm
#	engine/item_effects.asm
#	engine/namingscreen.asm
#	engine/scripting.asm
#	engine/stats_screen.asm
#	engine/trade_animation.asm
#	home/audio.asm
#	main.asm
#	maps/BattleTower1F.asm
#	maps/BattleTowerBattleRoom.asm
#	maps/BurnedTowerB1F.asm
#	maps/ElmsLab.asm
#	maps/GoldenrodDeptStore5F.asm
#	maps/GoldenrodUnderground.asm
#	maps/HallOfFame.asm
#	maps/MahoganyTown.asm
#	maps/ManiasHouse.asm
#	maps/MobileBattleRoom.asm
#	maps/MobileTradeRoomMobile.asm
#	maps/RadioTower2F.asm
#	maps/Route35NationalParkGate.asm
#	maps/Route36NationalParkGate.asm
#	maps/Route39Farmhouse.asm
#	tilesets/palette_maps.asm
This commit is contained in:
Remy Oukaour
2018-01-14 22:56:36 -05:00
parent 8e1e583640 2c789b64b1
commit 5c28d05bb4
249 changed files with 1382 additions and 1408 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
engine/breeding.asm
View File

@@ -10,7 +10,7 @@ CheckBreedmonCompatibility: ; 16e1d
ld [TempMonDVs + 1], a
ld a, TEMPMON
ld [MonType], a
predef GetGender
predef Predef_GetGender
jr c, .genderless
ld b, $1
jr nz, .breedmon2
@@ -26,7 +26,7 @@ CheckBreedmonCompatibility: ; 16e1d
ld [TempMonDVs + 1], a
ld a, $3
ld [MonType], a
predef GetGender
predef Predef_GetGender
pop bc
jr c, .genderless
ld a, $1
@@ -232,7 +232,7 @@ HatchEggs: ; 16f70 (5:6f70)
push de
farcall SetEggMonCaughtData
farcall TrainerRankings_EggsHatched
farcall StubbedTrainerRankings_EggsHatched
ld a, [CurPartyMon]
ld hl, PartyMon1Species
ld bc, PARTYMON_STRUCT_LENGTH
@@ -289,7 +289,7 @@ HatchEggs: ; 16f70 (5:6f70)
ld bc, MON_STAT_EXP - 1
add hl, bc
ld b, $0
predef CalcPkmnStats
predef Predef_CalcPkmnStats
pop bc
ld hl, MON_MAXHP
add hl, bc
@@ -514,7 +514,7 @@ GLOBAL EggMoves
cp b
jr nz, .loop5
ld [wPutativeTMHMMove], a
predef CanLearnTMHMMove
predef Predef_CanLearnTMHMMove
ld a, c
and a
jr z, .done
@@ -559,7 +559,7 @@ LoadEggMove: ; 17169
ld [hl], b
ld hl, wEggMonMoves
ld de, wEggMonPP
predef FillPP
predef Predef_FillPP
pop bc
pop de
ret
@@ -590,7 +590,7 @@ GetHeritableMoves: ; 17197
ld [TempMonDVs + 1], a
ld a, TEMPMON
ld [MonType], a
predef GetGender
predef Predef_GetGender
jr c, .inherit_mon2_moves
jr nz, .inherit_mon2_moves
jr .inherit_mon1_moves
@@ -606,7 +606,7 @@ GetHeritableMoves: ; 17197
ld [TempMonDVs + 1], a
ld a, TEMPMON
ld [MonType], a
predef GetGender
predef Predef_GetGender
jr c, .inherit_mon1_moves
jr nz, .inherit_mon1_moves
@@ -647,9 +647,9 @@ GetEggFrontpic: ; 17224 (5:7224)
ld [CurSpecies], a
call GetBaseData
ld hl, BattleMonDVs
predef GetUnownLetter
predef Predef_GetUnownLetter
pop de
predef_jump GetMonFrontpic
predef_jump Predef_GetMonFrontpic
GetHatchlingFrontpic: ; 1723c (5:723c)
push de
@@ -657,9 +657,9 @@ GetHatchlingFrontpic: ; 1723c (5:723c)
ld [CurSpecies], a
call GetBaseData
ld hl, BattleMonDVs
predef GetUnownLetter
predef Predef_GetUnownLetter
pop de
predef_jump GetAnimatedFrontpicPredef
predef_jump Predef_GetAnimatedFrontpic
Hatch_UpdateFrontpicBGMapCenter: ; 17254 (5:7254)
push af
@@ -677,7 +677,7 @@ Hatch_UpdateFrontpicBGMapCenter: ; 17254 (5:7254)
ld a, c
ld [hGraphicStartTile], a
lb bc, 7, 7
predef PlaceGraphic
predef Predef_PlaceGraphic
pop af
call Hatch_LoadFrontpicPal
call SetPalettes
@@ -779,7 +779,7 @@ EggHatch_AnimationSequence: ; 1728f (5:728f)
hlcoord 6, 3
ld d, $0
ld e, ANIM_MON_HATCH
predef AnimateFrontpic
predef Predef_AnimateFrontpic
pop af
ld [CurSpecies], a
ret
@@ -985,8 +985,7 @@ DayCareMonCompatibilityText: ; 1746c
db "@"
; 0x174b5
DayCareMonPrintEmptyString: ; 174b5
; unreferenced
Unreferenced_DayCareMonPrintEmptyString: ; 174b5
ld hl, .string
ret
; 174b9