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

Consistent predef function names

Browse Source
This commit is contained in:
xCrystal
2018-01-02 18:49:25 +01:00
parent b4a49351c1
commit d7970f749a
102 changed files with 549 additions and 548 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
engine/item_effects.asm
View File

@@ -415,7 +415,7 @@ ParkBall: ; e8a2
ld [hBattleTurn], a
ld [Buffer2], a
ld [wNumHits], a
predef PlayBattleAnim
predef Predef_PlayBattleAnim
ld a, [wWildMon]
and a
@@ -547,7 +547,7 @@ ParkBall: ; e8a2
ld a, [EnemyMonSpecies]
ld [wd265], a
predef NewPokedexEntry
predef Predef_NewPokedexEntry
.skip_pokedex
ld a, [BattleType]
@@ -567,7 +567,7 @@ ParkBall: ; e8a2
ld [MonType], a
call ClearSprites
predef TryAddMonToParty
predef Predef_TryAddMonToParty
farcall SetCaughtData
@@ -623,7 +623,7 @@ ParkBall: ; e8a2
.SendToPC:
call ClearSprites
predef SentPkmnIntoBox
predef Predef_SendPkmnIntoBox
farcall SetBoxMonCaughtData
@@ -985,7 +985,7 @@ LoveBallMultiplier:
ld [MonType], a
ld a, [CurBattleMon]
ld [CurPartyMon], a
farcall GetGender
farcall Predef_GetGender
jr c, .done1 ; no effect on genderless
ld d, 0 ; male
@@ -999,7 +999,7 @@ LoveBallMultiplier:
ld [CurPartySpecies], a
ld a, WILDMON
ld [MonType], a
farcall GetGender
farcall Predef_GetGender
jr c, .done2 ; no effect on genderless
ld d, 0 ; male
@@ -1289,7 +1289,7 @@ UpdateStatsAfterItem: ; ee8c
ld a, MON_STAT_EXP - 1
call GetPartyParamLocation
ld b, $1
predef_jump CalcPkmnStats
predef_jump Predef_CalcPkmnStats
; ee9f
RareCandy_StatBooster_ExitMenu: ; ee9f
@@ -1428,7 +1428,7 @@ RareCandy: ; ef14
xor a ; PARTYMON
ld [MonType], a
predef CopyPkmnToTempMon
predef Predef_CopyPkmnToTempMon
hlcoord 9, 0
ld b, 10
@@ -1437,7 +1437,7 @@ RareCandy: ; ef14
hlcoord 11, 1
ld bc, $0004
predef PrintTempMonStats
predef Predef_PrintTempMonStats
call WaitPressAorB_BlinkCursor
@@ -1445,7 +1445,7 @@ RareCandy: ; ef14
ld [MonType], a
ld a, [CurPartySpecies]
ld [wd265], a
predef LearnLevelMoves
predef Predef_LearnLevelMoves
xor a
ld [wForceEvolution], a
@@ -1668,7 +1668,7 @@ RevivePokemon: ; f0d6
ld d, 0
ld hl, wBattleParticipantsIncludingFainted
ld b, CHECK_FLAG
predef FlagPredef
predef Predef_Flag
ld a, c
and a
jr z, .skip_to_revive
@@ -1677,7 +1677,7 @@ RevivePokemon: ; f0d6
ld c, a
ld hl, wBattleParticipantsNotFainted
ld b, SET_FLAG
predef FlagPredef
predef Predef_Flag
.skip_to_revive
xor a
@@ -1844,7 +1844,7 @@ HealHP_SFX_GFX: ; f1db (3:71db)
call AddNTimes
ld a, $2
ld [wWhichHPBar], a
predef_jump AnimateHPBar
predef_jump Predef_AnimateHPBar
UseItem_SelectMon: ; f1f9 (3:71f9)
call .SelectMon
@@ -2957,7 +2957,7 @@ UseBallInTrainerBattle: ; f7a0
ld [wBattleAnimParam], a
ld [hBattleTurn], a
ld [wNumHits], a
predef PlayBattleAnim
predef Predef_PlayBattleAnim
ld hl, BlockedTheBallText
call PrintText
ld hl, DontBeAThiefText
@@ -3104,7 +3104,7 @@ ApplyPPUp: ; f84c
call GetPartyParamLocation
push hl
ld de, Buffer1
predef FillPP
predef Predef_FillPP
pop hl
ld bc, MON_PP - MON_MOVES
add hl, bc