diff options
Diffstat (limited to 'mobile')
| -rw-r--r-- | mobile/mobile_22.asm | 4 | ||||
| -rw-r--r-- | mobile/mobile_40.asm | 4 | ||||
| -rw-r--r-- | mobile/mobile_42.asm | 16 | ||||
| -rwxr-xr-x | mobile/mobile_46.asm | 6 | ||||
| -rw-r--r-- | mobile/mobile_5f.asm | 18 |
5 files changed, 24 insertions, 24 deletions
diff --git a/mobile/mobile_22.asm b/mobile/mobile_22.asm index 9c8eeab7d..27777e047 100644 --- a/mobile/mobile_22.asm +++ b/mobile/mobile_22.asm @@ -1227,7 +1227,7 @@ Function897af: ; 897af xor a ld [CurPartySpecies], a ld de, vTiles2 tile $37 - farcall Predef_GetTrainerPic + farcall GetTrainerPic pop bc ret ; 897d5 @@ -1259,7 +1259,7 @@ Function897d5: ; 897d5 ld [hGraphicStartTile], a hlcoord 12, 3 lb bc, 7, 7 - predef Predef_PlaceGraphic + predef PlaceGraphic call Function8963d pop bc ret diff --git a/mobile/mobile_40.asm b/mobile/mobile_40.asm index 3a7f7c641..4d60399d8 100644 --- a/mobile/mobile_40.asm +++ b/mobile/mobile_40.asm @@ -1985,7 +1985,7 @@ Function100c74: ; 100c74 ld a, SCREEN_WIDTH * 2 ld [Buffer1], a hlcoord 2, 10 - predef Predef_ListMoves + predef ListMoves ret ; 100c98 @@ -6794,7 +6794,7 @@ Function102d48: ; 102d48 ld bc, PARTYMON_STRUCT_LENGTH ld hl, PartyMon1DVs call AddNTimes - predef Predef_GetUnownLetter + predef GetUnownLetter farcall UpdateUnownDex ld a, [wFirstUnownSeen] and a diff --git a/mobile/mobile_42.asm b/mobile/mobile_42.asm index 146fcf902..a630242d1 100644 --- a/mobile/mobile_42.asm +++ b/mobile/mobile_42.asm @@ -290,26 +290,26 @@ MobileTradeAnim_ClearBGMap: ; 1081ca MobileTradeAnim_GetFrontpic: ; 1081e9 push de push af - predef Predef_GetUnownLetter + predef GetUnownLetter pop af ld [CurPartySpecies], a ld [CurSpecies], a call GetBaseData pop de - predef Predef_GetMonFrontpic + predef GetMonFrontpic ret ; 108201 Function108201: ; 108201 push de push af - predef Predef_GetUnownLetter + predef GetUnownLetter pop af ld [CurPartySpecies], a ld [CurSpecies], a call GetBaseData pop de - predef Predef_GetAnimatedFrontpic + predef GetAnimatedFrontpic ret ; 108219 @@ -318,7 +318,7 @@ Function108219: ; 108219 hlcoord 7, 2 ld d, $0 ld e, ANIM_MON_TRADE - predef Predef_AnimateFrontpic + predef AnimateFrontpic ret ; 108229 @@ -327,7 +327,7 @@ Function108229: ; 108229 hlcoord 7, 2 ld d, $0 ld e, ANIM_MON_TRADE - predef Predef_LoadMonAnimation + predef LoadMonAnimation ret ; 108239 @@ -1238,7 +1238,7 @@ asm_108966 xor a ld [hGraphicStartTile], a lb bc, 7, 7 - predef Predef_PlaceGraphic + predef PlaceGraphic call WaitBGMap ret ; 10898a @@ -1252,7 +1252,7 @@ Function10898a: ; 10898a xor a ld [hGraphicStartTile], a lb bc, 7, 7 - predef Predef_PlaceGraphic + predef PlaceGraphic call WaitBGMap ret ; 1089a8 diff --git a/mobile/mobile_46.asm b/mobile/mobile_46.asm index 45a20d3fe..02fb8a3c7 100755 --- a/mobile/mobile_46.asm +++ b/mobile/mobile_46.asm @@ -6688,7 +6688,7 @@ Function11b242: ; 11b242 call PlaceString xor a ld [MonType], a - farcall Predef_GetGender + farcall GetGender hlcoord 1, 4 ld a, [CurPartySpecies] ld bc, wcd2f @@ -7146,7 +7146,7 @@ Function11b483: ; 11b483 pop de push de ld b, OTPARTYMON - predef Predef_CalcPkmnStats + predef CalcPkmnStats pop de ld h, d ld l, e @@ -7565,7 +7565,7 @@ Function11b6b4: ; 11b6b4 ld hl, $c60d + MON_STAT_EXP - 1 ld de, $c60d + MON_MAXHP ld b, $1 - predef Predef_CalcPkmnStats + predef CalcPkmnStats ld de, $c60d + MON_MAXHP ld hl, $c60d + MON_HP ld a, [de] diff --git a/mobile/mobile_5f.asm b/mobile/mobile_5f.asm index 72224e42e..2954a4d3e 100644 --- a/mobile/mobile_5f.asm +++ b/mobile/mobile_5f.asm @@ -412,7 +412,7 @@ Function17d1f1: ; 17d1f1 dec a ld bc, PARTYMON_STRUCT_LENGTH call AddNTimes - predef Predef_GetUnownLetter + predef GetUnownLetter callfar UpdateUnownDex ld a, [wFirstUnownSeen] and a @@ -1498,7 +1498,7 @@ Function17d93a: ; 17d93a add hl, de ld e, l ld d, h - farcall Predef_HOF_AnimateFrontpic + farcall HOF_AnimateFrontpic pop af ld [rSVBK], a call Function17e349 @@ -1530,12 +1530,12 @@ Function17d98b: ; 17d98b ld d, a push de ld de, vTiles2 - farcall Predef_GetTrainerPic + farcall GetTrainerPic pop hl decoord 0, 0 add hl, de ld bc, $707 - predef Predef_PlaceGraphic + predef PlaceGraphic pop af ld [rSVBK], a call Function17e349 @@ -2337,7 +2337,7 @@ Function17ded9: ; 17ded9 ld [MonType], a push hl push bc - predef Predef_TryAddMonToParty + predef TryAddMonToParty farcall SetCaughtData pop bc pop hl @@ -2442,7 +2442,7 @@ Function17ded9: ; 17ded9 ld e, l push hl ld b, $0 - farcall Predef_CalcPkmnStats + farcall CalcPkmnStats ld a, [PartyCount] dec a ld hl, PartyMon1HP @@ -2508,7 +2508,7 @@ Function17ded9: ; 17ded9 ld d, h ld e, l pop hl - predef Predef_FillPP + predef FillPP pop hl pop bc jp asm_17e0ee @@ -2531,7 +2531,7 @@ Function17e026: ; 17e026 push bc push hl farcall LoadEnemyMon - farcall Predef_SendPkmnIntoBox + farcall SendPkmnIntoBox farcall SetBoxMonCaughtData pop hl pop bc @@ -2622,7 +2622,7 @@ Function17e026: ; 17e026 push hl ld hl, sBoxMon1Moves ld de, sBoxMon1PP - predef Predef_FillPP + predef FillPP call CloseSRAM pop hl pop bc |