Consistent predef function names

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

View File

@@ -248,7 +248,7 @@ RunBattleTowerTrainer: ; 17024d
call ReadBTTrainerParty
call Clears5_a89a
predef StartBattle
predef Predef_StartBattle
farcall LoadPokemonData
farcall HealParty
@@ -484,7 +484,7 @@ endr
ld hl, MON_STAT_EXP - 1
add hl, bc
ld b, $1
predef CalcPkmnStats
predef Predef_CalcPkmnStats
pop de
pop hl
dec de

View File

@@ -1228,7 +1228,7 @@ Function897af: ; 897af
xor a
ld [CurPartySpecies], a
ld de, vTiles2 tile $37
farcall GetTrainerPic
farcall Predef_GetTrainerPic
pop bc
ret
; 897d5
@@ -1260,7 +1260,7 @@ Function897d5: ; 897d5
ld [hGraphicStartTile], a
hlcoord 12, 3
lb bc, 7, 7
predef PlaceGraphic
predef Predef_PlaceGraphic
call Function8963d
pop bc
ret

View File

@@ -1985,7 +1985,7 @@ Function100c74: ; 100c74
ld a, SCREEN_WIDTH * 2
ld [Buffer1], a
hlcoord 2, 10
predef ListMoves
predef Predef_ListMoves
ret
; 100c98
@@ -6796,7 +6796,7 @@ Function102d48: ; 102d48
ld bc, PARTYMON_STRUCT_LENGTH
ld hl, PartyMon1DVs
call AddNTimes
predef GetUnownLetter
predef Predef_GetUnownLetter
farcall UpdateUnownDex
ld a, [wFirstUnownSeen]
and a

View File

@@ -290,26 +290,26 @@ MobileTradeAnim_ClearBGMap: ; 1081ca
MobileTradeAnim_GetFrontpic: ; 1081e9
push de
push af
predef GetUnownLetter
predef Predef_GetUnownLetter
pop af
ld [CurPartySpecies], a
ld [CurSpecies], a
call GetBaseData
pop de
predef GetMonFrontpic
predef Predef_GetMonFrontpic
ret
; 108201
Function108201: ; 108201
push de
push af
predef GetUnownLetter
predef Predef_GetUnownLetter
pop af
ld [CurPartySpecies], a
ld [CurSpecies], a
call GetBaseData
pop de
predef GetAnimatedFrontpicPredef
predef Predef_GetAnimatedFrontpic
ret
; 108219
@@ -318,7 +318,7 @@ Function108219: ; 108219
hlcoord 7, 2
ld d, $0
ld e, ANIM_MON_TRADE
predef AnimateFrontpic
predef Predef_AnimateFrontpic
ret
; 108229
@@ -327,7 +327,7 @@ Function108229: ; 108229
hlcoord 7, 2
ld d, $0
ld e, ANIM_MON_TRADE
predef LoadMonAnimation
predef Predef_LoadMonAnimation
ret
; 108239
@@ -1238,7 +1238,7 @@ asm_108966
xor a
ld [hGraphicStartTile], a
lb bc, 7, 7
predef PlaceGraphic
predef Predef_PlaceGraphic
call WaitBGMap
ret
; 10898a
@@ -1252,7 +1252,7 @@ Function10898a: ; 10898a
xor a
ld [hGraphicStartTile], a
lb bc, 7, 7
predef PlaceGraphic
predef Predef_PlaceGraphic
call WaitBGMap
ret
; 1089a8

View File

@@ -6696,7 +6696,7 @@ Function11b242: ; 11b242
call PlaceString
xor a
ld [MonType], a
farcall GetGender
farcall Predef_GetGender
hlcoord 1, 4
ld a, [CurPartySpecies]
ld bc, wcd2f
@@ -7154,7 +7154,7 @@ Function11b483: ; 11b483
pop de
push de
ld b, OTPARTYMON
predef CalcPkmnStats
predef Predef_CalcPkmnStats
pop de
ld h, d
ld l, e
@@ -7573,7 +7573,7 @@ Function11b6b4: ; 11b6b4
ld hl, $c60d + MON_STAT_EXP - 1
ld de, $c60d + MON_MAXHP
ld b, $1
predef CalcPkmnStats
predef Predef_CalcPkmnStats
ld de, $c60d + MON_MAXHP
ld hl, $c60d + MON_HP
ld a, [de]

View File

@@ -412,7 +412,7 @@ Function17d1f1: ; 17d1f1
dec a
ld bc, PARTYMON_STRUCT_LENGTH
call AddNTimes
predef GetUnownLetter
predef Predef_GetUnownLetter
callfar UpdateUnownDex
ld a, [wFirstUnownSeen]
and a
@@ -1500,7 +1500,7 @@ Function17d93a: ; 17d93a
add hl, de
ld e, l
ld d, h
farcall HOF_AnimateFrontpic
farcall HOF_Predef_AnimateFrontpic
pop af
ld [rSVBK], a
call Function17e349
@@ -1532,12 +1532,12 @@ Function17d98b: ; 17d98b
ld d, a
push de
ld de, vTiles2
farcall GetTrainerPic
farcall Predef_GetTrainerPic
pop hl
decoord 0, 0
add hl, de
ld bc, $707
predef PlaceGraphic
predef Predef_PlaceGraphic
pop af
ld [rSVBK], a
call Function17e349
@@ -2339,7 +2339,7 @@ Function17ded9: ; 17ded9
ld [MonType], a
push hl
push bc
predef TryAddMonToParty
predef Predef_TryAddMonToParty
farcall SetCaughtData
pop bc
pop hl
@@ -2444,7 +2444,7 @@ Function17ded9: ; 17ded9
ld e, l
push hl
ld b, $0
farcall CalcPkmnStats
farcall Predef_CalcPkmnStats
ld a, [PartyCount]
dec a
ld hl, PartyMon1HP
@@ -2510,7 +2510,7 @@ Function17ded9: ; 17ded9
ld d, h
ld e, l
pop hl
predef FillPP
predef Predef_FillPP
pop hl
pop bc
jp asm_17e0ee
@@ -2533,7 +2533,7 @@ Function17e026: ; 17e026
push bc
push hl
farcall LoadEnemyMon
farcall SentPkmnIntoBox
farcall Predef_SendPkmnIntoBox
farcall SetBoxMonCaughtData
pop hl
pop bc
@@ -2624,7 +2624,7 @@ Function17e026: ; 17e026
push hl
ld hl, sBoxMon1Moves
ld de, sBoxMon1PP
predef FillPP
predef Predef_FillPP
call CloseSRAM
pop hl
pop bc