diff options
Diffstat (limited to 'engine/link.asm')
| -rwxr-xr-x | engine/link.asm | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/engine/link.asm b/engine/link.asm index de914c492..3d1fd0da4 100755 --- a/engine/link.asm +++ b/engine/link.asm @@ -150,7 +150,7 @@ TimeCapsule: ; 2805d ld [wd265], a push hl push de - callfar ConvertMon_1to2 + callfar Predef_ConvertMon_1to2 pop de pop hl ld a, [wd265] @@ -449,7 +449,7 @@ Gen2ToGen2LinkComms: ; 28177 pop af ld [rIF], a - predef StartBattle + predef Predef_StartBattle ld a, [rIF] ld h, a @@ -786,7 +786,7 @@ Link_PrepPartyData_Gen1: ; 28499 add hl, bc ld c, STAT_SATK ld b, TRUE - predef CalcPkmnStatC + predef Predef_CalcPkmnStatC pop bc pop de @@ -993,7 +993,7 @@ Function2868a: ; 2868a push bc push de ld [wd265], a - callfar ConvertMon_1to2 + callfar Predef_ConvertMon_1to2 pop de pop bc ld a, [wd265] @@ -1072,7 +1072,7 @@ Function2868a: ; 2868a add hl, bc ld c, STAT_SATK ld b, TRUE - predef CalcPkmnStatC + predef Predef_CalcPkmnStatC pop bc pop hl ld a, [hQuotient + 1] @@ -1085,7 +1085,7 @@ Function2868a: ; 2868a add hl, bc ld c, STAT_SDEF ld b, TRUE - predef CalcPkmnStatC + predef Predef_CalcPkmnStatC pop bc pop hl ld a, [hQuotient + 1] @@ -1362,7 +1362,7 @@ Function28926: ; 28926 hlcoord 0, 15 ld b, 1 ld c, 18 - call LinkTextboxPredef + call Predef_LinkTextbox hlcoord 2, 16 ld de, .String_Stats_Trade call PlaceString @@ -1471,7 +1471,7 @@ Function28926: ; 28926 hlcoord 0, 12 ld b, 4 ld c, 18 - call LinkTextboxPredef + call Predef_LinkTextbox farcall Link_WaitBGMap ld hl, .Text_CantTradeLastMon bccoord 1, 14 @@ -1493,7 +1493,7 @@ Function28926: ; 28926 hlcoord 0, 12 ld b, 4 ld c, 18 - call LinkTextboxPredef + call Predef_LinkTextbox farcall Link_WaitBGMap ld hl, .Text_Abnormal bccoord 1, 14 @@ -1503,7 +1503,7 @@ Function28926: ; 28926 hlcoord 0, 12 ld b, 4 ld c, 18 - call LinkTextboxPredef + call Predef_LinkTextbox hlcoord 1, 14 ld de, String_TooBadTheTradeWasCanceled call PlaceString @@ -1648,7 +1648,7 @@ LinkTrade: ; 28b87 hlcoord 0, 12 ld b, $4 ld c, $12 - call LinkTextboxPredef + call Predef_LinkTextbox farcall Link_WaitBGMap ld a, [wd002] ld hl, PartySpecies @@ -1677,7 +1677,7 @@ LinkTrade: ; 28b87 hlcoord 10, 7 ld b, 3 ld c, 7 - call LinkTextboxPredef + call Predef_LinkTextbox ld de, String28eab hlcoord 12, 8 call PlaceString @@ -1717,7 +1717,7 @@ LinkTrade: ; 28b87 hlcoord 0, 12 ld b, 4 ld c, 18 - call LinkTextboxPredef + call Predef_LinkTextbox hlcoord 1, 14 ld de, String_TooBadTheTradeWasCanceled call PlaceString @@ -1734,7 +1734,7 @@ LinkTrade: ; 28b87 hlcoord 0, 12 ld b, 4 ld c, 18 - call LinkTextboxPredef + call Predef_LinkTextbox hlcoord 1, 14 ld de, String_TooBadTheTradeWasCanceled call PlaceString @@ -1891,11 +1891,11 @@ LinkTrade: ; 28b87 ld a, [hLinkPlayerNumber] cp $1 jr z, .player_2 - predef TradeAnimation + predef Predef_TradeAnimation jr .done_animation .player_2 - predef TradeAnimationPlayer2 + predef Predef_TradeAnimationPlayer2 .done_animation pop af @@ -1913,7 +1913,7 @@ LinkTrade: ; 28b87 ld de, TempMonSpecies ld bc, PARTYMON_STRUCT_LENGTH call CopyBytes - predef AddTempmonToParty + predef Predef_AddTempmonToParty ld a, [PartyCount] dec a ld [CurPartyMon], a @@ -1964,7 +1964,7 @@ LinkTrade: ; 28b87 hlcoord 0, 12 ld b, 4 ld c, 18 - call LinkTextboxPredef + call Predef_LinkTextbox hlcoord 1, 14 ld de, String28ebd call PlaceString @@ -2001,7 +2001,7 @@ String_TooBadTheTradeWasCanceled: ; 28ece next "was canceled!@" -LinkTextboxPredef: ; 28eef +Predef_LinkTextbox: ; 28eef ld d, h ld e, l farcall LinkTextbox @@ -2023,11 +2023,11 @@ Unreferenced_Function28f09: ; 28f09 hlcoord 0, 0 ld b, 6 ld c, 18 - call LinkTextboxPredef + call Predef_LinkTextbox hlcoord 0, 8 ld b, 6 ld c, 18 - call LinkTextboxPredef + call Predef_LinkTextbox farcall PlaceTradePartnerNamesAndParty ret ; 28f24 @@ -2584,7 +2584,7 @@ Unreferenced_Function29fe4: call GetSRAMBank ld d, $0 ld b, CHECK_FLAG - predef FlagPredef + predef Predef_Flag call CloseSRAM ld a, c and a |