diff options
Diffstat (limited to 'engine/battle')
| -rw-r--r-- | engine/battle/ai/items.asm | 4 | ||||
| -rwxr-xr-x | engine/battle/ai/move.asm | 2 | ||||
| -rw-r--r-- | engine/battle/ai/scoring.asm | 2 | ||||
| -rwxr-xr-x | engine/battle/ai/switch.asm | 16 | ||||
| -rwxr-xr-x | engine/battle/anim_hp_bar.asm | 10 | ||||
| -rw-r--r-- | engine/battle/battle_transition.asm | 2 | ||||
| -rw-r--r-- | engine/battle/core.asm | 148 | ||||
| -rw-r--r-- | engine/battle/effect_commands.asm | 40 | ||||
| -rwxr-xr-x | engine/battle/effect_commands/attract.asm | 4 | ||||
| -rw-r--r-- | engine/battle/misc.asm | 2 | ||||
| -rwxr-xr-x | engine/battle/read_trainer_party.asm | 8 | ||||
| -rw-r--r-- | engine/battle/returntobattle_useball.asm | 4 | ||||
| -rw-r--r-- | engine/battle/start_battle.asm | 2 |
13 files changed, 122 insertions, 122 deletions
diff --git a/engine/battle/ai/items.asm b/engine/battle/ai/items.asm index 5bdc070ec..d0867fb33 100644 --- a/engine/battle/ai/items.asm +++ b/engine/battle/ai/items.asm @@ -545,7 +545,7 @@ AI_Items: ; 39196 AIUpdateHUD: ; 38387 call UpdateEnemyMonInParty - farcall Predef_UpdateEnemyHUD + farcall UpdateEnemyHUD ld a, $1 ld [hBGMapMode], a ld hl, wEnemyItemState @@ -664,7 +664,7 @@ EnemyPotionFinish: ; 38436 xor a ld [wWhichHPBar], a call AIUsedItemSound - predef Predef_AnimateHPBar + predef AnimateHPBar jp AIUpdateHUD diff --git a/engine/battle/ai/move.asm b/engine/battle/ai/move.asm index d04fb9930..27a8ad5a5 100755 --- a/engine/battle/ai/move.asm +++ b/engine/battle/ai/move.asm @@ -92,7 +92,7 @@ AIChooseMove: ; 440ce push bc ld d, BANK(TrainerClassAttributes) - predef Predef_SmallFarFlagAction + predef SmallFarFlagAction ld d, c pop bc diff --git a/engine/battle/ai/scoring.asm b/engine/battle/ai/scoring.asm index c1d175c38..73284435a 100644 --- a/engine/battle/ai/scoring.asm +++ b/engine/battle/ai/scoring.asm @@ -1488,7 +1488,7 @@ AI_Smart_Encore: ; 38c3b push hl ld a, [wEnemyMoveStruct + MOVE_TYPE] ld hl, EnemyMonType1 - predef Predef_CheckTypeMatchup + predef CheckTypeMatchup pop hl ld a, [wd265] diff --git a/engine/battle/ai/switch.asm b/engine/battle/ai/switch.asm index cb278676e..c2f83fa1f 100755 --- a/engine/battle/ai/switch.asm +++ b/engine/battle/ai/switch.asm @@ -28,7 +28,7 @@ CheckPlayerMoveTypeMatchups: ; 3484e inc hl call GetMoveByte ld hl, EnemyMonType - call Predef_CheckTypeMatchup + call CheckTypeMatchup ld a, [wTypeMatchup] cp 10 + 1 ; 1.0 + 0.1 jr nc, .super_effective @@ -73,7 +73,7 @@ CheckPlayerMoveTypeMatchups: ; 3484e ld a, [BattleMonType1] ld b, a ld hl, EnemyMonType1 - call Predef_CheckTypeMatchup + call CheckTypeMatchup ld a, [wTypeMatchup] cp 10 + 1 ; 1.0 + 0.1 jr c, .ok @@ -82,7 +82,7 @@ CheckPlayerMoveTypeMatchups: ; 3484e ld a, [BattleMonType2] cp b jr z, .ok2 - call Predef_CheckTypeMatchup + call CheckTypeMatchup ld a, [wTypeMatchup] cp 10 + 1 ; 1.0 + 0.1 jr c, .ok2 @@ -123,7 +123,7 @@ CheckPlayerMoveTypeMatchups: ; 3484e inc hl call GetMoveByte ld hl, BattleMonType1 - call Predef_CheckTypeMatchup + call CheckTypeMatchup ld a, [wTypeMatchup] ; immune @@ -390,7 +390,7 @@ FindEnemyMonsImmuneToLastCounterMove: ; 34a2a inc hl call GetMoveByte ld hl, BaseType - call Predef_CheckTypeMatchup + call CheckTypeMatchup ld a, [wTypeMatchup] and a jr nz, .next @@ -481,7 +481,7 @@ FindEnemyMonsWithASuperEffectiveMove: ; 34aa7 inc hl call GetMoveByte ld hl, BattleMonType1 - call Predef_CheckTypeMatchup + call CheckTypeMatchup ; if immune or not very effective: continue ld a, [wTypeMatchup] @@ -585,7 +585,7 @@ FindEnemyMonsThatResistPlayer: ; 34b20 .skip_move ld a, [BattleMonType1] ld hl, BaseType - call Predef_CheckTypeMatchup + call CheckTypeMatchup ld a, [wTypeMatchup] cp 10 + 1 jr nc, .dont_choose_mon @@ -593,7 +593,7 @@ FindEnemyMonsThatResistPlayer: ; 34b20 .check_type ld hl, BaseType - call Predef_CheckTypeMatchup + call CheckTypeMatchup ld a, [wTypeMatchup] cp 10 + 1 jr nc, .dont_choose_mon diff --git a/engine/battle/anim_hp_bar.asm b/engine/battle/anim_hp_bar.asm index d67a46a70..71276d27e 100755 --- a/engine/battle/anim_hp_bar.asm +++ b/engine/battle/anim_hp_bar.asm @@ -67,7 +67,7 @@ _AnimateHPBar: ; d627 ld a, [hli] ld b, a pop hl - call Predef_ComputeHPBarPixels + call ComputeHPBarPixels ld a, e ld [wCurHPBarPixels], a @@ -79,7 +79,7 @@ _AnimateHPBar: ; d627 ld e, a ld a, [wCurHPAnimMaxHP + 1] ld d, a - call Predef_ComputeHPBarPixels + call ComputeHPBarPixels ld a, e ld [wNewHPBarPixels], a @@ -183,11 +183,11 @@ LongAnim_UpdateVariables: ; d6f5 ld c, a ld a, [hli] ld b, a - ; This routine is buggy. The result from Predef_ComputeHPBarPixels is stored + ; This routine is buggy. The result from ComputeHPBarPixels is stored ; in e. However, the pop de opcode deletes this result before it is even ; used. The game then proceeds as though it never deleted that output. ; To fix, uncomment the line below. - call Predef_ComputeHPBarPixels + call ComputeHPBarPixels ; ld a, e pop bc pop de @@ -227,7 +227,7 @@ LongHPBarAnim_UpdateTiles: ; d749 ld e, a ld a, [wCurHPAnimMaxHP + 1] ld d, a - call Predef_ComputeHPBarPixels + call ComputeHPBarPixels ld c, e ld d, HP_BAR_LENGTH ld a, [wWhichHPBar] diff --git a/engine/battle/battle_transition.asm b/engine/battle/battle_transition.asm index f035867b5..1409ddc37 100644 --- a/engine/battle/battle_transition.asm +++ b/engine/battle/battle_transition.asm @@ -1,4 +1,4 @@ -Predef_DoBattleTransition: ; 8c20f +DoBattleTransition: ; 8c20f call .InitGFX ld a, [rBGP] ld [wBGP], a diff --git a/engine/battle/core.asm b/engine/battle/core.asm index cf9c821b7..5d79f5fd5 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -47,7 +47,7 @@ DoBattle: ; 3c000 .player_2 call LoadTileMapToTempTileMap - call Predef_CheckPlayerPartyForFitPkmn + call CheckPlayerPartyForFitPkmn ld a, d and a jp z, LostBattle @@ -1278,7 +1278,7 @@ HandleWrap: ; 3c874 xor a ld [wNumHits], a ld [FXAnimID + 1], a - predef Predef_PlayBattleAnim + predef PlayBattleAnim call SwitchTurnCore .skip_anim @@ -2040,7 +2040,7 @@ UpdateHPBar: ; 3cd3c .ok push bc ld [wWhichHPBar], a - predef Predef_AnimateHPBar + predef AnimateHPBar pop bc ret ; 3cd55 @@ -2054,7 +2054,7 @@ HandleEnemyMonFaint: ; 3cd55 xor a ld [wWhichMonFaintedFirst], a call UpdateBattleStateAndExperienceAfterEnemyFaint - call Predef_CheckPlayerPartyForFitPkmn + call CheckPlayerPartyForFitPkmn ld a, d and a jp z, LostBattle @@ -2062,7 +2062,7 @@ HandleEnemyMonFaint: ; 3cd55 ld hl, BattleMonHP ld a, [hli] or [hl] - call nz, Predef_UpdatePlayerHUD + call nz, UpdatePlayerHUD ld a, $1 ld [hBGMapMode], a @@ -2186,7 +2186,7 @@ UpdateBattleStateAndExperienceAfterEnemyFaint: ; 3ce01 call PlayerMonFaintHappinessMod .player_mon_did_not_faint - call Predef_CheckPlayerPartyForFitPkmn + call CheckPlayerPartyForFitPkmn ld a, d and a ret z @@ -2670,7 +2670,7 @@ HandlePlayerMonFaint: ; 3d14e ld a, $1 ld [wWhichMonFaintedFirst], a call PlayerMonFaintHappinessMod - call Predef_CheckPlayerPartyForFitPkmn + call CheckPlayerPartyForFitPkmn ld a, d and a jp z, LostBattle @@ -2716,7 +2716,7 @@ PlayerMonFaintHappinessMod: ; 3d1aa ld c, a ld hl, wBattleParticipantsNotFainted ld b, RESET_FLAG - predef Predef_SmallFarFlagAction + predef SmallFarFlagAction ld hl, EnemySubStatus3 res SUBSTATUS_IN_LOOP, [hl] xor a @@ -3313,10 +3313,10 @@ AddBattleParticipant: ; 3d581 ld hl, wBattleParticipantsNotFainted ld b, SET_FLAG push bc - predef Predef_SmallFarFlagAction + predef SmallFarFlagAction pop bc ld hl, wBattleParticipantsIncludingFainted - predef_jump Predef_SmallFarFlagAction + predef_jump SmallFarFlagAction ; 3d599 FindPkmnInOTPartyToSwitchIntoBattle: ; 3d599 @@ -3534,7 +3534,7 @@ LoadEnemyPkmnToSwitchTo: ; 3d6ca and a jr nz, .skip_unown ld hl, EnemyMonDVs - predef Predef_GetUnownLetter + predef GetUnownLetter ld a, [UnownLetter] ld [wFirstUnownSeen], a .skip_unown @@ -3644,8 +3644,8 @@ Function_SetEnemyPkmnAndSendOutAnimation: ; 3d7c7 call GetBaseData ld a, OTPARTYMON ld [MonType], a - predef Predef_CopyPkmnToTempMon - call Predef_GetEnemyMonFrontpic + predef CopyPkmnToTempMon + call GetEnemyMonFrontpic xor a ld [wNumHits], a @@ -3670,7 +3670,7 @@ Function_SetEnemyPkmnAndSendOutAnimation: ; 3d7c7 hlcoord 12, 0 ld d, $0 ld e, ANIM_MON_SLOW - predef Predef_AnimateFrontpic + predef AnimateFrontpic jr .skip_cry .cry_no_anim @@ -3680,7 +3680,7 @@ Function_SetEnemyPkmnAndSendOutAnimation: ; 3d7c7 call PlayStereoCry .skip_cry - call Predef_UpdateEnemyHUD + call UpdateEnemyHUD ld a, $1 ld [hBGMapMode], a ret @@ -3721,7 +3721,7 @@ ResetEnemyStatLevels: ; 3d867 ret ; 3d873 -Predef_CheckPlayerPartyForFitPkmn: ; 3d873 +CheckPlayerPartyForFitPkmn: ; 3d873 ; Has the player any Pkmn in his Party that can fight? ld a, [PartyCount] ld e, a @@ -4124,7 +4124,7 @@ SwitchPlayerMon: ; 3db32 SendOutPlayerMon: ; 3db5f ld hl, BattleMonDVs - predef Predef_GetUnownLetter + predef GetUnownLetter hlcoord 1, 5 ld b, 7 ld c, 8 @@ -4132,7 +4132,7 @@ SendOutPlayerMon: ; 3db5f call WaitBGMap xor a ld [hBGMapMode], a - call Predef_GetBattleMonBackpic + call GetBattleMonBackpic xor a ld [hGraphicStartTile], a ld [wBattleMenuCursorBuffer], a @@ -4172,7 +4172,7 @@ SendOutPlayerMon: ; 3db5f call PlayStereoCry .statused - call Predef_UpdatePlayerHUD + call UpdatePlayerHUD ld a, $1 ld [hBGMapMode], a ret @@ -4218,13 +4218,13 @@ BreakAttraction: ; 3dc18 SpikesDamage: ; 3dc23 ld hl, PlayerScreens ld de, BattleMonType - ld bc, Predef_UpdatePlayerHUD + ld bc, UpdatePlayerHUD ld a, [hBattleTurn] and a jr z, .ok ld hl, EnemyScreens ld de, EnemyMonType - ld bc, Predef_UpdateEnemyHUD + ld bc, UpdateEnemyHUD .ok bit SCREENS_SPIKES, [hl] @@ -4306,7 +4306,7 @@ PursuitSwitch: ; 3dc5b ld c, a ld hl, wBattleParticipantsNotFainted ld b, RESET_FLAG - predef Predef_SmallFarFlagAction + predef SmallFarFlagAction call PlayerMonFaintedAnimation ld hl, BattleText_PkmnFainted jr .done_fainted @@ -4455,7 +4455,7 @@ HandleHPHealingItem: ; 3dd2f .got_hp_bar_coords ld [wWhichHPBar], a - predef Predef_AnimateHPBar + predef AnimateHPBar UseOpponentItem: call RefreshBattleHuds callfar GetOpponentItem @@ -4478,7 +4478,7 @@ ItemRecoveryAnim: ; 3ddc8 xor a ld [wNumHits], a ld [FXAnimID + 1], a - predef Predef_PlayBattleAnim + predef PlayBattleAnim call SwitchTurnCore pop bc pop de @@ -4708,7 +4708,7 @@ UpdateBattleHUDs: ; 3df2c ret ; 3df48 -Predef_UpdatePlayerHUD:: ; 3df48 +UpdatePlayerHUD:: ; 3df48 push hl push de push bc @@ -4741,7 +4741,7 @@ DrawPlayerHUD: ; 3df58 ld b, 1 xor a ; PARTYMON ld [MonType], a - predef Predef_DrawPlayerHP + predef DrawPlayerHP ; Exp bar push de @@ -4754,7 +4754,7 @@ DrawPlayerHUD: ; 3df58 hlcoord 10, 11 ld a, [TempMonLevel] ld b, a - call Predef_FillInExpBar + call FillInExpBar pop de ret ; 3df98 @@ -4823,7 +4823,7 @@ PrintPlayerHUD: ; 3dfbf ld a, TEMPMON ld [MonType], a - callfar Predef_GetGender + callfar GetGender ld a, " " jr c, .got_gender_char ld a, "♂" @@ -4837,7 +4837,7 @@ PrintPlayerHUD: ; 3dfbf push af ; back up gender push hl ld de, BattleMonStatus - predef Predef_PlaceNonFaintStatus + predef PlaceNonFaintStatus pop hl pop bc ret nz @@ -4852,7 +4852,7 @@ PrintPlayerHUD: ; 3dfbf jp PrintLevel ; 3e036 -Predef_UpdateEnemyHUD:: ; 3e036 +UpdateEnemyHUD:: ; 3e036 push hl push de push bc @@ -4901,7 +4901,7 @@ DrawEnemyHUD: ; 3e043 ld a, TEMPMON ld [MonType], a - callfar Predef_GetGender + callfar GetGender ld a, " " jr c, .got_gender ld a, "♂" @@ -4916,7 +4916,7 @@ DrawEnemyHUD: ; 3e043 push af push hl ld de, EnemyMonStatus - predef Predef_PlaceNonFaintStatus + predef PlaceNonFaintStatus pop hl pop bc jr nz, .skip_level @@ -5141,8 +5141,8 @@ BattleMenu_Pack: ; 3e1c7 call ClearPalettes call DelayFrame call _LoadBattleFontsHPBar - call Predef_GetBattleMonBackpic - call Predef_GetEnemyMonFrontpic + call GetBattleMonBackpic + call GetEnemyMonFrontpic call ExitMenu call WaitBGMap call FinishBattleAnim @@ -5174,10 +5174,10 @@ BattleMenu_Pack: ; 3e1c7 ld a, [BattleType] cp BATTLETYPE_TUTORIAL jr z, .tutorial2 - call Predef_GetBattleMonBackpic + call GetBattleMonBackpic .tutorial2 - call Predef_GetEnemyMonFrontpic + call GetEnemyMonFrontpic ld a, $1 ld [wMenuCursorY], a call ExitMenu @@ -5531,7 +5531,7 @@ MoveSelectionScreen: ; 3e4bc .got_start_coord ld a, SCREEN_WIDTH ld [Buffer1], a - predef Predef_ListMoves + predef ListMoves ld b, 5 ld a, [wMoveSelectionMenuType] @@ -5864,7 +5864,7 @@ MoveInfoBox: ; 3e6c8 ld a, [wPlayerMoveStruct + MOVE_ANIM] ld b, a hlcoord 2, 10 - predef Predef_PrintMoveType + predef PrintMoveType .done ret @@ -6319,7 +6319,7 @@ LoadEnemyMon: ; 3e8eb ; Get letter based on DVs ld hl, EnemyMonDVs - predef Predef_GetUnownLetter + predef GetUnownLetter ; Can't use any letters that haven't been unlocked ; If combined with forced shiny battletype, causes an infinite loop call CheckUnownLetter @@ -6408,7 +6408,7 @@ LoadEnemyMon: ; 3e8eb ld de, EnemyMonMaxHP ld b, FALSE ld hl, EnemyMonDVs - (MON_DVS - MON_STAT_EXP + 1) ; LinkBattleRNs + 7 ; ? - predef Predef_CalcPkmnStats + predef CalcPkmnStats ; If we're in a trainer battle, ; get the rest of the parameters from the party struct @@ -6523,7 +6523,7 @@ LoadEnemyMon: ; 3e8eb ; Make sure the predef knows this isn't a partymon ld [wEvolutionOldSpecies], a ; Fill moves based on level - predef Predef_FillMoves + predef FillMoves .PP: ; Trainer battle? @@ -6534,7 +6534,7 @@ LoadEnemyMon: ; 3e8eb ; Fill wild PP ld hl, EnemyMonMoves ld de, EnemyMonPP - predef Predef_FillPP + predef FillPP jr .Finish .TrainerPP: @@ -6587,7 +6587,7 @@ LoadEnemyMon: ; 3e8eb ld c, a ld b, SET_FLAG ld hl, PokedexSeen - predef Predef_SmallFarFlagAction + predef SmallFarFlagAction ld hl, EnemyMonStats ld de, EnemyStats @@ -6715,7 +6715,7 @@ BattleWinSlideInEnemyTrainerFrontpic: ; 3ebd8 ld a, [OtherTrainerClass] ld [TrainerClass], a ld de, vTiles2 - callfar Predef_GetTrainerPic + callfar GetTrainerPic hlcoord 19, 0 ld c, 0 @@ -7192,7 +7192,7 @@ Call_PlayBattleAnim: ; 3ee17 ld a, d ld [FXAnimID + 1], a call WaitBGMap - predef_jump Predef_PlayBattleAnim + predef_jump PlayBattleAnim ; 3ee27 FinishBattleAnim: ; 3ee27 @@ -7240,7 +7240,7 @@ GiveExperiencePoints: ; 3ee3b ld c, a ld b, CHECK_FLAG ld d, $0 - predef Predef_SmallFarFlagAction + predef SmallFarFlagAction ld a, c and a pop bc @@ -7418,7 +7418,7 @@ GiveExperiencePoints: ; 3ee3b .not_max_exp xor a ; PARTYMON ld [MonType], a - predef Predef_CopyPkmnToTempMon + predef CopyPkmnToTempMon callfar CalcLevel pop bc ld hl, MON_LEVEL @@ -7455,7 +7455,7 @@ GiveExperiencePoints: ; 3ee3b add hl, bc push bc ld b, TRUE - predef Predef_CalcPkmnStats + predef CalcPkmnStats pop bc pop de ld hl, MON_MAXHP + 1 @@ -7508,7 +7508,7 @@ GiveExperiencePoints: ; 3ee3b call ApplyStatLevelMultiplierOnAllStats callfar ApplyStatusEffectOnPlayerStats callfar BadgeStatBoosts - callfar Predef_UpdatePlayerHUD + callfar UpdatePlayerHUD call EmptyBattleTextBox call LoadTileMapToTempTileMap ld a, $1 @@ -7531,14 +7531,14 @@ GiveExperiencePoints: ; 3ee3b .skip_animation2 xor a ; PARTYMON ld [MonType], a - predef Predef_CopyPkmnToTempMon + predef CopyPkmnToTempMon hlcoord 9, 0 ld b, $a ld c, $9 call TextBox hlcoord 11, 1 ld bc, 4 - predef Predef_PrintTempMonStats + predef PrintTempMonStats ld c, $1e call DelayFrames call WaitPressAorB_BlinkCursor @@ -7558,7 +7558,7 @@ GiveExperiencePoints: ; 3ee3b ld a, b ld [CurPartyLevel], a push bc - predef Predef_LearnLevelMoves + predef LearnLevelMoves pop bc ld a, b cp c @@ -7569,7 +7569,7 @@ GiveExperiencePoints: ; 3ee3b ld a, [CurPartyMon] ld c, a ld b, SET_FLAG - predef Predef_SmallFarFlagAction + predef SmallFarFlagAction pop af ld [CurPartyLevel], a @@ -7691,7 +7691,7 @@ AnimateExpBar: ; 3f136 ld [wd002], a xor a ; PARTYMON ld [MonType], a - predef Predef_CopyPkmnToTempMon + predef CopyPkmnToTempMon ld a, [TempMonLevel] ld b, a ld e, a @@ -8062,7 +8062,7 @@ Unreferenced_HandleSafariAngerEatingStatus: jp StdBattleTextBox ; 3f390 -Predef_FillInExpBar: ; 3f390 +FillInExpBar: ; 3f390 push hl call CalcExpBar pop hl @@ -8204,7 +8204,7 @@ PlaceExpBar: ; 3f41c ret ; 3f43d -Predef_GetBattleMonBackpic: ; 3f43d +GetBattleMonBackpic: ; 3f43d ld a, [PlayerSubStatus4] bit SUBSTATUS_SUBSTITUTE, a ld hl, BattleAnimCmd_RaiseSub @@ -8220,9 +8220,9 @@ DropPlayerSub: ; 3f447 ld a, [BattleMonSpecies] ld [CurPartySpecies], a ld hl, BattleMonDVs - predef Predef_GetUnownLetter + predef GetUnownLetter ld de, vTiles2 tile $31 - predef Predef_GetMonBackpic + predef GetMonBackpic pop af ld [CurPartySpecies], a ret @@ -8240,7 +8240,7 @@ GetBattleMonBackpic_DoAnim: ; 3f46f ret ; 3f47c -Predef_GetEnemyMonFrontpic: ; 3f47c +GetEnemyMonFrontpic: ; 3f47c ld a, [EnemySubStatus4] bit SUBSTATUS_SUBSTITUTE, a ld hl, BattleAnimCmd_RaiseSub @@ -8259,9 +8259,9 @@ DropEnemySub: ; 3f486 ld [CurPartySpecies], a call GetBaseData ld hl, EnemyMonDVs - predef Predef_GetUnownLetter + predef GetUnownLetter ld de, vTiles2 - predef Predef_GetAnimatedFrontpic + predef GetAnimatedFrontpic pop af ld [CurPartySpecies], a ret @@ -8278,7 +8278,7 @@ GetEnemyMonFrontpic_DoAnim: ; 3f4b4 ret ; 3f4c1 -Predef_StartBattle: ; 3f4c1 +StartBattle: ; 3f4c1 ; This check prevents you from entering a battle without any Pokemon. ; Those using walk-through-walls to bypass getting a Pokemon experience ; the effects of this check. @@ -8337,7 +8337,7 @@ BattleIntro: ; 3f4dd call ClearSprites ld a, [wBattleMode] cp WILD_BATTLE - call z, Predef_UpdateEnemyHUD + call z, UpdateEnemyHUD ld a, $1 ld [hBGMapMode], a ret @@ -8402,14 +8402,14 @@ InitEnemyTrainer: ; 3f594 .ok ld de, vTiles2 - callfar Predef_GetTrainerPic + callfar GetTrainerPic xor a ld [hGraphicStartTile], a dec a ld [wEnemyItemState], a hlcoord 12, 0 lb bc, 7, 7 - predef Predef_PlaceGraphic + predef PlaceGraphic ld a, -1 ld [CurOTMon], a ld a, TRAINER_BATTLE @@ -8455,7 +8455,7 @@ InitEnemyWildmon: ; 3f607 ld bc, NUM_MOVES call CopyBytes ld hl, EnemyMonDVs - predef Predef_GetUnownLetter + predef GetUnownLetter ld a, [CurPartySpecies] cp UNOWN jr nz, .skip_unown @@ -8466,13 +8466,13 @@ InitEnemyWildmon: ; 3f607 ld [wFirstUnownSeen], a .skip_unown ld de, vTiles2 - predef Predef_GetAnimatedFrontpic + predef GetAnimatedFrontpic xor a ld [TrainerClass], a ld [hGraphicStartTile], a hlcoord 12, 0 lb bc, 7, 7 - predef Predef_PlaceGraphic + predef PlaceGraphic ret ; 3f662 @@ -8551,7 +8551,7 @@ ExitBattle: ; 3f69e call CheckPayDay xor a ld [wForceEvolution], a - predef Predef_EvolveAfterBattle + predef EvolveAfterBattle farcall GivePokerusAndConvertBerries ret ; 3f6d0 @@ -9225,7 +9225,7 @@ InitBattleDisplay: ; 3fb6c ld [hGraphicStartTile], a hlcoord 2, 6 lb bc, 6, 6 - predef Predef_PlaceGraphic + predef PlaceGraphic xor a ld [hWY], a ld [rWY], a @@ -9297,8 +9297,8 @@ GetTrainerBackpic: ; 3fbff .Decompress: ld de, vTiles2 tile $31 - ld c, $31 - predef Predef_Decompress + ld c, 7 * 7 + predef DecompressGet2bpp ret ; 3fc30 @@ -9320,7 +9320,7 @@ CopyBackpic: ; 3fc30 ld [hGraphicStartTile], a hlcoord 2, 6 lb bc, 6, 6 - predef Predef_PlaceGraphic + predef PlaceGraphic ret ; 3fc5b @@ -9400,7 +9400,7 @@ BattleStartMessage: ; 3fc8b hlcoord 12, 0 ld d, $0 ld e, ANIM_MON_NORMAL - predef Predef_AnimateFrontpic + predef AnimateFrontpic jr .skip_cry ; cry is played during the animation .cry_no_anim diff --git a/engine/battle/effect_commands.asm b/engine/battle/effect_commands.asm index c46ded638..801ce211e 100644 --- a/engine/battle/effect_commands.asm +++ b/engine/battle/effect_commands.asm @@ -182,7 +182,7 @@ CheckPlayerTurn: call StdBattleTextBox call CantMove call UpdateBattleMonInParty - ld hl, Predef_UpdatePlayerHUD + ld hl, UpdatePlayerHUD call CallBattleCore ld a, $1 ld [hBGMapMode], a @@ -433,7 +433,7 @@ CheckEnemyTurn: ; 3421f call StdBattleTextBox call CantMove call UpdateEnemyMonInParty - ld hl, Predef_UpdateEnemyHUD + ld hl, UpdateEnemyHUD call CallBattleCore ld a, $1 ld [hBGMapMode], a @@ -672,7 +672,7 @@ HitConfusion: ; 343a5 and 1 << SUBSTATUS_FLYING | 1 << SUBSTATUS_UNDERGROUND call z, PlayFXAnimID - ld hl, Predef_UpdatePlayerHUD + ld hl, UpdatePlayerHUD call CallBattleCore ld a, $1 ld [hBGMapMode], a @@ -1538,11 +1538,11 @@ BattleCheckTypeMatchup: ; 347c8 ld hl, EnemyMonType1 ld a, [hBattleTurn] and a - jr z, Predef_CheckTypeMatchup + jr z, CheckTypeMatchup ld hl, BattleMonType1 -Predef_CheckTypeMatchup: ; 347d3 +CheckTypeMatchup: ; 347d3 ; There is an incorrect assumption about this function made in the AI related code: when -; the AI calls Predef_CheckTypeMatchup (not BattleCheckTypeMatchup), it assumes that placing +; the AI calls CheckTypeMatchup (not BattleCheckTypeMatchup), it assumes that placing ; the offensive type in a will make this function do the right thing. Since a is overwritten, ; this assumption is incorrect. A simple fix would be to load the move type for the ; current move into a in BattleCheckTypeMatchup, before falling through, which is @@ -2621,7 +2621,7 @@ BattleCommand_CheckDestinyBond: ; 351c0 ld [Buffer6], a ld h, b ld l, c - predef Predef_AnimateHPBar + predef AnimateHPBar call RefreshBattleHuds call BattleCommand_SwitchTurn @@ -4015,7 +4015,7 @@ BattleCommand_PainSplit: ; 35926 ld a, $1 ld [wWhichHPBar], a hlcoord 10, 9 - predef Predef_AnimateHPBar + predef AnimateHPBar ld hl, EnemyMonHP ld a, [hli] ld [Buffer4], a @@ -4030,7 +4030,7 @@ BattleCommand_PainSplit: ; 35926 ld [wWhichHPBar], a call ResetDamage hlcoord 2, 2 - predef Predef_AnimateHPBar + predef AnimateHPBar farcall _UpdateBattleHUDs ld hl, SharedPainText @@ -4172,7 +4172,7 @@ BattleCommand_Conversion2: ; 359e6 ld a, [hl] ld [wNamedObjectIndexBuffer], a - predef Predef_GetTypeName + predef GetTypeName ld hl, TransformedTypeText jp StdBattleTextBox @@ -4711,7 +4711,7 @@ PlayFXAnimID: ; 35d08 ld c, 3 call DelayFrames - callfar Predef_PlayBattleAnim + callfar PlayBattleAnim ret @@ -4773,7 +4773,7 @@ EnemyHurtItself: ; 35d1c hlcoord 2, 2 xor a ld [wWhichHPBar], a - predef Predef_AnimateHPBar + predef AnimateHPBar .did_no_damage jp RefreshBattleHuds @@ -4833,7 +4833,7 @@ PlayerHurtItself: ; 35d7e hlcoord 10, 9 ld a, $1 ld [wWhichHPBar], a - predef Predef_AnimateHPBar + predef AnimateHPBar .did_no_damage jp RefreshBattleHuds @@ -5301,7 +5301,7 @@ SapHealth: ; 36011 xor a .hp_bar ld [wWhichHPBar], a - predef Predef_AnimateHPBar + predef AnimateHPBar call RefreshBattleHuds jp UpdateBattleMonInParty @@ -6239,11 +6239,11 @@ BattleCommand_Curl: ; 365a7 BattleCommand_RaiseSubNoAnim: ; 365af - ld hl, Predef_GetBattleMonBackpic + ld hl, GetBattleMonBackpic ld a, [hBattleTurn] and a jr z, .PlayerTurn - ld hl, Predef_GetEnemyMonFrontpic + ld hl, GetEnemyMonFrontpic .PlayerTurn: xor a ld [hBGMapMode], a @@ -7525,7 +7525,7 @@ BattleCommand_Recoil: ; 36cb2 xor a .animate_hp_bar ld [wWhichHPBar], a - predef Predef_AnimateHPBar + predef AnimateHPBar call RefreshBattleHuds ld hl, RecoilText jp StdBattleTextBox @@ -8227,7 +8227,7 @@ BattleCommand_Conversion: ; 3707f inc de ld [de], a ld [wNamedObjectIndexBuffer], a - farcall Predef_GetTypeName + farcall GetTypeName call AnimateCurrentMove ld hl, TransformedTypeText jp StdBattleTextBox @@ -9856,7 +9856,7 @@ PlayUserBattleAnim: ; 37e47 push hl push de push bc - callfar Predef_PlayBattleAnim + callfar PlayBattleAnim pop bc pop de pop hl @@ -9878,7 +9878,7 @@ PlayOpponentBattleAnim: ; 37e54 push bc call BattleCommand_SwitchTurn - callfar Predef_PlayBattleAnim + callfar PlayBattleAnim call BattleCommand_SwitchTurn pop bc diff --git a/engine/battle/effect_commands/attract.asm b/engine/battle/effect_commands/attract.asm index fc73d234c..0a6d7c975 100755 --- a/engine/battle/effect_commands/attract.asm +++ b/engine/battle/effect_commands/attract.asm @@ -35,7 +35,7 @@ CheckOppositeGender: ; 377f5 xor a ld [MonType], a - farcall Predef_GetGender + farcall GetGender jr c, .genderless_samegender ld b, 1 @@ -58,7 +58,7 @@ CheckOppositeGender: ; 377f5 ld [TempMonDVs + 1], a ld a, 3 ld [MonType], a - farcall Predef_GetGender + farcall GetGender pop bc jr c, .genderless_samegender diff --git a/engine/battle/misc.asm b/engine/battle/misc.asm index 40c472e50..a41d31d9a 100644 --- a/engine/battle/misc.asm +++ b/engine/battle/misc.asm @@ -33,7 +33,7 @@ AppearUser: ; fbd77 (3e:7d77) ld a, $31 .okay ld [hGraphicStartTile], a - predef Predef_PlaceGraphic + predef PlaceGraphic FinishAppearDisappearUser: ; fbd91 (3e:7d91) ld a, $1 ld [hBGMapMode], a diff --git a/engine/battle/read_trainer_party.asm b/engine/battle/read_trainer_party.asm index 4f3dc8e55..a09c6dd08 100755 --- a/engine/battle/read_trainer_party.asm +++ b/engine/battle/read_trainer_party.asm @@ -103,7 +103,7 @@ TrainerType1: ; 397eb ld a, OTPARTYMON ld [MonType], a push hl - predef Predef_TryAddMonToParty + predef TryAddMonToParty pop hl jr .loop ; 39806 @@ -124,7 +124,7 @@ TrainerType2: ; 39806 ld [MonType], a push hl - predef Predef_TryAddMonToParty + predef TryAddMonToParty ld a, [OTPartyCount] dec a ld hl, OTPartyMon1Moves @@ -200,7 +200,7 @@ TrainerType3: ; 39871 ld a, OTPARTYMON ld [MonType], a push hl - predef Predef_TryAddMonToParty + predef TryAddMonToParty ld a, [OTPartyCount] dec a ld hl, OTPartyMon1Item @@ -231,7 +231,7 @@ TrainerType4: ; 3989d ld [MonType], a push hl - predef Predef_TryAddMonToParty + predef TryAddMonToParty ld a, [OTPartyCount] dec a ld hl, OTPartyMon1Item diff --git a/engine/battle/returntobattle_useball.asm b/engine/battle/returntobattle_useball.asm index 4254d24f4..e6e33f900 100644 --- a/engine/battle/returntobattle_useball.asm +++ b/engine/battle/returntobattle_useball.asm @@ -4,13 +4,13 @@ _ReturnToBattle_UseBall: ; 2715c ld a, [BattleType] cp BATTLETYPE_TUTORIAL jr z, .gettutorialbackpic - farcall Predef_GetBattleMonBackpic + farcall GetBattleMonBackpic jr .continue .gettutorialbackpic farcall GetTrainerBackpic .continue - farcall Predef_GetEnemyMonFrontpic + farcall GetEnemyMonFrontpic farcall _LoadBattleFontsHPBar call GetMemSGBLayout call CloseWindow diff --git a/engine/battle/start_battle.asm b/engine/battle/start_battle.asm index b97eda1b3..e1377eec0 100644 --- a/engine/battle/start_battle.asm +++ b/engine/battle/start_battle.asm @@ -33,7 +33,7 @@ FindFirstAliveMonAndStartBattle: ; 2ee2f add hl, de ld a, [hl] ld [BattleMonLevel], a - predef Predef_DoBattleTransition + predef DoBattleTransition farcall _LoadBattleFontsHPBar ld a, 1 ld [hBGMapMode], a |