dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

battle_gfx_sfx_util sync emerald names to unnamed syms

Browse Source
This commit is contained in:
PikalaxALT
2021-03-15 19:32:49 -04:00
parent c6563b78c0
commit 81da6acff5
14 changed files with 70 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/battle_gfx_sfx_util.h
+1 -1
View File
@@ -9,7 +9,7 @@ void InitAndLaunchChosenStatusAnimation(bool8 isStatus2, u32 status);
bool8 TryHandleLaunchBattleTableAnimation(u8 activeBattler, u8 atkBattler, u8 defBattler, u8 tableId, u16 argument);
void InitAndLaunchSpecialAnimation(u8 activeBattler, u8 atkBattler, u8 defBattler, u8 tableId);
bool8 IsMoveWithoutAnimation(u16 moveId, u8 animationTurn);
bool8 mplay_80342A4(u8 battlerId);
bool8 IsBattleSEPlaying(u8 battlerId);
void BattleLoadOpponentMonSpriteGfx(struct Pokemon *mon, u8 battlerId);
void BattleLoadPlayerMonSpriteGfx(struct Pokemon *mon, u8 battlerId);
void DecompressGhostFrontPic(struct Pokemon *unused, u8 battlerId);
include/battle_main.h
+1 -1
View File
@@ -76,7 +76,7 @@ void SpriteCB_FaintOpponentMon(struct Sprite *sprite);
void SpriteCb_ShowAsMoveTarget(struct Sprite *sprite);
void SpriteCb_HideAsMoveTarget(struct Sprite *sprite);
void SpriteCB_AllyMon(struct Sprite *sprite);
void sub_8012100(struct Sprite *sprite);
void SpriteCB_SetToDummy3(struct Sprite *sprite);
void SpriteCB_FaintSlideAnim(struct Sprite *sprite);
void DoBounceEffect(u8 battler, u8 which, s8 delta, s8 amplitude);
void EndBounceEffect(u8 battler, u8 which);
include/pokemon.h
+1 -1
View File
@@ -446,7 +446,7 @@ bool8 IsMonShiny(struct Pokemon *mon);
u8 *GetTrainerPartnerName(void);
u8 GetPlayerPartyHighestLevel(void);
u16 FacilityClassToPicIndex(u16 facilityClass);
bool8 sub_804455C(u8 caseId, u8 battlerId);
bool8 ShouldIgnoreDeoxysForm(u8 caseId, u8 battlerId);
void SetDeoxysStats(void);
u16 sub_80447AC(void);
u16 sub_80447F0(void);
src/battle_anim_mons.c
+2 -2
View File
@@ -1874,7 +1874,7 @@ u8 sub_80768D0(u16 species, bool8 isBackpic, u8 a3, s16 x, s16 y, u8 subpriority
if (!isBackpic)
{
LoadCompressedPalette(GetMonSpritePalFromSpeciesAndPersonality(species, trainerId, personality), (palette * 0x10) + 0x100, 0x20);
if (a10 == 1 || sub_804455C(5, battlerId) == 1 || gBattleSpritesDataPtr->battlerData[battlerId].transformSpecies != 0)
if (a10 == 1 || ShouldIgnoreDeoxysForm(5, battlerId) == 1 || gBattleSpritesDataPtr->battlerData[battlerId].transformSpecies != 0)
LoadSpecialPokePic_DontHandleDeoxys(&gMonFrontPicTable[species],
gMonSpritesGfxPtr->field_17C,
species,
@@ -1890,7 +1890,7 @@ u8 sub_80768D0(u16 species, bool8 isBackpic, u8 a3, s16 x, s16 y, u8 subpriority
else
{
LoadCompressedPalette(GetMonSpritePalFromSpeciesAndPersonality(species, trainerId, personality), (palette * 0x10) + 0x100, 0x20);
if (a10 == 1 || sub_804455C(5, battlerId) == 1 || gBattleSpritesDataPtr->battlerData[battlerId].transformSpecies != 0)
if (a10 == 1 || ShouldIgnoreDeoxysForm(5, battlerId) == 1 || gBattleSpritesDataPtr->battlerData[battlerId].transformSpecies != 0)
LoadSpecialPokePic_DontHandleDeoxys(&gMonBackPicTable[species],
gMonSpritesGfxPtr->field_17C,
species,
src/battle_controller_link_opponent.c
+4 -4
View File
@@ -1229,7 +1229,7 @@ static void LinkOpponentHandlePause(void)
static void LinkOpponentHandleMoveAnimation(void)
{
if (!mplay_80342A4(gActiveBattler))
if (!IsBattleSEPlaying(gActiveBattler))
{
u16 move = gBattleBufferA[gActiveBattler][1] | (gBattleBufferA[gActiveBattler][2] << 8);
@@ -1380,7 +1380,7 @@ static void LinkOpponentHandleExpUpdate(void)
static void LinkOpponentHandleStatusIconUpdate(void)
{
if (!mplay_80342A4(gActiveBattler))
if (!IsBattleSEPlaying(gActiveBattler))
{
u8 battlerId;
@@ -1393,7 +1393,7 @@ static void LinkOpponentHandleStatusIconUpdate(void)
static void LinkOpponentHandleStatusAnimation(void)
{
if (!mplay_80342A4(gActiveBattler))
if (!IsBattleSEPlaying(gActiveBattler))
{
InitAndLaunchChosenStatusAnimation(gBattleBufferA[gActiveBattler][1],
gBattleBufferA[gActiveBattler][2] | (gBattleBufferA[gActiveBattler][3] << 8) | (gBattleBufferA[gActiveBattler][4] << 16) | (gBattleBufferA[gActiveBattler][5] << 24));
@@ -1636,7 +1636,7 @@ static void LinkOpponentHandleSpriteInvisibility(void)
static void LinkOpponentHandleBattleAnimation(void)
{
if (!mplay_80342A4(gActiveBattler))
if (!IsBattleSEPlaying(gActiveBattler))
{
u8 animationId = gBattleBufferA[gActiveBattler][1];
u16 argument = gBattleBufferA[gActiveBattler][2] | (gBattleBufferA[gActiveBattler][3] << 8);
src/battle_controller_link_partner.c
+4 -4
View File
@@ -1142,7 +1142,7 @@ static void LinkPartnerHandlePause(void)
static void LinkPartnerHandleMoveAnimation(void)
{
if (!mplay_80342A4(gActiveBattler))
if (!IsBattleSEPlaying(gActiveBattler))
{
u16 move = gBattleBufferA[gActiveBattler][1] | (gBattleBufferA[gActiveBattler][2] << 8);
@@ -1293,7 +1293,7 @@ static void LinkPartnerHandleExpUpdate(void)
static void LinkPartnerHandleStatusIconUpdate(void)
{
if (!mplay_80342A4(gActiveBattler))
if (!IsBattleSEPlaying(gActiveBattler))
{
u8 battlerId;
@@ -1306,7 +1306,7 @@ static void LinkPartnerHandleStatusIconUpdate(void)
static void LinkPartnerHandleStatusAnimation(void)
{
if (!mplay_80342A4(gActiveBattler))
if (!IsBattleSEPlaying(gActiveBattler))
{
InitAndLaunchChosenStatusAnimation(gBattleBufferA[gActiveBattler][1],
gBattleBufferA[gActiveBattler][2] | (gBattleBufferA[gActiveBattler][3] << 8) | (gBattleBufferA[gActiveBattler][4] << 16) | (gBattleBufferA[gActiveBattler][5] << 24));
@@ -1551,7 +1551,7 @@ static void LinkPartnerHandleSpriteInvisibility(void)
static void LinkPartnerHandleBattleAnimation(void)
{
if (!mplay_80342A4(gActiveBattler))
if (!IsBattleSEPlaying(gActiveBattler))
{
u8 animationId = gBattleBufferA[gActiveBattler][1];
u16 argument = gBattleBufferA[gActiveBattler][2] | (gBattleBufferA[gActiveBattler][3] << 8);
src/battle_controller_opponent.c
+4 -4
View File
@@ -1231,7 +1231,7 @@ static void OpponentHandlePause(void)
static void OpponentHandleMoveAnimation(void)
{
if (!mplay_80342A4(gActiveBattler))
if (!IsBattleSEPlaying(gActiveBattler))
{
u16 move = gBattleBufferA[gActiveBattler][1] | (gBattleBufferA[gActiveBattler][2] << 8);
@@ -1479,7 +1479,7 @@ static void OpponentHandleExpUpdate(void)
static void OpponentHandleStatusIconUpdate(void)
{
if (!mplay_80342A4(gActiveBattler))
if (!IsBattleSEPlaying(gActiveBattler))
{
u8 battlerId;
@@ -1492,7 +1492,7 @@ static void OpponentHandleStatusIconUpdate(void)
static void OpponentHandleStatusAnimation(void)
{
if (!mplay_80342A4(gActiveBattler))
if (!IsBattleSEPlaying(gActiveBattler))
{
InitAndLaunchChosenStatusAnimation(gBattleBufferA[gActiveBattler][1],
gBattleBufferA[gActiveBattler][2] | (gBattleBufferA[gActiveBattler][3] << 8) | (gBattleBufferA[gActiveBattler][4] << 16) | (gBattleBufferA[gActiveBattler][5] << 24));
@@ -1738,7 +1738,7 @@ static void OpponentHandleSpriteInvisibility(void)
static void OpponentHandleBattleAnimation(void)
{
if (!mplay_80342A4(gActiveBattler))
if (!IsBattleSEPlaying(gActiveBattler))
{
u8 animationId = gBattleBufferA[gActiveBattler][1];
u16 argument = gBattleBufferA[gActiveBattler][2] | (gBattleBufferA[gActiveBattler][3] << 8);
src/battle_controller_player.c
+4 -4
View File
@@ -2296,7 +2296,7 @@ static void PlayerHandlePause(void)
static void PlayerHandleMoveAnimation(void)
{
if (!mplay_80342A4(gActiveBattler))
if (!IsBattleSEPlaying(gActiveBattler))
{
u16 move = gBattleBufferA[gActiveBattler][1] | (gBattleBufferA[gActiveBattler][2] << 8);
@@ -2528,7 +2528,7 @@ static void PlayerHandleExpUpdate(void)
static void PlayerHandleStatusIconUpdate(void)
{
if (!mplay_80342A4(gActiveBattler))
if (!IsBattleSEPlaying(gActiveBattler))
{
u8 battlerId;
@@ -2541,7 +2541,7 @@ static void PlayerHandleStatusIconUpdate(void)
static void PlayerHandleStatusAnimation(void)
{
if (!mplay_80342A4(gActiveBattler))
if (!IsBattleSEPlaying(gActiveBattler))
{
InitAndLaunchChosenStatusAnimation(gBattleBufferA[gActiveBattler][1],
gBattleBufferA[gActiveBattler][2] | (gBattleBufferA[gActiveBattler][3] << 8) | (gBattleBufferA[gActiveBattler][4] << 16) | (gBattleBufferA[gActiveBattler][5] << 24));
@@ -2817,7 +2817,7 @@ static void PlayerHandleSpriteInvisibility(void)
static void PlayerHandleBattleAnimation(void)
{
if (!mplay_80342A4(gActiveBattler))
if (!IsBattleSEPlaying(gActiveBattler))
{
u8 animationId = gBattleBufferA[gActiveBattler][1];
u16 argument = gBattleBufferA[gActiveBattler][2] | (gBattleBufferA[gActiveBattler][3] << 8);
src/battle_controller_pokedude.c
+2 -2
View File
@@ -2055,7 +2055,7 @@ static void PokedudeHandleExpUpdate(void)
static void PokedudeHandleStatusIconUpdate(void)
{
if (!mplay_80342A4(gActiveBattler))
if (!IsBattleSEPlaying(gActiveBattler))
{
u8 battlerId;
struct Pokemon *mon;
@@ -2073,7 +2073,7 @@ static void PokedudeHandleStatusIconUpdate(void)
static void PokedudeHandleStatusAnimation(void)
{
if (!mplay_80342A4(gActiveBattler))
if (!IsBattleSEPlaying(gActiveBattler))
{
InitAndLaunchChosenStatusAnimation(gBattleBufferA[gActiveBattler][1],
gBattleBufferA[gActiveBattler][2] | (gBattleBufferA[gActiveBattler][3] << 8) | (gBattleBufferA[gActiveBattler][4] << 16) | (gBattleBufferA[gActiveBattler][5] << 24));
src/battle_gfx_sfx_util.c
+4 -4
View File
@@ -140,14 +140,14 @@ void SpriteCB_WaitForBattlerBallReleaseAnim(struct Sprite *sprite)
gSprites[spriteId].animPaused = 0;
else if (gSprites[spriteId].animEnded)
{
gSprites[spriteId].callback = sub_8012100;
gSprites[spriteId].callback = SpriteCB_SetToDummy3;
StartSpriteAffineAnim(&gSprites[spriteId], 0);
sprite->callback = SpriteCallbackDummy;
}
}
// not used
static void sub_8033EB0(struct Sprite *sprite, bool8 arg1)
UNUSED static void UnusedDoBattleSpriteAffineAnim(struct Sprite *sprite, bool8 arg1)
{
sprite->animPaused = 1;
sprite->callback = SpriteCallbackDummy;
@@ -290,7 +290,7 @@ bool8 IsMoveWithoutAnimation(u16 moveId, u8 animationTurn)
return FALSE;
}
bool8 mplay_80342A4(u8 battlerId)
bool8 IsBattleSEPlaying(u8 battlerId)
{
u8 zero = 0;
@@ -384,7 +384,7 @@ void BattleLoadPlayerMonSpriteGfx(struct Pokemon *mon, u8 battlerId)
}
otId = GetMonData(mon, MON_DATA_OT_ID);
position = GetBattlerPosition(battlerId);
if (sub_804455C(1, battlerId) == 1 || gBattleSpritesDataPtr->battlerData[battlerId].transformSpecies != SPECIES_NONE)
if (ShouldIgnoreDeoxysForm(1, battlerId) == TRUE || gBattleSpritesDataPtr->battlerData[battlerId].transformSpecies != SPECIES_NONE)
HandleLoadSpecialPokePic_DontHandleDeoxys(&gMonBackPicTable[species],
gMonSpritesGfxPtr->sprites[position],
species, currentPersonality);
src/battle_main.c
+1 -1
View File
@@ -2012,7 +2012,7 @@ static void oac_poke_ally_(struct Sprite *sprite)
}
}
void sub_8012100(struct Sprite *sprite)
void SpriteCB_SetToDummy3(struct Sprite *sprite)
{
sprite->callback = SpriteCallbackDummy3;
}
src/party_menu.c
+39 -39
View File
@@ -353,23 +353,23 @@ static void SlideMultiPartyMenuBoxSpritesOneStep(u8 taskId);
static void Task_MultiPartnerPartySlideIn(u8 taskId);
static bool8 CB2_FadeFromPartyMenu(void);
static void Task_PartyMenuWaitForFade(u8 taskId);
static void Task_OakOldManEnterParty_DarkenScreen(u8 taskId);
static void Task_OakOldManEnterParty_WaitDarken(u8 taskId);
static void Task_OakOldManEnterParty_CreatePrinter(u8 taskId);
static void Task_OakOldManEnterParty_RunPrinterMsg1(u8 taskId);
static void Task_OakOldManEnterParty_LightenFirstMonIcon(u8 taskId);
static void Task_OakOldManEnterParty_WaitLightenFirstMonIcon(u8 taskId);
static void Task_OakOldManEnterParty_StartPrintMsg2(u8 taskId);
static void Task_OakOldManEnterParty_RunPrinterMsg2(u8 taskId);
static void Task_OakOldManEnterParty_FadeNormal(u8 taskId);
static void Task_OakOldManEnterParty_WaitFadeNormal(u8 taskId);
static void Task_FirstBattleEnterParty_DarkenScreen(u8 taskId);
static void Task_FirstBattleEnterParty_WaitDarken(u8 taskId);
static void Task_FirstBattleEnterParty_CreatePrinter(u8 taskId);
static void Task_FirstBattleEnterParty_RunPrinterMsg1(u8 taskId);
static void Task_FirstBattleEnterParty_LightenFirstMonIcon(u8 taskId);
static void Task_FirstBattleEnterParty_WaitLightenFirstMonIcon(u8 taskId);
static void Task_FirstBattleEnterParty_StartPrintMsg2(u8 taskId);
static void Task_FirstBattleEnterParty_RunPrinterMsg2(u8 taskId);
static void Task_FirstBattleEnterParty_FadeNormal(u8 taskId);
static void Task_FirstBattleEnterParty_WaitFadeNormal(u8 taskId);
static void Task_PartyMenu_PokedudeStep(u8 taskId);
static void Task_PartyMenuFromBag_PokedudeStep(u8 taskId);
static bool8 PartyMenuPokedudeIsCancelled(u8 taskId);
static void PartyMenuHandlePokedudeCancel(void);
static void PartyMenu_OakOldMan_PrintText(u8 windowId, const u8 *str);
static u8 OakOldManEnterParty_CreateWindowAndMsg1Printer(void);
static void OakOldManEnterParty_DestroyVoiceoverWindow(u8 windowId);
static u8 FirstBattleEnterParty_CreateWindowAndMsg1Printer(void);
static void FirstBattleEnterParty_DestroyVoiceoverWindow(u8 windowId);
static void SetSwitchedPartyOrderQuestLogEvent(void);
static void SetUsedFieldMoveQuestLogEvent(struct Pokemon *mon, u8 fieldMove);
static void sub_8124DE0(void);
@@ -1957,76 +1957,76 @@ static bool8 CanLearnTutorMove(u16 species, u8 tutor)
// Tutorial battle messages
static void Task_OakOldManEnterParty_WaitFadeIn(u8 taskId)
static void Task_FirstBattleEnterParty_WaitFadeIn(u8 taskId)
{
if (!gPaletteFade.active)
gTasks[taskId].func = Task_OakOldManEnterParty_DarkenScreen;
gTasks[taskId].func = Task_FirstBattleEnterParty_DarkenScreen;
}
static void Task_OakOldManEnterParty_DarkenScreen(u8 taskId)
static void Task_FirstBattleEnterParty_DarkenScreen(u8 taskId)
{
BeginNormalPaletteFade(0xFFFF1FFF, 4, 0, 6, RGB_BLACK);
gTasks[taskId].func = Task_OakOldManEnterParty_WaitDarken;
gTasks[taskId].func = Task_FirstBattleEnterParty_WaitDarken;
}
static void Task_OakOldManEnterParty_WaitDarken(u8 taskId)
static void Task_FirstBattleEnterParty_WaitDarken(u8 taskId)
{
if (!gPaletteFade.active)
gTasks[taskId].func = Task_OakOldManEnterParty_CreatePrinter;
gTasks[taskId].func = Task_FirstBattleEnterParty_CreatePrinter;
}
static void Task_OakOldManEnterParty_CreatePrinter(u8 taskId)
static void Task_FirstBattleEnterParty_CreatePrinter(u8 taskId)
{
gTasks[taskId].data[0] = OakOldManEnterParty_CreateWindowAndMsg1Printer();
gTasks[taskId].func = Task_OakOldManEnterParty_RunPrinterMsg1;
gTasks[taskId].data[0] = FirstBattleEnterParty_CreateWindowAndMsg1Printer();
gTasks[taskId].func = Task_FirstBattleEnterParty_RunPrinterMsg1;
}
static void Task_OakOldManEnterParty_RunPrinterMsg1(u8 taskId)
static void Task_FirstBattleEnterParty_RunPrinterMsg1(u8 taskId)
{
s16 *data = gTasks[taskId].data;
if (RunTextPrinters_CheckActive((u8)data[0]) != TRUE)
gTasks[taskId].func = Task_OakOldManEnterParty_LightenFirstMonIcon;
gTasks[taskId].func = Task_FirstBattleEnterParty_LightenFirstMonIcon;
}
static void Task_OakOldManEnterParty_LightenFirstMonIcon(u8 taskId)
static void Task_FirstBattleEnterParty_LightenFirstMonIcon(u8 taskId)
{
BeginNormalPaletteFade(0xFFFF0008, 4, 6, 0, RGB_BLACK);
gTasks[taskId].func = Task_OakOldManEnterParty_WaitLightenFirstMonIcon;
gTasks[taskId].func = Task_FirstBattleEnterParty_WaitLightenFirstMonIcon;
}
static void Task_OakOldManEnterParty_WaitLightenFirstMonIcon(u8 taskId)
static void Task_FirstBattleEnterParty_WaitLightenFirstMonIcon(u8 taskId)
{
if (!gPaletteFade.active)
gTasks[taskId].func = Task_OakOldManEnterParty_StartPrintMsg2;
gTasks[taskId].func = Task_FirstBattleEnterParty_StartPrintMsg2;
}
static void Task_OakOldManEnterParty_StartPrintMsg2(u8 taskId)
static void Task_FirstBattleEnterParty_StartPrintMsg2(u8 taskId)
{
s16 *data = gTasks[taskId].data;
PartyMenu_OakOldMan_PrintText(data[0], gText_OakThisIsListOfPokemon);
gTasks[taskId].func = Task_OakOldManEnterParty_RunPrinterMsg2;
gTasks[taskId].func = Task_FirstBattleEnterParty_RunPrinterMsg2;
}
static void Task_OakOldManEnterParty_RunPrinterMsg2(u8 taskId)
static void Task_FirstBattleEnterParty_RunPrinterMsg2(u8 taskId)
{
s16 *data = gTasks[taskId].data;
if (RunTextPrinters_CheckActive((u8)data[0]) != TRUE)
{
OakOldManEnterParty_DestroyVoiceoverWindow((u8)data[0]);
gTasks[taskId].func = Task_OakOldManEnterParty_FadeNormal;
FirstBattleEnterParty_DestroyVoiceoverWindow((u8)data[0]);
gTasks[taskId].func = Task_FirstBattleEnterParty_FadeNormal;
}
}
static void Task_OakOldManEnterParty_FadeNormal(u8 taskId)
static void Task_FirstBattleEnterParty_FadeNormal(u8 taskId)
{
BeginNormalPaletteFade(0x0000FFF7, 4, 6, 0, RGB_BLACK);
gTasks[taskId].func = Task_OakOldManEnterParty_WaitFadeNormal;
gTasks[taskId].func = Task_FirstBattleEnterParty_WaitFadeNormal;
}
static void Task_OakOldManEnterParty_WaitFadeNormal(u8 taskId)
static void Task_FirstBattleEnterParty_WaitFadeNormal(u8 taskId)
{
if (!gPaletteFade.active)
{
@@ -2623,7 +2623,7 @@ static void PartyMenu_OakOldMan_PrintText(u8 windowId, const u8 *str)
AddTextPrinterParameterized2(windowId, 4, gStringVar4, GetTextSpeedSetting(), NULL, 2, 1, 3);
}
static bool8 OakOldManEnterParty_CreateWindowAndMsg1Printer(void)
static bool8 FirstBattleEnterParty_CreateWindowAndMsg1Printer(void)
{
u8 windowId = AddWindow(&sWindowTemplate_FirstBattleOakVoiceover);
@@ -2633,7 +2633,7 @@ static bool8 OakOldManEnterParty_CreateWindowAndMsg1Printer(void)
return windowId;
}
static void OakOldManEnterParty_DestroyVoiceoverWindow(u8 windowId)
static void FirstBattleEnterParty_DestroyVoiceoverWindow(u8 windowId)
{
ClearWindowTilemap(windowId);
ClearDialogWindowAndFrameToTransparent(windowId, FALSE);
@@ -5869,7 +5869,7 @@ void OpenPartyMenuInTutorialBattle(u8 partyAction)
partyAction,
FALSE,
PARTY_MSG_NONE,
Task_OakOldManEnterParty_WaitFadeIn,
Task_FirstBattleEnterParty_WaitFadeIn,
SetCB2ToReshowScreenAfterMenu);
BtlCtrl_OakOldMan_SetState2Flag(FIRST_BATTLE_MSG_FLAG_PARTY_MENU);
}
@@ -5910,7 +5910,7 @@ void EnterPartyFromItemMenuInBattle(void)
PARTY_ACTION_USE_ITEM,
FALSE,
PARTY_MSG_NONE,
Task_OakOldManEnterParty_WaitFadeIn,
Task_FirstBattleEnterParty_WaitFadeIn,
CB2_BagMenuFromBattle);
BtlCtrl_OakOldMan_SetState2Flag(FIRST_BATTLE_MSG_FLAG_PARTY_MENU);
}
src/pokemon.c
+1 -1
View File
@@ -5909,7 +5909,7 @@ u16 FacilityClassToPicIndex(u16 facilityClass)
return gFacilityClassToPicIndex[facilityClass];
}
bool8 sub_804455C(u8 caseId, u8 battlerId)
bool8 ShouldIgnoreDeoxysForm(u8 caseId, u8 battlerId)
{
switch (caseId)
{
src/pokemon_summary_screen.c
+2 -2
View File
@@ -4002,7 +4002,7 @@ static void sub_813995C(void)
}
else
{
if (sub_804455C(3, sLastViewedMonIndex))
if (ShouldIgnoreDeoxysForm(3, sLastViewedMonIndex))
spriteId = CreateMonPicSprite(species, trainerId, personality, 1, 60, 65, 12, 0xffff, 1);
else
spriteId = CreateMonPicSprite_HandleDeoxys(species, trainerId, personality, 1, 60, 65, 12, 0xffff);
@@ -4130,7 +4130,7 @@ static void sub_8139DBC(void)
}
else
{
if (sub_804455C(3, sLastViewedMonIndex))
if (ShouldIgnoreDeoxysForm(3, sLastViewedMonIndex))
sMonSummaryScreen->unk3014 = CreateMonIcon(species, SpriteCallbackDummy, 24, 32, 0, personality, 0);
else
sMonSummaryScreen->unk3014 = CreateMonIcon(species, SpriteCallbackDummy, 24, 32, 0, personality, 1);