From a60df1f71b39882df041bc2ca525e5c6f4dc576a Mon Sep 17 00:00:00 2001 From: FosterProgramming Date: Thu, 18 Dec 2025 19:02:35 +0100 Subject: [PATCH] Remove another unused deoxys function (#8576) --- include/pokemon.h | 1 - src/pokemon.c | 57 ----------------------------------------------- 2 files changed, 58 deletions(-) diff --git a/include/pokemon.h b/include/pokemon.h index bc6af2a48e..9ca2743300 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -723,7 +723,6 @@ void CreateBattleTowerMon_HandleLevel(struct Pokemon *mon, struct BattleTowerPok void CreateApprenticeMon(struct Pokemon *mon, const struct Apprentice *src, u8 monId); void CreateMonWithEVSpreadNatureOTID(struct Pokemon *mon, u16 species, u8 level, u8 nature, u8 fixedIV, u8 evSpread, u32 otId); void ConvertPokemonToBattleTowerPokemon(struct Pokemon *mon, struct BattleTowerPokemon *dest); -bool8 ShouldIgnoreDeoxysForm(u8 caseId, u8 battler); u16 GetUnionRoomTrainerPic(void); enum TrainerClassID GetUnionRoomTrainerClass(void); void CreateEnemyEventMon(void); diff --git a/src/pokemon.c b/src/pokemon.c index 2f237cba6f..9567c22636 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -1554,63 +1554,6 @@ static void CreateEventMon(struct Pokemon *mon, u16 species, u8 level, u8 fixedI SetMonData(mon, MON_DATA_MODERN_FATEFUL_ENCOUNTER, &isModernFatefulEncounter); } -// If FALSE, should load this game's Deoxys form. If TRUE, should load normal Deoxys form -bool8 ShouldIgnoreDeoxysForm(u8 caseId, u8 battler) -{ - switch (caseId) - { - case 0: - default: - return FALSE; - case 1: // Player's side in battle - if (!(gBattleTypeFlags & BATTLE_TYPE_MULTI)) - return FALSE; - if (!gMain.inBattle) - return FALSE; - if (gLinkPlayers[GetMultiplayerId()].id == battler) - return FALSE; - break; - case 2: - break; - case 3: // Summary Screen - if (!(gBattleTypeFlags & BATTLE_TYPE_MULTI)) - return FALSE; - if (!gMain.inBattle) - return FALSE; - if (battler == 1 || battler == 4 || battler == 5) - return TRUE; - return FALSE; - case 4: - break; - case 5: // In move animation, e.g. in Role Play or Snatch - if (gBattleTypeFlags & BATTLE_TYPE_LINK) - { - if (!gMain.inBattle) - return FALSE; - if (gBattleTypeFlags & BATTLE_TYPE_MULTI) - { - if (gLinkPlayers[GetMultiplayerId()].id == battler) - return FALSE; - } - else - { - if (IsOnPlayerSide(battler)) - return FALSE; - } - } - else - { - if (!gMain.inBattle) - return FALSE; - if (IsOnPlayerSide(battler)) - return FALSE; - } - break; - } - - return TRUE; -} - u16 GetUnionRoomTrainerPic(void) { u8 linkId;