diff options
Diffstat (limited to 'engine/events')
| -rwxr-xr-x | engine/events/battle_tower/battle_tower.asm | 4 | ||||
| -rw-r--r-- | engine/events/catch_tutorial.asm | 2 | ||||
| -rwxr-xr-x | engine/events/daycare.asm | 10 | ||||
| -rwxr-xr-x | engine/events/halloffame.asm | 18 | ||||
| -rw-r--r-- | engine/events/move_tutor.asm | 4 | ||||
| -rwxr-xr-x | engine/events/poisonstep.asm | 4 | ||||
| -rw-r--r-- | engine/events/poisonstep_pals.asm | 2 | ||||
| -rwxr-xr-x | engine/events/pokecenter_pc.asm | 4 | ||||
| -rwxr-xr-x | engine/events/pokepic.asm | 4 | ||||
| -rw-r--r-- | engine/events/print_unown.asm | 6 | ||||
| -rwxr-xr-x | engine/events/special.asm | 2 |
11 files changed, 30 insertions, 30 deletions
diff --git a/engine/events/battle_tower/battle_tower.asm b/engine/events/battle_tower/battle_tower.asm index 93b283d27..bb2c23ca2 100755 --- a/engine/events/battle_tower/battle_tower.asm +++ b/engine/events/battle_tower/battle_tower.asm @@ -248,7 +248,7 @@ RunBattleTowerTrainer: ; 17024d call ReadBTTrainerParty call Clears5_a89a - predef Predef_StartBattle + predef StartBattle farcall LoadPokemonData farcall HealParty @@ -484,7 +484,7 @@ endr ld hl, MON_STAT_EXP - 1 add hl, bc ld b, $1 - predef Predef_CalcPkmnStats + predef CalcPkmnStats pop de pop hl dec de diff --git a/engine/events/catch_tutorial.asm b/engine/events/catch_tutorial.asm index d91af65fe..b9352ccd6 100644 --- a/engine/events/catch_tutorial.asm +++ b/engine/events/catch_tutorial.asm @@ -41,7 +41,7 @@ CatchTutorial:: ; 4e554 ld hl, .AutoInput ld a, BANK(.AutoInput) call StartAutoInput - callfar Predef_StartBattle + callfar StartBattle call StopAutoInput pop af diff --git a/engine/events/daycare.asm b/engine/events/daycare.asm index 6310787ac..ed6e16e87 100755 --- a/engine/events/daycare.asm +++ b/engine/events/daycare.asm @@ -565,7 +565,7 @@ DayCare_GiveEgg: ; 169ac pop hl push bc ld b, $0 - predef Predef_CalcPkmnStats + predef CalcPkmnStats pop bc ld hl, MON_HP add hl, bc @@ -639,7 +639,7 @@ DayCare_InitBreeding: ; 16a3b cp DITTO ld a, $0 jr z, .LoadWhichBreedmonIsTheMother - farcall Predef_GetGender + farcall GetGender ld a, $0 jr z, .LoadWhichBreedmonIsTheMother inc a @@ -684,7 +684,7 @@ DayCare_InitBreeding: ; 16a3b ld de, wEggMonMoves xor a ld [Buffer1], a - predef Predef_FillMoves + predef FillMoves farcall InitEggMoves ld hl, wEggMonID ld a, [PlayerID] @@ -726,7 +726,7 @@ DayCare_InitBreeding: ; 16a3b ld a, TEMPMON ld [MonType], a push hl - farcall Predef_GetGender + farcall GetGender pop hl ld de, wBreedMon1DVs ld bc, wBreedMon2DVs @@ -770,7 +770,7 @@ DayCare_InitBreeding: ; 16a3b call CopyBytes ld hl, wEggMonMoves ld de, wEggMonPP - predef Predef_FillPP + predef FillPP ld hl, wMonOrItemNameBuffer ld de, StringBuffer1 ld bc, NAME_LENGTH diff --git a/engine/events/halloffame.asm b/engine/events/halloffame.asm index 6b01ee831..ce6e5ddc7 100755 --- a/engine/events/halloffame.asm +++ b/engine/events/halloffame.asm @@ -130,7 +130,7 @@ AnimateHallOfFame: ; 864c3 call WaitBGMap decoord 6, 5 ld c, $6 - predef Predef_HOF_AnimateFrontpic + predef HOF_AnimateFrontpic ld c, 60 call DelayFrames and a @@ -244,18 +244,18 @@ AnimateHOFMonEntrance: ; 865b5 ld a, [hli] ld [TempMonDVs + 1], a ld hl, TempMonDVs - predef Predef_GetUnownLetter + predef GetUnownLetter hlcoord 0, 0 ld bc, SCREEN_WIDTH * SCREEN_HEIGHT ld a, " " call ByteFill ld de, vTiles2 tile $31 - predef Predef_GetMonBackpic + predef GetMonBackpic ld a, $31 ld [hGraphicStartTile], a hlcoord 6, 6 lb bc, 6, 6 - predef Predef_PlaceGraphic + predef PlaceGraphic ld a, $d0 ld [hSCY], a ld a, $90 @@ -403,7 +403,7 @@ _HallOfFamePC: ; 86650 call SetPalettes decoord 6, 5 ld c, $6 - predef Predef_HOF_AnimateFrontpic + predef HOF_AnimateFrontpic and a ret @@ -478,7 +478,7 @@ DisplayHOFMon: ; 86748 ld [CurPartySpecies], a ld [wd265], a ld hl, TempMonDVs - predef Predef_GetUnownLetter + predef GetUnownLetter xor a ld [wBoxAlignment], a hlcoord 6, 5 @@ -499,7 +499,7 @@ DisplayHOFMon: ; 86748 call PlaceString ld a, TEMPMON ld [MonType], a - farcall Predef_GetGender + farcall GetGender ld a, " " jr c, .got_gender ld a, "♂" @@ -546,7 +546,7 @@ HOF_AnimatePlayerPic: ; 86810 ld [hGraphicStartTile], a hlcoord 6, 6 lb bc, 6, 6 - predef Predef_PlaceGraphic + predef PlaceGraphic ld a, $d0 ld [hSCY], a ld a, $90 @@ -570,7 +570,7 @@ HOF_AnimatePlayerPic: ; 86810 ld [hGraphicStartTile], a hlcoord 12, 5 lb bc, 7, 7 - predef Predef_PlaceGraphic + predef PlaceGraphic ld a, $c0 ld [hSCX], a call WaitBGMap diff --git a/engine/events/move_tutor.asm b/engine/events/move_tutor.asm index 8bb29f9ae..be5f37564 100644 --- a/engine/events/move_tutor.asm +++ b/engine/events/move_tutor.asm @@ -55,7 +55,7 @@ CheckCanLearnMoveTutorMove: ; 492b9 ld hl, .MenuDataHeader call LoadMenuDataHeader - predef Predef_CanLearnTMHMMove + predef CanLearnTMHMMove push bc ld a, [CurPartyMon] @@ -79,7 +79,7 @@ CheckCanLearnMoveTutorMove: ; 492b9 callfar KnowsMove jr c, .didnt_learn - predef Predef_LearnMove + predef LearnMove ld a, b and a jr z, .didnt_learn diff --git a/engine/events/poisonstep.asm b/engine/events/poisonstep.asm index 366ad1c03..00c7477bc 100755 --- a/engine/events/poisonstep.asm +++ b/engine/events/poisonstep.asm @@ -104,7 +104,7 @@ DoPoisonStep:: ; 505da ld de, SFX_POISON call PlaySFX ld b, $2 - predef Predef_LoadPoisonBGPals + predef LoadPoisonBGPals call DelayFrame ret ; 50669 @@ -145,7 +145,7 @@ DoPoisonStep:: ; 505da ld a, [PartyCount] cp [hl] jr nz, .party_loop - predef Predef_CheckPlayerPartyForFitPkmn + predef CheckPlayerPartyForFitPkmn ld a, d ld [ScriptVar], a ret diff --git a/engine/events/poisonstep_pals.asm b/engine/events/poisonstep_pals.asm index 326629138..c0d4c5ace 100644 --- a/engine/events/poisonstep_pals.asm +++ b/engine/events/poisonstep_pals.asm @@ -1,4 +1,4 @@ -Predef_LoadPoisonBGPals: ; cbcdd +LoadPoisonBGPals: ; cbcdd call .LoadPals ld a, [hCGB] and a diff --git a/engine/events/pokecenter_pc.asm b/engine/events/pokecenter_pc.asm index 61d7346df..75d2d5392 100755 --- a/engine/events/pokecenter_pc.asm +++ b/engine/events/pokecenter_pc.asm @@ -353,7 +353,7 @@ KrisWithdrawItemMenu: ; 0x157d1 ld [CurItemQuantity], a ld hl, PCItems call TossItem - predef Predef_PartyMonItemName + predef PartyMonItemName ld hl, .WithdrewText call MenuTextBox xor a @@ -517,7 +517,7 @@ KrisDepositItemMenu: ; 0x1588b ld [CurItemQuantity], a ld hl, NumItems call TossItem - predef Predef_PartyMonItemName + predef PartyMonItemName ld hl, .DepositText call PrintText ret diff --git a/engine/events/pokepic.asm b/engine/events/pokepic.asm index 1a433cb25..e9e14bbf4 100755 --- a/engine/events/pokepic.asm +++ b/engine/events/pokepic.asm @@ -12,7 +12,7 @@ Pokepic:: ; 244e3 ld [CurSpecies], a call GetBaseData ld de, vTiles1 - predef Predef_GetMonFrontpic + predef GetMonFrontpic ld a, [wMenuBorderTopCoord] inc a ld b, a @@ -23,7 +23,7 @@ Pokepic:: ; 244e3 ld a, $80 ld [hGraphicStartTile], a lb bc, 7, 7 - predef Predef_PlaceGraphic + predef PlaceGraphic call WaitBGMap ret diff --git a/engine/events/print_unown.asm b/engine/events/print_unown.asm index 41f2bab9c..771d3ea5a 100644 --- a/engine/events/print_unown.asm +++ b/engine/events/print_unown.asm @@ -140,13 +140,13 @@ UnownPrinter: ; 16be4 xor a ld [wBoxAlignment], a ld de, vTiles2 - predef Predef_GetMonFrontpic + predef GetMonFrontpic call .Load2bppToSRAM hlcoord 1, 6 xor a ld [hGraphicStartTile], a lb bc, 7, 7 - predef Predef_PlaceGraphic + predef PlaceGraphic ld de, vTiles2 tile $31 farcall RotateUnownFrontpic ret @@ -228,6 +228,6 @@ PlaceUnownPrinterFrontpic: ; 16dac ld a, $31 ld [hGraphicStartTile], a lb bc, 7, 7 - predef Predef_PlaceGraphic + predef PlaceGraphic ret ; 16dc7 diff --git a/engine/events/special.asm b/engine/events/special.asm index 62e0a620e..6238acc44 100755 --- a/engine/events/special.asm +++ b/engine/events/special.asm @@ -12,7 +12,7 @@ Special_GiveShuckle: ; 7305 ld a, 15 ld [CurPartyLevel], a - predef Predef_TryAddMonToParty + predef TryAddMonToParty jr nc, .NotGiven ; Caught data. |