diff --git a/asm/macros/battle_anim_script.inc b/asm/macros/battle_anim_script.inc index bdc1197486..a98a344fa1 100644 --- a/asm/macros/battle_anim_script.inc +++ b/asm/macros/battle_anim_script.inc @@ -283,7 +283,7 @@ .macro jumpretfalse ptr:req jumpreteq FALSE, \ptr .endm - + .macro jumpifdoublebattle ptr:req createvisualtask AnimTask_IsDoubleBattle, 0 jumprettrue \ptr @@ -305,7 +305,7 @@ .hword \launchtemplatearg7 .hword \launchtemplatearg8 .endm - + .macro launchtask launchtaskPtr launchtaskPriority launchtaskArgsNo launchtaskarg0 launchtaskarg1 launchtaskarg2 launchtaskarg3 launchtaskarg4 launchtaskarg5 launchtaskarg6 launchtaskarg7 launchtaskarg8 .byte 0x3 .word \launchtaskPtr @@ -321,7 +321,7 @@ .hword \launchtaskarg7 .hword \launchtaskarg8 .endm - + .macro setblends setblends_value .byte 0xC .hword \setblends_value diff --git a/asm/macros/battle_frontier/battle_tower.inc b/asm/macros/battle_frontier/battle_tower.inc index 46bbc392f6..49e72e7446 100644 --- a/asm/macros/battle_frontier/battle_tower.inc +++ b/asm/macros/battle_frontier/battle_tower.inc @@ -89,15 +89,15 @@ setvar VAR_0x8004, BATTLE_TOWER_FUNC_SET_INTERVIEW_DATA special CallBattleTowerFunc .endm - + @Custom multi-battle commands - + .macro choose_mons fadescreen 1 special ChooseHalfPartyForBattle @ choose 3 mons for battle waitstate .endm - + .macro multi_do type:req, partnerId:req, partnerPicId:req special ReducePlayerPartyToSelectedMons setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA @@ -113,26 +113,26 @@ special CallFrontierUtilFunc special LoadPlayerParty .endm - + .macro multi_2_vs_2 trainer1Id:req, trainer1LoseText:req, trainer2Id:req, trainer2LoseText:req, partnerId:req, partnerPicId:req special SavePlayerParty trainerbattle TRAINER_BATTLE_SET_TRAINER_A, \trainer1Id, 0, NULL, \trainer1LoseText @ set first trainer mons trainerbattle TRAINER_BATTLE_SET_TRAINER_B, \trainer2Id, 0, NULL, \trainer2LoseText @ set second trainer mons multi_do MULTI_BATTLE_2_VS_2, \partnerId, \partnerPicId .endm - + .macro multi_2_vs_1 trainer1Id:req, trainer1LoseText:req, partnerId:req, partnerPicId:req special SavePlayerParty trainerbattle TRAINER_BATTLE_SET_TRAINER_A, \trainer1Id, 0, NULL, \trainer1LoseText @ set first trainer mons multi_do MULTI_BATTLE_2_VS_1, \partnerId, \partnerPicId .endm - + @ Wild mons need to be assigned to gEnemyParty 0 and 3 slots, other slots need to be cleared out. .macro multi_wild partnerId:req, partnerPicId:req special SavePlayerParty multi_do MULTI_BATTLE_2_VS_WILD, \partnerId, \partnerPicId .endm - + .macro multi_do_fixed type:req, partnerId:req, partnerPicId:req setvar VAR_0x8004, SPECIAL_BATTLE_MULTI setvar VAR_0x8005, \type @@ -144,20 +144,20 @@ special CallFrontierUtilFunc special LoadPlayerParty .endm - + .macro multi_fixed_2_vs_2 trainer1Id:req, trainer1LoseText:req, trainer2Id:req, trainer2LoseText:req, partnerId:req, partnerPicId:req special SavePlayerParty trainerbattle TRAINER_BATTLE_SET_TRAINER_A, \trainer1Id, 0, NULL, \trainer1LoseText @ set first trainer mons trainerbattle TRAINER_BATTLE_SET_TRAINER_B, \trainer2Id, 0, NULL, \trainer2LoseText @ set second trainer mons multi_do_fixed MULTI_BATTLE_2_VS_2, \partnerId, \partnerPicId .endm - + .macro multi_fixed_2_vs_1 trainer1Id:req, trainer1LoseText:req, partnerId:req, partnerPicId:req special SavePlayerParty trainerbattle TRAINER_BATTLE_SET_TRAINER_A, \trainer1Id, 0, NULL, \trainer1LoseText @ set first trainer mons multi_do_fixed MULTI_BATTLE_2_VS_1, \partnerId, \partnerPicId .endm - + @ Wild mons need to be assigned to gEnemyParty 0 and 3 slots, other slots need to be cleared out. .macro multi_fixed_wild partnerId:req, partnerPicId:req special SavePlayerParty diff --git a/asm/macros/music_voice.inc b/asm/macros/music_voice.inc index 1460efe9e3..a4bbbcba63 100644 --- a/asm/macros/music_voice.inc +++ b/asm/macros/music_voice.inc @@ -150,13 +150,13 @@ .4byte \sample .byte 0xff, 0, 0xff, 0 .endm - + .macro cry_uncomp sample @ not compressed .byte 0x0, 60, 0, 0 .4byte \sample .byte 0xff, 0, 0xff, 0 .endm - + .macro cry_reverse_uncomp sample @ not compressed .byte 0x10, 60, 0, 0 .4byte \sample diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index f83d437a5d..a36eddb162 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -14196,7 +14196,7 @@ TerrainPulseElectric: createvisualtask AnimTask_SwayMon, 5, 0, 4, 51200, 24, ANIM_TARGET createvisualtask AnimTask_BlendColorCycle, 2, 4, 2, 2, 0, 12, RGB(27, 27, 0) goto TerrainPulseEnd - + TerrainPulseGrass: createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_DRAGON_PULSE, 0, 12, 12, RGB(11, 26, 11) waitforvisualfinish @@ -14218,7 +14218,7 @@ TerrainPulseFairy: createvisualtask AnimTask_SwayMon, 5, 0, 4, 51200, 24, ANIM_TARGET createvisualtask AnimTask_BlendColorCycle, 2, 4, 2, 2, 0, 12, RGB(31, 24, 31) goto TerrainPulseEnd - + TerrainPulsePsychic: createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_DRAGON_PULSE, 0, 12, 12, RGB(27, 0, 13) waitforvisualfinish @@ -24740,7 +24740,7 @@ General_RestoreBg: restorebg waitbgfadein end - + end General_ZMoveActivate: @@ -25263,8 +25263,8 @@ FinishSupersonicSkystrike: call UnsetPsychicBg waitforvisualfinish end - - + + Move_ACID_DOWNPOUR: loadspritegfx ANIM_TAG_BLUE_ORB @ reversal loadspritegfx ANIM_TAG_POISON_JAB @ poison jab @@ -25951,7 +25951,7 @@ NeverendingNightmareGeyser: createsprite gNeverEndingNightmareGeyserHexSpriteTemplate ANIM_TARGET, 2, ANIM_TARGET, 0xfff0, 0x10 return - + Move_CORKSCREW_CRASH:: loadspritegfx ANIM_TAG_SPIKES @metal bits loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT @charge @@ -26669,7 +26669,7 @@ HavocSpearSparkTarget: @ launchtemplate gSparkElectricityFlashingSpriteTemplate 0x4 0x8 0x0 0x0 0x20 0xc SOUND_PAN_ATTACKER 0x14 0x2 0x8000 launchtemplate gSparkElectricityFlashingSpriteTemplate 0x4 0x8 0x0 0x0 0x10 0xc SOUND_PAN_ATTACKER 0x14 0x2 0x8000 return - + Move_SHATTERED_PSYCHE:: loadspritegfx ANIM_TAG_IMPACT @hit @@ -29127,7 +29127,7 @@ OceanicOperettaExplosion: launchtemplate gOceanOperaExplosionSpriteTemplate 0x33 0x4 0x10 0x10 ANIM_TARGET 0x1 delay 0x6 return - + Move_SPLINTERED_STORMSHARDS:: loadspritegfx ANIM_TAG_ROCKS @rock @@ -29388,7 +29388,7 @@ SplinteredStormshardsFinishFadeReturn: return -Move_LETS_SNUGGLE_FOREVER:: +Move_LETS_SNUGGLE_FOREVER:: loadspritegfx ANIM_TAG_MAGENTA_HEART @sharm loadspritegfx ANIM_TAG_MUSIC_NOTES @music note loadspritegfx ANIM_TAG_SMALL_BUBBLES @fake tears diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 31c284e7dc..3c4b0ef2b7 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -511,7 +511,7 @@ BattleScript_BeakBlastSetUp:: setbeakblast BS_ATTACKER printstring STRINGID_EMPTYSTRING3 waitmessage 1 - playanimation BS_ATTACKER, B_ANIM_BEAK_BLAST_SETUP, NULL + playanimation BS_ATTACKER, B_ANIM_BEAK_BLAST_SETUP, NULL printstring STRINGID_HEATUPBEAK waitmessage B_WAIT_TIME_LONG end2 @@ -601,7 +601,7 @@ BattleScript_ScaleShotEnd:: moveendcase MOVEEND_SYNCHRONIZE_TARGET moveendfrom MOVEEND_STATUS_IMMUNITY_ABILITIES end - + BattleScript_EffectSkyDrop: jumpifstatus2 BS_ATTACKER, STATUS2_MULTIPLETURNS, BattleScript_SkyDropTurn2 attackcanceler @@ -5648,7 +5648,7 @@ BattleScript_EffectRolePlay:: pause 20 destroyabilitypopup pause 40 -.endif +.endif printstring STRINGID_PKMNCOPIEDFOE waitmessage B_WAIT_TIME_LONG switchinabilities BS_ATTACKER @@ -9625,7 +9625,7 @@ BattleScript_StatUpZMove:: waitmessage B_WAIT_TIME_LONG BattleScript_StatUpZMoveEnd: return - + BattleScript_HealReplacementZMove:: playanimation BS_SCRIPTING B_ANIM_WISH_HEAL 0x0 printfromtable gZEffectStringIds @@ -9836,7 +9836,7 @@ BattleScript_NeutralizingGasExitsLoop: jumpifbytenotequal gBattlerTarget, sByteFour, BattleScript_NeutralizingGasExitsLoop @ SOMEHOW, comparing to gBattlersCount is problematic. restoretarget return - + BattleScript_MagicianActivates:: call BattleScript_AbilityPopUp call BattleScript_ItemSteal diff --git a/include/constants/battle_anim.h b/include/constants/battle_anim.h index db2efd8d05..0cdb878dfa 100644 --- a/include/constants/battle_anim.h +++ b/include/constants/battle_anim.h @@ -461,7 +461,7 @@ #define BG_WATER_2 41 #define BG_POISON 42 #define BG_AEROBLAST 43 -#define BG_HURRICANE 44 +#define BG_HURRICANE 44 #define BG_ELECTRIC_TERRAIN 45 #define BG_GRASSY_TERRAIN 46 #define BG_MISTY_TERRAIN 47 diff --git a/include/constants/battle_string_ids.h b/include/constants/battle_string_ids.h index 4ef2a3a82d..4bce51a455 100644 --- a/include/constants/battle_string_ids.h +++ b/include/constants/battle_string_ids.h @@ -379,7 +379,7 @@ #define STRINGID_PKMNBOXLANETTESPCFULL 378 #define STRINGID_TRAINER1WINTEXT 379 #define STRINGID_TRAINER2WINTEXT 380 - + #define STRINGID_ENDUREDSTURDY 381 #define STRINGID_POWERHERB 382 #define STRINGID_HURTBYITEM 383 diff --git a/sound/direct_sound_data.inc b/sound/direct_sound_data.inc index 4ce03dbedd..95c96fc1ec 100644 --- a/sound/direct_sound_data.inc +++ b/sound/direct_sound_data.inc @@ -3978,7 +3978,7 @@ Cry_Spectrier:: .align 2 Cry_Calyrex:: .incbin "sound/direct_sound_samples/cries/calyrex.bin" -/* +/* .align 2 Cry_Wyrdeer:: .incbin "sound/direct_sound_samples/cries/wyrdeer.bin" diff --git a/src/battle_ai_switch_items.c b/src/battle_ai_switch_items.c index f2a2efe557..69ba581228 100644 --- a/src/battle_ai_switch_items.c +++ b/src/battle_ai_switch_items.c @@ -793,17 +793,17 @@ static bool32 AiExpectsToFaintPlayer(void) bool32 canFaintPlayer; u32 i; u8 target = gBattleStruct->aiChosenTarget[gActiveBattler]; - + if (gBattleStruct->aiMoveOrAction[gActiveBattler] > 3) return FALSE; // AI not planning to use move - + if (GetBattlerSide(target) != GetBattlerSide(gActiveBattler) && CanIndexMoveFaintTarget(gActiveBattler, target, gBattleStruct->aiMoveOrAction[gActiveBattler], 0) && AI_WhoStrikesFirst(gActiveBattler, target, GetAIChosenMove(gActiveBattler)) == AI_IS_FASTER) { // We expect to faint the target and move first -> dont use an item return TRUE; } - + return FALSE; } @@ -818,10 +818,10 @@ static bool8 ShouldUseItem(void) if ((gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER && GetBattlerPosition(gActiveBattler) == B_POSITION_PLAYER_RIGHT) || gStatuses3[gActiveBattler] & STATUS3_SKY_DROPPED) return FALSE; - + if (gStatuses3[gActiveBattler] & STATUS3_EMBARGO) return FALSE; - + if (AiExpectsToFaintPlayer()) return FALSE; @@ -948,14 +948,14 @@ static bool8 ShouldUseItem(void) static bool32 AI_ShouldHeal(u32 healAmount) { bool32 shouldHeal = FALSE; - + if (gBattleMons[gActiveBattler].hp < gBattleMons[gActiveBattler].maxHP / 4 || gBattleMons[gActiveBattler].hp == 0 || (healAmount != 0 && gBattleMons[gActiveBattler].maxHP - gBattleMons[gActiveBattler].hp > healAmount)) { // We have low enough HP to consider healing shouldHeal = !AI_OpponentCanFaintAiWithMod(healAmount); // if target can kill us even after we heal, why bother } - + return shouldHeal; } diff --git a/src/battle_ai_util.c b/src/battle_ai_util.c index 75964664e3..e1654eb30c 100644 --- a/src/battle_ai_util.c +++ b/src/battle_ai_util.c @@ -793,7 +793,7 @@ s32 AI_CalcDamage(u16 move, u8 battlerAtk, u8 battlerDef, u8 *typeEffectiveness, dmg *= 2; else if (move == MOVE_SURGING_STRIKES || (move == MOVE_WATER_SHURIKEN && gBattleMons[battlerAtk].species == SPECIES_GRENINJA_ASH)) dmg *= 3; - + if (dmg == 0) dmg = 1; } @@ -804,7 +804,7 @@ s32 AI_CalcDamage(u16 move, u8 battlerAtk, u8 battlerDef, u8 *typeEffectiveness, RestoreBattlerData(battlerAtk); RestoreBattlerData(battlerDef); - + // convert multiper to AI_EFFECTIVENESS_xX *typeEffectiveness = AI_GetEffectiveness(effectivenessMultiplier); @@ -1159,11 +1159,11 @@ bool32 AI_IsAbilityOnSide(u32 battlerId, u32 ability) s32 AI_GetAbility(u32 battlerId) { u32 knownAbility = GetBattlerAbility(battlerId); - + // The AI knows its own ability. if (IsBattlerAIControlled(battlerId)) return knownAbility; - + // Check neutralizing gas, gastro acid if (knownAbility == ABILITY_NONE) return knownAbility; @@ -1183,10 +1183,10 @@ s32 AI_GetAbility(u32 battlerId) { abilityGuess = gBaseStats[gBattleMons[battlerId].species].abilities[Random() % NUM_ABILITY_SLOTS]; } - + return abilityGuess; } - + return ABILITY_NONE; // Unknown. } @@ -2691,7 +2691,7 @@ static bool32 AI_CanPoisonType(u8 battlerAttacker, u8 battlerTarget) static bool32 AI_CanBePoisoned(u8 battlerAtk, u8 battlerDef) { u16 ability = AI_DATA->abilities[battlerDef]; - + if (!(AI_CanPoisonType(battlerAtk, battlerDef)) || gSideStatuses[GetBattlerSide(battlerDef)] & SIDE_STATUS_SAFEGUARD || gBattleMons[battlerDef].status1 & STATUS1_ANY @@ -3042,7 +3042,7 @@ bool32 IsValidDoubleBattle(u8 battlerAtk) u16 GetAllyChosenMove(u8 battlerId) { u8 partnerBattler = BATTLE_PARTNER(battlerId); - + if (!IsBattlerAlive(partnerBattler) || !IsBattlerAIControlled(partnerBattler)) return MOVE_NONE; else if (partnerBattler > battlerId) // Battler with the lower id chooses the move first. @@ -3444,7 +3444,7 @@ void IncreaseStatUpScore(u8 battlerAtk, u8 battlerDef, u8 statId, s16 *score) if (AI_DATA->hpPercents[battlerAtk] < 80 && AI_RandLessThan(128)) return; - + if ((AI_THINKING_STRUCT->aiFlags & AI_FLAG_TRY_TO_FAINT) && CanAIFaintTarget(battlerAtk, battlerDef, 0)) return; // Damaging moves would get a score boost from AI_TryToFaint or PreferStrongestMove so we don't consider them here @@ -3563,7 +3563,7 @@ void IncreaseParalyzeScore(u8 battlerAtk, u8 battlerDef, u16 move, s16 *score) { if ((AI_THINKING_STRUCT->aiFlags & AI_FLAG_TRY_TO_FAINT) && CanAIFaintTarget(battlerAtk, battlerDef, 0)) return; - + if (AI_CanParalyze(battlerAtk, battlerDef, AI_DATA->abilities[battlerDef], move, AI_DATA->partnerMove)) { u8 atkSpeed = GetBattlerTotalSpeedStat(battlerAtk); @@ -3584,7 +3584,7 @@ void IncreaseSleepScore(u8 battlerAtk, u8 battlerDef, u16 move, s16 *score) { if ((AI_THINKING_STRUCT->aiFlags & AI_FLAG_TRY_TO_FAINT) && CanAIFaintTarget(battlerAtk, battlerDef, 0)) return; - + if (AI_CanPutToSleep(battlerAtk, battlerDef, AI_DATA->abilities[battlerDef], move, AI_DATA->partnerMove)) *score += 2; else @@ -3602,7 +3602,7 @@ void IncreaseConfusionScore(u8 battlerAtk, u8 battlerDef, u16 move, s16 *score) { if ((AI_THINKING_STRUCT->aiFlags & AI_FLAG_TRY_TO_FAINT) && CanAIFaintTarget(battlerAtk, battlerDef, 0)) return; - + if (AI_CanConfuse(battlerAtk, battlerDef, AI_DATA->abilities[battlerDef], BATTLE_PARTNER(battlerAtk), move, AI_DATA->partnerMove) && AI_DATA->holdEffects[battlerDef] != HOLD_EFFECT_CURE_CONFUSION && AI_DATA->holdEffects[battlerDef] != HOLD_EFFECT_CURE_STATUS) @@ -3633,26 +3633,26 @@ bool32 ShouldUseZMove(u8 battlerAtk, u8 battlerDef, u16 chosenMove) return FALSE; //don't use z move on partner if (gBattleStruct->zmove.used[battlerAtk]) return FALSE; //cant use z move twice - + if (IsViableZMove(battlerAtk, chosenMove)) { u8 effectiveness; - + if (gBattleMons[battlerDef].ability == ABILITY_DISGUISE && gBattleMons[battlerDef].species == SPECIES_MIMIKYU) return FALSE; // Don't waste a Z-Move busting disguise if (gBattleMons[battlerDef].ability == ABILITY_ICE_FACE && gBattleMons[battlerDef].species == SPECIES_EISCUE && IS_MOVE_PHYSICAL(chosenMove)) return FALSE; // Don't waste a Z-Move busting Ice Face - + if (IS_MOVE_STATUS(chosenMove) && !IS_MOVE_STATUS(gBattleStruct->zmove.chosenZMove)) return FALSE; else if (!IS_MOVE_STATUS(chosenMove) && IS_MOVE_STATUS(gBattleStruct->zmove.chosenZMove)) return FALSE; - + if (!IS_MOVE_STATUS(chosenMove) && AI_CalcDamage(chosenMove, battlerAtk, battlerDef, &effectiveness, FALSE) >= gBattleMons[battlerDef].hp) return FALSE; // don't waste damaging z move if can otherwise faint target - + return TRUE; } - + return FALSE; } diff --git a/src/battle_anim.c b/src/battle_anim.c index 2806160149..509369789c 100644 --- a/src/battle_anim.c +++ b/src/battle_anim.c @@ -219,7 +219,7 @@ void LaunchBattleAnimation(const u8 *const animsTable[], u16 tableId, bool8 isMo { s32 i; bool32 hideHpBoxes = (tableId == MOVE_TRANSFORM) ? FALSE : TRUE; - + if (!isMoveAnim) { switch (tableId) diff --git a/src/battle_anim_effects_1.c b/src/battle_anim_effects_1.c index 048b37c660..93bb495241 100644 --- a/src/battle_anim_effects_1.c +++ b/src/battle_anim_effects_1.c @@ -6798,7 +6798,7 @@ static const union AffineAnimCmd sCompressTargetHorizontallyAffineAnimCmds[] = static void AnimTask_CompressTargetStep(u8 taskId) { struct Task* task = &gTasks[taskId]; - + if (!RunAffineAnimFromTaskData(task)) DestroyAnimVisualTask(taskId); } diff --git a/src/battle_anim_ghost.c b/src/battle_anim_ghost.c index 81cc6760c9..f21654e3e8 100644 --- a/src/battle_anim_ghost.c +++ b/src/battle_anim_ghost.c @@ -888,7 +888,7 @@ void AnimTask_DestinyBondWhiteShadow(u8 taskId) spriteId = CreateSprite(&gDarkVoidBlackHoleTemplate, baseX, baseY, 55); //dark void else spriteId = CreateSprite(&gDestinyBondWhiteShadowSpriteTemplate, baseX, baseY, 55); //destiny bond - + if (spriteId != MAX_SPRITES) { x = GetBattlerSpriteCoord(battler, BATTLER_COORD_X_2); @@ -914,7 +914,7 @@ void AnimTask_DestinyBondWhiteShadow(u8 taskId) spriteId = CreateSprite(&gDarkVoidBlackHoleTemplate, baseX, baseY, 55); //dark void else spriteId = CreateSprite(&gDestinyBondWhiteShadowSpriteTemplate, baseX, baseY, 55); //destiny bond - + if (spriteId != MAX_SPRITES) { x = 48; diff --git a/src/battle_anim_new.c b/src/battle_anim_new.c index 0a3d433b46..2134a8914d 100644 --- a/src/battle_anim_new.c +++ b/src/battle_anim_new.c @@ -85,7 +85,7 @@ static const union AffineAnimCmd sSquishTargetAffineAnimCmds[] = // GEN 4 // shadow sneak -const struct SpriteTemplate gShadowSneakImpactSpriteTemplate = +const struct SpriteTemplate gShadowSneakImpactSpriteTemplate = { .tileTag = ANIM_TAG_IMPACT, .paletteTag = ANIM_TAG_HANDS_AND_FEET, @@ -97,7 +97,7 @@ const struct SpriteTemplate gShadowSneakImpactSpriteTemplate = }; // power trick -const struct SpriteTemplate gPowerTrickSpriteTemplate = +const struct SpriteTemplate gPowerTrickSpriteTemplate = { .tileTag = ANIM_TAG_POWER_TRICK, .paletteTag = ANIM_TAG_POWER_TRICK, @@ -111,7 +111,7 @@ const struct SpriteTemplate gPowerTrickSpriteTemplate = //// GEN 5 //shell smash -const struct SpriteTemplate gShellSmashLeftShellSpriteTemplate = +const struct SpriteTemplate gShellSmashLeftShellSpriteTemplate = { .tileTag = ANIM_TAG_SHELL_RIGHT, .paletteTag = ANIM_TAG_SHELL_RIGHT, @@ -122,7 +122,7 @@ const struct SpriteTemplate gShellSmashLeftShellSpriteTemplate = .callback = AnimBite }; -const struct SpriteTemplate gShellSmashRightShellSpriteTemplate = +const struct SpriteTemplate gShellSmashRightShellSpriteTemplate = { .tileTag = ANIM_TAG_SHELL_LEFT, .paletteTag = ANIM_TAG_SHELL_LEFT, @@ -133,7 +133,7 @@ const struct SpriteTemplate gShellSmashRightShellSpriteTemplate = .callback = AnimBite }; -const struct SpriteTemplate gShellSmashPurpleRocksSpriteTemplate = +const struct SpriteTemplate gShellSmashPurpleRocksSpriteTemplate = { .tileTag = ANIM_TAG_ROCKS, .paletteTag = ANIM_TAG_SHELL_RIGHT, @@ -352,7 +352,7 @@ const struct SpriteTemplate gSimpleBeamBrownTemplate = .affineAnims = gDummySpriteAffineAnimTable, .callback = TranslateAnimSpriteToTargetMonLocation }; - + const struct SpriteTemplate gSimpleBeamPinkTemplate = { .tileTag = ANIM_TAG_GOLD_RING, @@ -411,12 +411,12 @@ const struct SpriteTemplate gQuickGuardArmImpactTemplate = }; //sky drop -static const union AffineAnimCmd sSkyDropFlyBallAffineAnimCmd_0[] = +static const union AffineAnimCmd sSkyDropFlyBallAffineAnimCmd_0[] = { - AFFINEANIMCMD_FRAME(0xa0, 0x100, 0x50, 0x0), + AFFINEANIMCMD_FRAME(0xa0, 0x100, 0x50, 0x0), AFFINEANIMCMD_END }; -static const union AffineAnimCmd *const sSkyDropFlyBallAffineAnimCmds[] = +static const union AffineAnimCmd *const sSkyDropFlyBallAffineAnimCmds[] = { sSkyDropFlyBallAffineAnimCmd_0 }; @@ -604,7 +604,7 @@ const struct SpriteTemplate gHornLeechHornTemplate = }; //dual chop -const struct SpriteTemplate gDualChopImpactTemplate = +const struct SpriteTemplate gDualChopImpactTemplate = { .tileTag = ANIM_TAG_IMPACT, .paletteTag = ANIM_TAG_POISON_BUBBLE, @@ -971,7 +971,7 @@ const struct SpriteTemplate gTechnoBlastIceBlastTemplate = .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = TranslateAnimSpriteToTargetMonLocation -}; +}; const struct SpriteTemplate gTechnoBlastIceSparkTemplate = { .tileTag = ANIM_TAG_SPARK_2, @@ -1202,7 +1202,7 @@ static const union AffineAnimCmd sSpriteAffineAnim_DrakeStrikePlayer[] = AFFINEANIMCMD_FRAME(0, 0, 0xb9, 1), AFFINEANIMCMD_END, }; -static const union AffineAnimCmd sSpriteAffineAnim_DrakeStrikeOpponent[] = +static const union AffineAnimCmd sSpriteAffineAnim_DrakeStrikeOpponent[] = { AFFINEANIMCMD_FRAME(0, 0, 0x50, 1), AFFINEANIMCMD_END, @@ -1270,15 +1270,15 @@ const struct SpriteTemplate gForestsCurseIngrainTemplate = }; //petal blizzard -static const union AnimCmd sAnimCmd_PetalBlizzard1_0[] = +static const union AnimCmd sAnimCmd_PetalBlizzard1_0[] = { ANIMCMD_FRAME(0, 10), ANIMCMD_JUMP(0), }; -static const union AnimCmd *const sAnimCmdTable_PetalBlizzard1[] = +static const union AnimCmd *const sAnimCmdTable_PetalBlizzard1[] = { sAnimCmd_PetalBlizzard1_0, -}; +}; const struct SpriteTemplate gPetalBlizzardTwister1Template = { .tileTag = ANIM_TAG_FLOWER, @@ -1290,13 +1290,13 @@ const struct SpriteTemplate gPetalBlizzardTwister1Template = .callback = AnimMoveTwisterParticle }; static const u16 sPetalBlizzardFlowerOam[] = {0x0, 0x2000,0x0800,0x0}; //todo: convert to oam data -static const union AnimCmd sAnimCmd_PetalBlizzard2_0[] = +static const union AnimCmd sAnimCmd_PetalBlizzard2_0[] = { ANIMCMD_FRAME(0, 4), ANIMCMD_FRAME(4, 0), ANIMCMD_END, }; -static const union AnimCmd *const sAnimCmdTable_PetalBlizzard2[] = +static const union AnimCmd *const sAnimCmdTable_PetalBlizzard2[] = { sAnimCmd_PetalBlizzard2_0, }; @@ -2040,7 +2040,7 @@ const struct SpriteTemplate gPrecipiceBladesPlumeTemplate = }; //dragon ascent -static const union AffineAnimCmd sAffineAnimCmd_Drake[] = +static const union AffineAnimCmd sAffineAnimCmd_Drake[] = { AFFINEANIMCMD_FRAME(0, 0, 0, 1), //drake faces up AFFINEANIMCMD_END, @@ -2837,7 +2837,7 @@ const struct SpriteTemplate gCoreEnforcerBeamTemplate = .callback = SpriteCB_CoreEnforcerBeam }; -const struct SpriteTemplate gCoreEnforcerExplosionTemplate = +const struct SpriteTemplate gCoreEnforcerExplosionTemplate = { .tileTag = ANIM_TAG_EXPLOSION, .paletteTag = ANIM_TAG_EXPLOSION, @@ -3009,7 +3009,7 @@ const struct SpriteTemplate gPrismaticLaserChargeTemplate = .affineAnims = gAffineAnims_GrowingElectricOrb, .callback = AnimGrowingChargeOrb }; - + const struct SpriteTemplate gPrismaticLaserYellowOutwardTemplate = { .tileTag = ANIM_TAG_GREEN_SPIKE, @@ -4111,7 +4111,7 @@ const struct SpriteTemplate gSteelBeamSpikeShardTemplate = // Z MOVES //activate -const struct SpriteTemplate gZMoveSymbolSpriteTemplate = +const struct SpriteTemplate gZMoveSymbolSpriteTemplate = { .tileTag = ANIM_TAG_Z_MOVE_SYMBOL, .paletteTag = ANIM_TAG_Z_MOVE_SYMBOL, @@ -4152,7 +4152,7 @@ const struct SpriteTemplate gYellowZMoveEnergySpriteTemplate = .callback = AnimEndureEnergy, }; // breakneck blitz -const struct SpriteTemplate gBreakneckBlitzDanceSpriteTemplate = +const struct SpriteTemplate gBreakneckBlitzDanceSpriteTemplate = { .tileTag = ANIM_TAG_HOLLOW_ORB, .paletteTag = ANIM_TAG_FLAT_ROCK, @@ -4162,7 +4162,7 @@ const struct SpriteTemplate gBreakneckBlitzDanceSpriteTemplate = .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimDragonDanceOrb }; -const struct SpriteTemplate gBreakneckBlitzHitSpriteTemplate = +const struct SpriteTemplate gBreakneckBlitzHitSpriteTemplate = { .tileTag = ANIM_TAG_IMPACT, .paletteTag = ANIM_TAG_FLAT_ROCK, @@ -4173,7 +4173,7 @@ const struct SpriteTemplate gBreakneckBlitzHitSpriteTemplate = .callback = AnimHitSplatBasic }; // all out pummelling -const struct SpriteTemplate gAllOutPummelingOnslaughtSpriteTemplate = +const struct SpriteTemplate gAllOutPummelingOnslaughtSpriteTemplate = { .tileTag = ANIM_TAG_HANDS_AND_FEET, .paletteTag = ANIM_TAG_IMPACT, @@ -4196,7 +4196,7 @@ static const union AffineAnimCmd* const sSupersonicSkystrikeAffineAnimTable[] = sSupersonicSkystrikeAffinePlayerSide, sSupersonicSkystrikeAffineOpponentSide, }; -const struct SpriteTemplate gSupersonicSkystrikeFlySpriteTemplate = +const struct SpriteTemplate gSupersonicSkystrikeFlySpriteTemplate = { .tileTag = ANIM_TAG_BIRD, .paletteTag = ANIM_TAG_BIRD, @@ -4207,7 +4207,7 @@ const struct SpriteTemplate gSupersonicSkystrikeFlySpriteTemplate = .callback = AnimFlyBallAttack }; //acid downpour -const struct SpriteTemplate gAcidDownpourReversalSpriteTemplate = +const struct SpriteTemplate gAcidDownpourReversalSpriteTemplate = { .tileTag = ANIM_TAG_POISON_BUBBLE, .paletteTag = ANIM_TAG_POISON_BUBBLE, @@ -4217,7 +4217,7 @@ const struct SpriteTemplate gAcidDownpourReversalSpriteTemplate = .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimReversalOrb }; -const struct SpriteTemplate gAcidDownpourAuraSpriteTemplate = +const struct SpriteTemplate gAcidDownpourAuraSpriteTemplate = { .tileTag = ANIM_TAG_POISON_BUBBLE, .paletteTag = ANIM_TAG_POISON_BUBBLE, @@ -4228,7 +4228,7 @@ const struct SpriteTemplate gAcidDownpourAuraSpriteTemplate = .callback = AnimParticleInVortex }; //tectonic rage -const struct SpriteTemplate gTectonicRageBlastBurnSpriteTemplate = +const struct SpriteTemplate gTectonicRageBlastBurnSpriteTemplate = { .tileTag = ANIM_TAG_FIRE_PLUME, .paletteTag = ANIM_TAG_FIRE_PLUME, @@ -4238,7 +4238,7 @@ const struct SpriteTemplate gTectonicRageBlastBurnSpriteTemplate = .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimBlastBurnTargetPlume }; -const struct SpriteTemplate gTectonicRageExplosionSpriteTemplate = +const struct SpriteTemplate gTectonicRageExplosionSpriteTemplate = { .tileTag = ANIM_TAG_EXPLOSION_2, .paletteTag = ANIM_TAG_EXPLOSION_2, @@ -4250,7 +4250,7 @@ const struct SpriteTemplate gTectonicRageExplosionSpriteTemplate = }; // continental crush -const struct SpriteTemplate gContinentalCrushNeedleArmSpriteTemplate = +const struct SpriteTemplate gContinentalCrushNeedleArmSpriteTemplate = { .tileTag = ANIM_TAG_ROCKS, .paletteTag = ANIM_TAG_ROCKS, @@ -4260,7 +4260,7 @@ const struct SpriteTemplate gContinentalCrushNeedleArmSpriteTemplate = .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimNeedleArmSpike }; -const struct SpriteTemplate gContinentalCrushBigRockStompSpriteTemplate = +const struct SpriteTemplate gContinentalCrushBigRockStompSpriteTemplate = { .tileTag = ANIM_TAG_REALLY_BIG_ROCK, .paletteTag = ANIM_TAG_REALLY_BIG_ROCK, @@ -4270,7 +4270,7 @@ const struct SpriteTemplate gContinentalCrushBigRockStompSpriteTemplate = .affineAnims = sSpriteAffineAnimTable_LargeHailRock, .callback = SpriteCB_FallingObject }; -const struct SpriteTemplate gContinentalCrushFocusEnergySpriteTemplate = +const struct SpriteTemplate gContinentalCrushFocusEnergySpriteTemplate = { .tileTag = ANIM_TAG_FOCUS_ENERGY, .paletteTag = ANIM_TAG_ROCKS, @@ -4280,7 +4280,7 @@ const struct SpriteTemplate gContinentalCrushFocusEnergySpriteTemplate = .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimEndureEnergy }; -const struct SpriteTemplate gContinentalCrushGrowingRockSpriteTemplate = +const struct SpriteTemplate gContinentalCrushGrowingRockSpriteTemplate = { .tileTag = ANIM_TAG_REALLY_BIG_ROCK, .paletteTag = ANIM_TAG_REALLY_BIG_ROCK, @@ -4290,7 +4290,7 @@ const struct SpriteTemplate gContinentalCrushGrowingRockSpriteTemplate = .affineAnims = gAffineAnims_GrowingElectricOrb, .callback = AnimGrowingChargeOrb }; -const struct SpriteTemplate gContinentalCrushEruptionSpriteTemplate = +const struct SpriteTemplate gContinentalCrushEruptionSpriteTemplate = { .tileTag = ANIM_TAG_ROCKS, .paletteTag = ANIM_TAG_ROCKS, @@ -4302,7 +4302,7 @@ const struct SpriteTemplate gContinentalCrushEruptionSpriteTemplate = }; // savage spin out -const struct SpriteTemplate gSavageSpinOutStringBlastSpriteTemplate = +const struct SpriteTemplate gSavageSpinOutStringBlastSpriteTemplate = { .tileTag = ANIM_TAG_STRING, .paletteTag = ANIM_TAG_STRING, @@ -4312,7 +4312,7 @@ const struct SpriteTemplate gSavageSpinOutStringBlastSpriteTemplate = .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimAirWaveCrescent }; -const struct SpriteTemplate gSavageSpinOutCacoonSpriteTemplate = +const struct SpriteTemplate gSavageSpinOutCacoonSpriteTemplate = { .tileTag = ANIM_TAG_COCOON, .paletteTag = ANIM_TAG_COCOON, @@ -4322,7 +4322,7 @@ const struct SpriteTemplate gSavageSpinOutCacoonSpriteTemplate = .affineAnims = gAffineAnims_Bite, .callback = AnimBite }; -const struct SpriteTemplate gSavageSpinOutGreenChargeSpriteTemplate = +const struct SpriteTemplate gSavageSpinOutGreenChargeSpriteTemplate = { .tileTag = ANIM_TAG_CIRCLE_OF_LIGHT, .paletteTag = ANIM_TAG_RAZOR_LEAF, @@ -4332,7 +4332,7 @@ const struct SpriteTemplate gSavageSpinOutGreenChargeSpriteTemplate = .affineAnims = gAffineAnims_GrowingElectricOrb, .callback = AnimGrowingChargeOrb }; -const struct SpriteTemplate gSavageSpinOutGreenCutSpriteTemplate = +const struct SpriteTemplate gSavageSpinOutGreenCutSpriteTemplate = { .tileTag = ANIM_TAG_CUT, .paletteTag = ANIM_TAG_RAZOR_LEAF, @@ -4342,7 +4342,7 @@ const struct SpriteTemplate gSavageSpinOutGreenCutSpriteTemplate = .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimCuttingSlice }; -const struct SpriteTemplate gSavageSpinOutWhiteExplosionSpriteTemplate = +const struct SpriteTemplate gSavageSpinOutWhiteExplosionSpriteTemplate = { .tileTag = ANIM_TAG_EXPLOSION_2, .paletteTag = ANIM_TAG_AIR_WAVE_2, @@ -4354,7 +4354,7 @@ const struct SpriteTemplate gSavageSpinOutWhiteExplosionSpriteTemplate = }; // never ending nightmare -const struct SpriteTemplate gNeverEndingNightmareRingAttackerSpriteTemplate = +const struct SpriteTemplate gNeverEndingNightmareRingAttackerSpriteTemplate = { .tileTag = ANIM_TAG_THIN_RING, .paletteTag = ANIM_TAG_POISON_BUBBLE, @@ -4364,7 +4364,7 @@ const struct SpriteTemplate gNeverEndingNightmareRingAttackerSpriteTemplate = .affineAnims = gThinRingExpandingAffineAnimTable, .callback = AnimSpriteOnMonPos }; -const struct SpriteTemplate gNeverEndingNightmareRingTargetSpriteTemplate = +const struct SpriteTemplate gNeverEndingNightmareRingTargetSpriteTemplate = { .tileTag = ANIM_TAG_THIN_RING, .paletteTag = ANIM_TAG_POISON_BUBBLE, @@ -4374,7 +4374,7 @@ const struct SpriteTemplate gNeverEndingNightmareRingTargetSpriteTemplate = .affineAnims = gThinRingShrinkingAffineAnimTable, .callback = AnimSpriteOnMonPos }; -const struct SpriteTemplate gNeverEndingNightmareFocusEnergySpriteTemplate = +const struct SpriteTemplate gNeverEndingNightmareFocusEnergySpriteTemplate = { .tileTag = ANIM_TAG_FOCUS_ENERGY, .paletteTag = ANIM_TAG_POISON_BUBBLE, @@ -4384,7 +4384,7 @@ const struct SpriteTemplate gNeverEndingNightmareFocusEnergySpriteTemplate = .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimEndureEnergy }; -const struct SpriteTemplate gNeverEndingNightmareHandSpriteTemplate = +const struct SpriteTemplate gNeverEndingNightmareHandSpriteTemplate = { .tileTag = ANIM_TAG_ASSURANCE_HAND, .paletteTag = ANIM_TAG_ASSURANCE_HAND, @@ -4394,7 +4394,7 @@ const struct SpriteTemplate gNeverEndingNightmareHandSpriteTemplate = .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimNeedleArmSpike }; -const struct SpriteTemplate gNeverEndingNightmareBlastBurnSpriteTemplate = +const struct SpriteTemplate gNeverEndingNightmareBlastBurnSpriteTemplate = { .tileTag = ANIM_TAG_FIRE_PLUME, .paletteTag = ANIM_TAG_POISON_BUBBLE, @@ -4404,7 +4404,7 @@ const struct SpriteTemplate gNeverEndingNightmareBlastBurnSpriteTemplate = .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimBlastBurnTargetPlume }; -const struct SpriteTemplate gNeverEndingNightmareGeyserHexSpriteTemplate = +const struct SpriteTemplate gNeverEndingNightmareGeyserHexSpriteTemplate = { .tileTag = ANIM_TAG_VERTICAL_HEX, .paletteTag = ANIM_TAG_VERTICAL_HEX, @@ -4414,7 +4414,7 @@ const struct SpriteTemplate gNeverEndingNightmareGeyserHexSpriteTemplate = .affineAnims = gDummySpriteAffineAnimTable, .callback = SpriteCB_GeyserTarget }; -const struct SpriteTemplate gNeverEndingNightmareExplosionSpriteTemplate = +const struct SpriteTemplate gNeverEndingNightmareExplosionSpriteTemplate = { .tileTag = ANIM_TAG_EXPLOSION_2, .paletteTag = ANIM_TAG_VERTICAL_HEX, @@ -4426,7 +4426,7 @@ const struct SpriteTemplate gNeverEndingNightmareExplosionSpriteTemplate = }; // corkscrew crash -const struct SpriteTemplate gCorkscrewCrashMetalBitSpriteTemplate = +const struct SpriteTemplate gCorkscrewCrashMetalBitSpriteTemplate = { .tileTag = ANIM_TAG_SPIKES, .paletteTag = ANIM_TAG_SPIKES, @@ -4436,7 +4436,7 @@ const struct SpriteTemplate gCorkscrewCrashMetalBitSpriteTemplate = .affineAnims = gAffineAnims_TearDrop, .callback = AnimParticleInVortex }; -const struct SpriteTemplate gCorkscrewCrashChargeSpriteTemplate = +const struct SpriteTemplate gCorkscrewCrashChargeSpriteTemplate = { .tileTag = ANIM_TAG_CORKSCREW, .paletteTag = ANIM_TAG_CORKSCREW, @@ -4446,7 +4446,7 @@ const struct SpriteTemplate gCorkscrewCrashChargeSpriteTemplate = .affineAnims = gAffineAnims_GrowingElectricOrb, .callback = AnimGrowingChargeOrb }; -const struct SpriteTemplate gCorkscrewCrashCorkscrewFlyUpSpriteTemplate = +const struct SpriteTemplate gCorkscrewCrashCorkscrewFlyUpSpriteTemplate = { .tileTag = ANIM_TAG_CORKSCREW, .paletteTag = ANIM_TAG_CORKSCREW, @@ -4463,7 +4463,7 @@ static const union AffineAnimCmd sCorkscrewCrashFlyDownAffineOpponentSide[] = { static const union AffineAnimCmd* const sCorkscrewCrashFlyDownAffineAnimTable[] = { sCorkscrewCrashFlyDownAffineOpponentSide, }; -const struct SpriteTemplate gCorkscrewCrashCorkscrewFlyDownSpriteTemplate = +const struct SpriteTemplate gCorkscrewCrashCorkscrewFlyDownSpriteTemplate = { .tileTag = ANIM_TAG_CORKSCREW, .paletteTag = ANIM_TAG_CORKSCREW, @@ -4485,7 +4485,7 @@ static const union AffineAnimCmd* const sCorkscrewCrashStrikeAffineAnimTable[] = sCorkscrewCrashStrikePlayerAffineAnims, sCorkscrewCrashStrikeTargetAffineAnims, }; -const struct SpriteTemplate gCorkscrewCrashStrikeSpriteTemplate = +const struct SpriteTemplate gCorkscrewCrashStrikeSpriteTemplate = { .tileTag = ANIM_TAG_CORKSCREW, .paletteTag = ANIM_TAG_CORKSCREW, @@ -4502,7 +4502,7 @@ static const union AffineAnimCmd sCorkscrewCrashLeftAffineAnims[] = { static const union AffineAnimCmd* const sCorkscrewCrashLeftAffineAnimTable[] = { sCorkscrewCrashLeftAffineAnims, }; -const struct SpriteTemplate gCorkscrewCrashLeftUpSpriteTemplate = +const struct SpriteTemplate gCorkscrewCrashLeftUpSpriteTemplate = { .tileTag = ANIM_TAG_CORKSCREW, .paletteTag = ANIM_TAG_CORKSCREW, @@ -4512,7 +4512,7 @@ const struct SpriteTemplate gCorkscrewCrashLeftUpSpriteTemplate = .affineAnims = sCorkscrewCrashLeftAffineAnimTable, .callback = AnimAssistPawprint }; -const struct SpriteTemplate gCorkscrewCrashLeftDownSpriteTemplate = +const struct SpriteTemplate gCorkscrewCrashLeftDownSpriteTemplate = { .tileTag = ANIM_TAG_CORKSCREW, .paletteTag = ANIM_TAG_CORKSCREW, @@ -4529,7 +4529,7 @@ static const union AffineAnimCmd sCorkscrewCrashRightUpAffineAnims[] = { static const union AffineAnimCmd* const sCorkscrewCrashRightUpAffineAnimTable[] = { sCorkscrewCrashRightUpAffineAnims, }; -const struct SpriteTemplate gCorkscrewCrashRightUpSpriteTemplate = +const struct SpriteTemplate gCorkscrewCrashRightUpSpriteTemplate = { .tileTag = ANIM_TAG_CORKSCREW, .paletteTag = ANIM_TAG_CORKSCREW, @@ -4546,7 +4546,7 @@ static const union AffineAnimCmd sCorkscrewCrashRightDownAffineAnims[] = { static const union AffineAnimCmd* const sCorkscrewCrashRightDownAffineAnimTable[] = { sCorkscrewCrashRightDownAffineAnims, }; -const struct SpriteTemplate gCorkscrewCrashRightDownSpriteTemplate = +const struct SpriteTemplate gCorkscrewCrashRightDownSpriteTemplate = { .tileTag = ANIM_TAG_CORKSCREW, .paletteTag = ANIM_TAG_CORKSCREW, @@ -4558,7 +4558,7 @@ const struct SpriteTemplate gCorkscrewCrashRightDownSpriteTemplate = }; // inferno overdrive -const struct SpriteTemplate gInfernoOverdriveSuperpowerSpriteTemplate = +const struct SpriteTemplate gInfernoOverdriveSuperpowerSpriteTemplate = { .tileTag = ANIM_TAG_METEOR, .paletteTag = ANIM_TAG_VERTICAL_HEX, @@ -4568,7 +4568,7 @@ const struct SpriteTemplate gInfernoOverdriveSuperpowerSpriteTemplate = .affineAnims = sSpriteAffineAnimTable_GrowingSuperpower, .callback = SpriteCB_GrowingSuperpower }; -const struct SpriteTemplate gInfernoOverdriveChargeSpriteTemplate = +const struct SpriteTemplate gInfernoOverdriveChargeSpriteTemplate = { .tileTag = ANIM_TAG_CIRCLE_OF_LIGHT, .paletteTag = ANIM_TAG_CIRCLE_OF_LIGHT, @@ -4578,7 +4578,7 @@ const struct SpriteTemplate gInfernoOverdriveChargeSpriteTemplate = .affineAnims = gAffineAnims_GrowingElectricOrb, .callback = AnimGrowingChargeOrb }; -const struct SpriteTemplate gInfernoOverdriveExplosionSpriteTemplate = +const struct SpriteTemplate gInfernoOverdriveExplosionSpriteTemplate = { .tileTag = ANIM_TAG_EXPLOSION_2, .paletteTag = ANIM_TAG_EXPLOSION_2, @@ -4590,7 +4590,7 @@ const struct SpriteTemplate gInfernoOverdriveExplosionSpriteTemplate = }; // hydro vortex -const struct SpriteTemplate gHydroVortexSuperpowerSpriteTemplate = +const struct SpriteTemplate gHydroVortexSuperpowerSpriteTemplate = { .tileTag = ANIM_TAG_METEOR, .paletteTag = ANIM_TAG_WATER_ORB, @@ -4600,7 +4600,7 @@ const struct SpriteTemplate gHydroVortexSuperpowerSpriteTemplate = .affineAnims = sSpriteAffineAnimTable_GrowingSuperpower, .callback = SpriteCB_GrowingSuperpower }; -const struct SpriteTemplate gHydroVortexHurricaneSpriteTemplate = +const struct SpriteTemplate gHydroVortexHurricaneSpriteTemplate = { .tileTag = ANIM_TAG_GUST, .paletteTag = ANIM_TAG_WATER_ORB, @@ -4610,7 +4610,7 @@ const struct SpriteTemplate gHydroVortexHurricaneSpriteTemplate = .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimEllipticalGust }; -const struct SpriteTemplate gHydroVortexImpactSpriteTemplate = +const struct SpriteTemplate gHydroVortexImpactSpriteTemplate = { .tileTag = ANIM_TAG_IMPACT, .paletteTag = ANIM_TAG_WATER_ORB, @@ -4622,7 +4622,7 @@ const struct SpriteTemplate gHydroVortexImpactSpriteTemplate = }; // bloom doom -const struct SpriteTemplate gBloomDoomPetalSpinSpriteTemplate = +const struct SpriteTemplate gBloomDoomPetalSpinSpriteTemplate = { .tileTag = ANIM_TAG_FLOWER, .paletteTag = ANIM_TAG_FLOWER, @@ -4632,7 +4632,7 @@ const struct SpriteTemplate gBloomDoomPetalSpinSpriteTemplate = .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimFireSpiralOutward }; -const struct SpriteTemplate gBloomDoomGreenChargeSpriteTemplate = +const struct SpriteTemplate gBloomDoomGreenChargeSpriteTemplate = { .tileTag = ANIM_TAG_CIRCLE_OF_LIGHT, .paletteTag = ANIM_TAG_RAZOR_LEAF, @@ -4642,7 +4642,7 @@ const struct SpriteTemplate gBloomDoomGreenChargeSpriteTemplate = .affineAnims = gAffineAnims_GrowingElectricOrb, .callback = AnimGrowingChargeOrb }; -const struct SpriteTemplate gBloomDoomHurricaneSpriteTemplate = +const struct SpriteTemplate gBloomDoomHurricaneSpriteTemplate = { .tileTag = ANIM_TAG_GUST, .paletteTag = ANIM_TAG_RAZOR_LEAF, @@ -4652,7 +4652,7 @@ const struct SpriteTemplate gBloomDoomHurricaneSpriteTemplate = .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimEllipticalGustAttacker, }; -const struct SpriteTemplate gBloomDoomFlowerGeyserSpriteTemplate = +const struct SpriteTemplate gBloomDoomFlowerGeyserSpriteTemplate = { .tileTag = ANIM_TAG_FLOWER, .paletteTag = ANIM_TAG_FLOWER, @@ -4662,7 +4662,7 @@ const struct SpriteTemplate gBloomDoomFlowerGeyserSpriteTemplate = .affineAnims = gDummySpriteAffineAnimTable, .callback = SpriteCB_Geyser }; -const struct SpriteTemplate gBloomDoomGreenBeamSpriteTemplate = +const struct SpriteTemplate gBloomDoomGreenBeamSpriteTemplate = { .tileTag = ANIM_TAG_ORBS, .paletteTag = ANIM_TAG_RAZOR_LEAF, @@ -4672,7 +4672,7 @@ const struct SpriteTemplate gBloomDoomGreenBeamSpriteTemplate = .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimHyperBeamOrb }; -const struct SpriteTemplate gBloomDoomPetalStarSpriteTemplate = +const struct SpriteTemplate gBloomDoomPetalStarSpriteTemplate = { .tileTag = ANIM_TAG_FLOWER, .paletteTag = ANIM_TAG_FLOWER, @@ -4682,7 +4682,7 @@ const struct SpriteTemplate gBloomDoomPetalStarSpriteTemplate = .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimNeedleArmSpike }; -const struct SpriteTemplate gBloomDoomExplosionSpriteTemplate = +const struct SpriteTemplate gBloomDoomExplosionSpriteTemplate = { .tileTag = ANIM_TAG_EXPLOSION, .paletteTag = ANIM_TAG_RAZOR_LEAF, @@ -4694,7 +4694,7 @@ const struct SpriteTemplate gBloomDoomExplosionSpriteTemplate = }; // gigavolt havoc -const struct SpriteTemplate gGigavoltHavocChargingSpearSpriteTemplate = +const struct SpriteTemplate gGigavoltHavocChargingSpearSpriteTemplate = { .tileTag = ANIM_TAG_HAVOC_SPEAR, .paletteTag = ANIM_TAG_HAVOC_SPEAR, @@ -4704,7 +4704,7 @@ const struct SpriteTemplate gGigavoltHavocChargingSpearSpriteTemplate = .affineAnims = gAffineAnims_GrowingElectricOrb, .callback = AnimGrowingChargeOrb }; -const struct SpriteTemplate gGigavoltHavocLaunchSpearSpriteTemplate = +const struct SpriteTemplate gGigavoltHavocLaunchSpearSpriteTemplate = { .tileTag = ANIM_TAG_HAVOC_SPEAR, .paletteTag = ANIM_TAG_HAVOC_SPEAR, @@ -4714,7 +4714,7 @@ const struct SpriteTemplate gGigavoltHavocLaunchSpearSpriteTemplate = .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimSuperpowerFireball }; -const struct SpriteTemplate gGigavoltHavocRingsSpriteTemplate = +const struct SpriteTemplate gGigavoltHavocRingsSpriteTemplate = { .tileTag = ANIM_TAG_THIN_RING, .paletteTag = ANIM_TAG_CIRCLE_OF_LIGHT, @@ -4724,7 +4724,7 @@ const struct SpriteTemplate gGigavoltHavocRingsSpriteTemplate = .affineAnims = gThinRingExpandingAffineAnimTable, .callback = AnimSpriteOnMonPos }; -const struct SpriteTemplate gGigavoltHavocGeyserSpriteTemplate = +const struct SpriteTemplate gGigavoltHavocGeyserSpriteTemplate = { .tileTag = ANIM_TAG_VERTICAL_HEX, .paletteTag = ANIM_TAG_CIRCLE_OF_LIGHT, @@ -4736,7 +4736,7 @@ const struct SpriteTemplate gGigavoltHavocGeyserSpriteTemplate = }; // shattered psyche -const struct SpriteTemplate gShatteredPsycheReflectHitSpriteTemplate = +const struct SpriteTemplate gShatteredPsycheReflectHitSpriteTemplate = { .tileTag = ANIM_TAG_BLUE_LIGHT_WALL, .paletteTag = ANIM_TAG_BLUE_LIGHT_WALL, @@ -4746,7 +4746,7 @@ const struct SpriteTemplate gShatteredPsycheReflectHitSpriteTemplate = .affineAnims = gAffineAnims_HitSplat, .callback = AnimHitSplatBasic }; -const struct SpriteTemplate gShatteredPsychePinkChargeSpriteTemplate = +const struct SpriteTemplate gShatteredPsychePinkChargeSpriteTemplate = { .tileTag = ANIM_TAG_CIRCLE_OF_LIGHT, .paletteTag = ANIM_TAG_PINK_PETAL, @@ -4756,7 +4756,7 @@ const struct SpriteTemplate gShatteredPsychePinkChargeSpriteTemplate = .affineAnims = gAffineAnims_GrowingElectricOrb, .callback = AnimGrowingChargeOrb }; -const struct SpriteTemplate gShatteredPsycheRingSpriteTemplate = +const struct SpriteTemplate gShatteredPsycheRingSpriteTemplate = { .tileTag = ANIM_TAG_THIN_RING, .paletteTag = ANIM_TAG_PINK_PETAL, @@ -4768,7 +4768,7 @@ const struct SpriteTemplate gShatteredPsycheRingSpriteTemplate = }; // subzero slammer -const struct SpriteTemplate gSubzeroSlammerIceSpinSpriteTemplate = +const struct SpriteTemplate gSubzeroSlammerIceSpinSpriteTemplate = { .tileTag = ANIM_TAG_ICE_CRYSTALS, .paletteTag = ANIM_TAG_ICE_CRYSTALS, @@ -4778,7 +4778,7 @@ const struct SpriteTemplate gSubzeroSlammerIceSpinSpriteTemplate = .affineAnims = gAffineAnims_IceCrystalHit, .callback = AnimFireSpiralOutward }; -const struct SpriteTemplate gSubzeroSlammerExplosionSpriteTemplate = +const struct SpriteTemplate gSubzeroSlammerExplosionSpriteTemplate = { .tileTag = ANIM_TAG_EXPLOSION_2, .paletteTag = ANIM_TAG_EXPLOSION_2, @@ -4788,7 +4788,7 @@ const struct SpriteTemplate gSubzeroSlammerExplosionSpriteTemplate = .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimSpriteOnMonPos }; -const struct SpriteTemplate gSubzeroSlammerIceSwirlSpriteTemplate = +const struct SpriteTemplate gSubzeroSlammerIceSwirlSpriteTemplate = { .tileTag = ANIM_TAG_ICE_CRYSTALS, .paletteTag = ANIM_TAG_ICE_CRYSTALS, @@ -4836,7 +4836,7 @@ static const union AffineAnimCmd* const sDevastatingDrakeLeftAffineAnimTable[] = sDevastatingDrakeLeftAffineAnims, sDevastatingDrakeLeftAffineAnims, }; -const struct SpriteTemplate gDevastatingDrakePurpleEnergySpriteTemplate = +const struct SpriteTemplate gDevastatingDrakePurpleEnergySpriteTemplate = { .tileTag = ANIM_TAG_FOCUS_ENERGY, .paletteTag = ANIM_TAG_POISON_BUBBLE, @@ -4846,7 +4846,7 @@ const struct SpriteTemplate gDevastatingDrakePurpleEnergySpriteTemplate = .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimEndureEnergy }; -const struct SpriteTemplate gDevastatingDrakeShockwaveSpriteTemplate = +const struct SpriteTemplate gDevastatingDrakeShockwaveSpriteTemplate = { .tileTag = ANIM_TAG_CIRCLE_OF_LIGHT, .paletteTag = ANIM_TAG_POISON_BUBBLE, @@ -4856,7 +4856,7 @@ const struct SpriteTemplate gDevastatingDrakeShockwaveSpriteTemplate = .affineAnims = gAffineAnims_GrowingElectricOrb, .callback = AnimGrowingShockWaveOrb }; -const struct SpriteTemplate gDevastatingDrakeDrakeUpSpriteTemplate = +const struct SpriteTemplate gDevastatingDrakeDrakeUpSpriteTemplate = { .tileTag = ANIM_TAG_PURPLE_DRAKE, .paletteTag = ANIM_TAG_PURPLE_DRAKE, @@ -4866,7 +4866,7 @@ const struct SpriteTemplate gDevastatingDrakeDrakeUpSpriteTemplate = .affineAnims = sDevastatingDrakeFlyUpAffineAnimTable, .callback = AnimParticleInVortex }; -const struct SpriteTemplate gDevastatingDrakeRightSpriteTemplate = +const struct SpriteTemplate gDevastatingDrakeRightSpriteTemplate = { .tileTag = ANIM_TAG_PURPLE_DRAKE, .paletteTag = ANIM_TAG_PURPLE_DRAKE, @@ -4876,7 +4876,7 @@ const struct SpriteTemplate gDevastatingDrakeRightSpriteTemplate = .affineAnims = sDevastatingDrakeRightAffineAnimTable, .callback = AnimAssistPawprint }; -const struct SpriteTemplate gDevastatingDrakeLeftSpriteTemplate = +const struct SpriteTemplate gDevastatingDrakeLeftSpriteTemplate = { .tileTag = ANIM_TAG_PURPLE_DRAKE, .paletteTag = ANIM_TAG_PURPLE_DRAKE, @@ -4886,7 +4886,7 @@ const struct SpriteTemplate gDevastatingDrakeLeftSpriteTemplate = .affineAnims = sDevastatingDrakeLeftAffineAnimTable, .callback = AnimAssistPawprint }; -const struct SpriteTemplate gDevastatingDrakeStrikeSpriteTemplate = +const struct SpriteTemplate gDevastatingDrakeStrikeSpriteTemplate = { .tileTag = ANIM_TAG_PURPLE_DRAKE, .paletteTag = ANIM_TAG_PURPLE_DRAKE, @@ -4896,7 +4896,7 @@ const struct SpriteTemplate gDevastatingDrakeStrikeSpriteTemplate = .affineAnims = sDevastatingDrakeStrikeAffineAnimTable, .callback = AnimFlyBallAttack }; -const struct SpriteTemplate gDevastatingDrakePurpleBlastSpriteTemplate = +const struct SpriteTemplate gDevastatingDrakePurpleBlastSpriteTemplate = { .tileTag = ANIM_TAG_FIRE_PLUME, .paletteTag = ANIM_TAG_FIRE_PLUME, @@ -4906,7 +4906,7 @@ const struct SpriteTemplate gDevastatingDrakePurpleBlastSpriteTemplate = .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimBlastBurnTargetPlume }; -const struct SpriteTemplate gDevastatingDrakeHexSpriteTemplate = +const struct SpriteTemplate gDevastatingDrakeHexSpriteTemplate = { .tileTag = ANIM_TAG_VERTICAL_HEX, .paletteTag = ANIM_TAG_VERTICAL_HEX, @@ -4916,7 +4916,7 @@ const struct SpriteTemplate gDevastatingDrakeHexSpriteTemplate = .affineAnims = gDummySpriteAffineAnimTable, .callback = SpriteCB_Geyser }; -const struct SpriteTemplate gDevastatingDrakeExplosionSpriteTemplate = +const struct SpriteTemplate gDevastatingDrakeExplosionSpriteTemplate = { .tileTag = ANIM_TAG_EXPLOSION, .paletteTag = ANIM_TAG_EXPLOSION, @@ -4926,7 +4926,7 @@ const struct SpriteTemplate gDevastatingDrakeExplosionSpriteTemplate = .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimSpriteOnMonPos }; -const struct SpriteTemplate gDevastatingDrakeExplosion2SpriteTemplate = +const struct SpriteTemplate gDevastatingDrakeExplosion2SpriteTemplate = { .tileTag = ANIM_TAG_EXPLOSION_2, .paletteTag = ANIM_TAG_EXPLOSION_2, @@ -4938,7 +4938,7 @@ const struct SpriteTemplate gDevastatingDrakeExplosion2SpriteTemplate = }; // black hole eclipse -const struct SpriteTemplate gBlackHoleEclipseShockwaveSpriteTemplate = +const struct SpriteTemplate gBlackHoleEclipseShockwaveSpriteTemplate = { .tileTag = ANIM_TAG_CIRCLE_OF_LIGHT, .paletteTag = ANIM_TAG_BLACK_BALL_2, @@ -4948,7 +4948,7 @@ const struct SpriteTemplate gBlackHoleEclipseShockwaveSpriteTemplate = .affineAnims = gAffineAnims_GrowingElectricOrb, .callback = AnimGrowingShockWaveOrb }; -const struct SpriteTemplate gBlackHoleEclipseBlueRingSpriteTemplate = +const struct SpriteTemplate gBlackHoleEclipseBlueRingSpriteTemplate = { .tileTag = ANIM_TAG_THIN_RING, .paletteTag = ANIM_TAG_ICE_CHUNK, @@ -4958,7 +4958,7 @@ const struct SpriteTemplate gBlackHoleEclipseBlueRingSpriteTemplate = .affineAnims = gThinRingExpandingAffineAnimTable, .callback = AnimSpriteOnMonPos }; -const struct SpriteTemplate gBlackHoleEclipseBlackRingSpriteTemplate = +const struct SpriteTemplate gBlackHoleEclipseBlackRingSpriteTemplate = { .tileTag = ANIM_TAG_THIN_RING, .paletteTag = ANIM_TAG_HANDS_AND_FEET, @@ -4968,7 +4968,7 @@ const struct SpriteTemplate gBlackHoleEclipseBlackRingSpriteTemplate = .affineAnims = gThinRingExpandingAffineAnimTable, .callback = AnimSpriteOnMonPos }; -const struct SpriteTemplate gBlackHoleEclipseRedExplosionSpriteTemplate = +const struct SpriteTemplate gBlackHoleEclipseRedExplosionSpriteTemplate = { .tileTag = ANIM_TAG_EXPLOSION_2, .paletteTag = ANIM_TAG_VERTICAL_HEX, @@ -4978,7 +4978,7 @@ const struct SpriteTemplate gBlackHoleEclipseRedExplosionSpriteTemplate = .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimSpriteOnMonPos }; -const struct SpriteTemplate gBlackHoleEclipseWispSpriteTemplate = +const struct SpriteTemplate gBlackHoleEclipseWispSpriteTemplate = { .tileTag = ANIM_TAG_WISP_ORB, .paletteTag = ANIM_TAG_HANDS_AND_FEET, @@ -4988,7 +4988,7 @@ const struct SpriteTemplate gBlackHoleEclipseWispSpriteTemplate = .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimWillOWispOrb }; -const struct SpriteTemplate gBlackHoleEclipseRedRingSpriteTemplate = +const struct SpriteTemplate gBlackHoleEclipseRedRingSpriteTemplate = { .tileTag = ANIM_TAG_THIN_RING, .paletteTag = ANIM_TAG_VERTICAL_HEX, @@ -4998,7 +4998,7 @@ const struct SpriteTemplate gBlackHoleEclipseRedRingSpriteTemplate = .affineAnims = gThinRingExpandingAffineAnimTable, .callback = AnimSpriteOnMonPos }; -const struct SpriteTemplate gBlackHoleEclipseBlueRingInwardsSpriteTemplate = +const struct SpriteTemplate gBlackHoleEclipseBlueRingInwardsSpriteTemplate = { .tileTag = ANIM_TAG_THIN_RING, .paletteTag = ANIM_TAG_ICE_CHUNK, @@ -5008,7 +5008,7 @@ const struct SpriteTemplate gBlackHoleEclipseBlueRingInwardsSpriteTemplate = .affineAnims = gThinRingShrinkingAffineAnimTable, .callback = AnimSpriteOnMonPos }; -const struct SpriteTemplate gBlackHoleEclipseRedRingInwardsSpriteTemplate = +const struct SpriteTemplate gBlackHoleEclipseRedRingInwardsSpriteTemplate = { .tileTag = ANIM_TAG_THIN_RING, .paletteTag = ANIM_TAG_VERTICAL_HEX, @@ -5026,7 +5026,7 @@ static const union AffineAnimCmd gGrowingBackHoleTargetAffineCmds[] = { static const union AffineAnimCmd *const gGrowingBlackHoleTargetAffineAnimTable[] = { gGrowingBackHoleTargetAffineCmds, }; -const struct SpriteTemplate gBlackHoleEclipseHoleSpriteTemplate = +const struct SpriteTemplate gBlackHoleEclipseHoleSpriteTemplate = { .tileTag = ANIM_TAG_SHADOW_BALL, .paletteTag = ANIM_TAG_VERTICAL_HEX, @@ -5044,7 +5044,7 @@ static const union AffineAnimCmd gShrinkingBlackHoleAffineCmds[] = { static const union AffineAnimCmd *const gShrinkingBlackHoleAffineAnimTable[] = { gShrinkingBlackHoleAffineCmds, }; -const struct SpriteTemplate gBlackHoleEclipseHoleShrinkSpriteTemplate = +const struct SpriteTemplate gBlackHoleEclipseHoleShrinkSpriteTemplate = { .tileTag = ANIM_TAG_SHADOW_BALL, .paletteTag = ANIM_TAG_VERTICAL_HEX, @@ -5062,7 +5062,7 @@ static const union AffineAnimCmd gGrowingBackHoleAffineCmds[] = { static const union AffineAnimCmd *const gGrowingBlackHoleAffineAnimTable[] = { gGrowingBackHoleAffineCmds, }; -const struct SpriteTemplate gBlackHoleEclipseHoleUserSpriteTemplate = +const struct SpriteTemplate gBlackHoleEclipseHoleUserSpriteTemplate = { .tileTag = ANIM_TAG_SHADOW_BALL, .paletteTag = ANIM_TAG_HANDS_AND_FEET, @@ -5072,7 +5072,7 @@ const struct SpriteTemplate gBlackHoleEclipseHoleUserSpriteTemplate = .affineAnims = gGrowingBlackHoleAffineAnimTable, .callback = AnimSpriteOnMonPos }; -const struct SpriteTemplate gTargetTwinkleSpriteTemplate = +const struct SpriteTemplate gTargetTwinkleSpriteTemplate = { .tileTag = ANIM_TAG_SPARKLE_4, .paletteTag = ANIM_TAG_SPARKLE_4, @@ -5098,7 +5098,7 @@ static const union AffineAnimCmd *const sTwinkleTackleStarAffineAnimTable[] = { sTwinkleTackleStarPlayerAffineAnims, sTwinkleTackleStarOpponentAffineAnims }; -const struct SpriteTemplate gTwinkleTacklePinkStarSpriteTemplate = +const struct SpriteTemplate gTwinkleTacklePinkStarSpriteTemplate = { .tileTag = ANIM_TAG_SPARKLE_2, .paletteTag = ANIM_TAG_PINK_PETAL, @@ -5108,7 +5108,7 @@ const struct SpriteTemplate gTwinkleTacklePinkStarSpriteTemplate = .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimGrantingStars }; -const struct SpriteTemplate gTwinkleTacklePinkRingSpriteTemplate = +const struct SpriteTemplate gTwinkleTacklePinkRingSpriteTemplate = { .tileTag = ANIM_TAG_THIN_RING, .paletteTag = ANIM_TAG_PINK_PETAL, @@ -5118,7 +5118,7 @@ const struct SpriteTemplate gTwinkleTacklePinkRingSpriteTemplate = .affineAnims = gThinRingExpandingAffineAnimTable, .callback = AnimSpriteOnMonPos }; -const struct SpriteTemplate gTwinkleTackleStarGrowSpriteTemplate = +const struct SpriteTemplate gTwinkleTackleStarGrowSpriteTemplate = { .tileTag = ANIM_TAG_YELLOW_STAR, .paletteTag = ANIM_TAG_YELLOW_STAR, @@ -5128,7 +5128,7 @@ const struct SpriteTemplate gTwinkleTackleStarGrowSpriteTemplate = .affineAnims = sTwinkleTackleStarAffineAnimTable, .callback = AnimSpriteOnMonPos }; -const struct SpriteTemplate gTwinkleTackleTwinkleSpriteTemplate = +const struct SpriteTemplate gTwinkleTackleTwinkleSpriteTemplate = { .tileTag = ANIM_TAG_SPARKLE_4, .paletteTag = ANIM_TAG_SPARKLE_4, @@ -5138,7 +5138,7 @@ const struct SpriteTemplate gTwinkleTackleTwinkleSpriteTemplate = .affineAnims = gDummySpriteAffineAnimTable, .callback = SpriteCB_TwinkleOnBattler }; -const struct SpriteTemplate gTwinkleTackleDigStarSpriteTemplate = +const struct SpriteTemplate gTwinkleTackleDigStarSpriteTemplate = { .tileTag = ANIM_TAG_YELLOW_STAR, .paletteTag = ANIM_TAG_YELLOW_STAR, @@ -5148,7 +5148,7 @@ const struct SpriteTemplate gTwinkleTackleDigStarSpriteTemplate = .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimDirtPlumeParticle }; -const struct SpriteTemplate gTwinkleTackleYellowImpactSpriteTemplate = +const struct SpriteTemplate gTwinkleTackleYellowImpactSpriteTemplate = { .tileTag = ANIM_TAG_IMPACT, .paletteTag = ANIM_TAG_YELLOW_STAR, @@ -5158,7 +5158,7 @@ const struct SpriteTemplate gTwinkleTackleYellowImpactSpriteTemplate = .affineAnims = gAffineAnims_HitSplat, .callback = AnimHitSplatBasic }; -const struct SpriteTemplate gTwinkleTackleImpactStarsSpriteTemplate = +const struct SpriteTemplate gTwinkleTackleImpactStarsSpriteTemplate = { .tileTag = ANIM_TAG_PAIN_SPLIT, .paletteTag = ANIM_TAG_YELLOW_STAR, @@ -5170,7 +5170,7 @@ const struct SpriteTemplate gTwinkleTackleImpactStarsSpriteTemplate = }; // catastrokpika -const struct SpriteTemplate gCatastrokpikaSuperpowerSpriteTemplate = +const struct SpriteTemplate gCatastrokpikaSuperpowerSpriteTemplate = { .tileTag = ANIM_TAG_METEOR, .paletteTag = ANIM_TAG_CIRCLE_OF_LIGHT, @@ -5182,7 +5182,7 @@ const struct SpriteTemplate gCatastrokpikaSuperpowerSpriteTemplate = }; // 10e6 volt thunderbolt -const struct SpriteTemplate g10MillionVoltBoltYellowFlySpriteTemplate = +const struct SpriteTemplate g10MillionVoltBoltYellowFlySpriteTemplate = { .tileTag = ANIM_TAG_ROUND_SHADOW, .paletteTag = ANIM_TAG_SPARK_2, @@ -5192,7 +5192,7 @@ const struct SpriteTemplate g10MillionVoltBoltYellowFlySpriteTemplate = .affineAnims = gAffineAnims_FlyBallUp, .callback = AnimFlyBallUp }; -const struct SpriteTemplate g10MillionVoltBoltShockwaveSpriteTemplate = +const struct SpriteTemplate g10MillionVoltBoltShockwaveSpriteTemplate = { .tileTag = ANIM_TAG_CIRCLE_OF_LIGHT, .paletteTag = ANIM_TAG_CIRCLE_OF_LIGHT, @@ -5202,7 +5202,7 @@ const struct SpriteTemplate g10MillionVoltBoltShockwaveSpriteTemplate = .affineAnims = gAffineAnims_GrowingElectricOrb, .callback = AnimGrowingShockWaveOrbOnTarget, }; -const struct SpriteTemplate g10MillionVoltBoltRedBeamSpriteTemplate = +const struct SpriteTemplate g10MillionVoltBoltRedBeamSpriteTemplate = { .tileTag = ANIM_TAG_ORBS, .paletteTag = ANIM_TAG_VERTICAL_HEX, @@ -5212,7 +5212,7 @@ const struct SpriteTemplate g10MillionVoltBoltRedBeamSpriteTemplate = .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimHyperBeamOrb }; -const struct SpriteTemplate g10MillionVoltBoltBlueBeamSpriteTemplate = +const struct SpriteTemplate g10MillionVoltBoltBlueBeamSpriteTemplate = { .tileTag = ANIM_TAG_ORBS, .paletteTag = ANIM_TAG_WATER_ORB, @@ -5222,7 +5222,7 @@ const struct SpriteTemplate g10MillionVoltBoltBlueBeamSpriteTemplate = .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimHyperBeamOrb }; -const struct SpriteTemplate g10MillionVoltBoltPinkBeamSpriteTemplate = +const struct SpriteTemplate g10MillionVoltBoltPinkBeamSpriteTemplate = { .tileTag = ANIM_TAG_ORBS, .paletteTag = ANIM_TAG_BERRY_EATEN, @@ -5232,7 +5232,7 @@ const struct SpriteTemplate g10MillionVoltBoltPinkBeamSpriteTemplate = .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimHyperBeamOrb }; -const struct SpriteTemplate g10MillionVoltBoltYellowBeamSpriteTemplate = +const struct SpriteTemplate g10MillionVoltBoltYellowBeamSpriteTemplate = { .tileTag = ANIM_TAG_ORBS, .paletteTag = ANIM_TAG_ELECTRIC_ORBS, @@ -5242,7 +5242,7 @@ const struct SpriteTemplate g10MillionVoltBoltYellowBeamSpriteTemplate = .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimHyperBeamOrb }; -const struct SpriteTemplate g10MillionVoltBoltGreenBeamSpriteTemplate = +const struct SpriteTemplate g10MillionVoltBoltGreenBeamSpriteTemplate = { .tileTag = ANIM_TAG_ORBS, .paletteTag = ANIM_TAG_LEAF, @@ -5252,7 +5252,7 @@ const struct SpriteTemplate g10MillionVoltBoltGreenBeamSpriteTemplate = .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimHyperBeamOrb }; -const struct SpriteTemplate g10MillionVoltBoltPurpleBeamSpriteTemplate = +const struct SpriteTemplate g10MillionVoltBoltPurpleBeamSpriteTemplate = { .tileTag = ANIM_TAG_ORBS, .paletteTag = ANIM_TAG_POISON_BUBBLE, @@ -5264,7 +5264,7 @@ const struct SpriteTemplate g10MillionVoltBoltPurpleBeamSpriteTemplate = }; // stoked sparksurfer -const struct SpriteTemplate gStokedSparksurferFlySpriteTemplate = +const struct SpriteTemplate gStokedSparksurferFlySpriteTemplate = { .tileTag = ANIM_TAG_ROUND_SHADOW, .paletteTag = ANIM_TAG_SPARK_2, @@ -5276,7 +5276,7 @@ const struct SpriteTemplate gStokedSparksurferFlySpriteTemplate = }; // extreme evoboost -const struct SpriteTemplate gExtremeEvoboostRedChargeUpSpriteTemplate = +const struct SpriteTemplate gExtremeEvoboostRedChargeUpSpriteTemplate = { .tileTag = ANIM_TAG_CIRCLE_OF_LIGHT, .paletteTag = ANIM_TAG_VERTICAL_HEX, @@ -5286,7 +5286,7 @@ const struct SpriteTemplate gExtremeEvoboostRedChargeUpSpriteTemplate = .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimParticleInVortex }; -const struct SpriteTemplate gExtremeEvoboostPinkChargeUpSpriteTemplate = +const struct SpriteTemplate gExtremeEvoboostPinkChargeUpSpriteTemplate = { .tileTag = ANIM_TAG_CIRCLE_OF_LIGHT, .paletteTag = ANIM_TAG_BERRY_EATEN, @@ -5296,7 +5296,7 @@ const struct SpriteTemplate gExtremeEvoboostPinkChargeUpSpriteTemplate = .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimParticleInVortex }; -const struct SpriteTemplate gExtremeEvoboostIceChargeUpSpriteTemplate = +const struct SpriteTemplate gExtremeEvoboostIceChargeUpSpriteTemplate = { .tileTag = ANIM_TAG_CIRCLE_OF_LIGHT, .paletteTag = ANIM_TAG_ICE_CHUNK, @@ -5306,7 +5306,7 @@ const struct SpriteTemplate gExtremeEvoboostIceChargeUpSpriteTemplate = .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimParticleInVortex }; -const struct SpriteTemplate gExtremeEvoboostBlackChargeUpSpriteTemplate = +const struct SpriteTemplate gExtremeEvoboostBlackChargeUpSpriteTemplate = { .tileTag = ANIM_TAG_CIRCLE_OF_LIGHT, .paletteTag = ANIM_TAG_WISP_ORB, @@ -5316,7 +5316,7 @@ const struct SpriteTemplate gExtremeEvoboostBlackChargeUpSpriteTemplate = .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimParticleInVortex }; -const struct SpriteTemplate gExtremeEvoboostBlueChargeUpSpriteTemplate = +const struct SpriteTemplate gExtremeEvoboostBlueChargeUpSpriteTemplate = { .tileTag = ANIM_TAG_CIRCLE_OF_LIGHT, .paletteTag = ANIM_TAG_WATER_ORB, @@ -5326,7 +5326,7 @@ const struct SpriteTemplate gExtremeEvoboostBlueChargeUpSpriteTemplate = .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimParticleInVortex }; -const struct SpriteTemplate gExtremeEvoboostPurpleChargeUpSpriteTemplate = +const struct SpriteTemplate gExtremeEvoboostPurpleChargeUpSpriteTemplate = { .tileTag = ANIM_TAG_CIRCLE_OF_LIGHT, .paletteTag = ANIM_TAG_POISON_BUBBLE, @@ -5336,7 +5336,7 @@ const struct SpriteTemplate gExtremeEvoboostPurpleChargeUpSpriteTemplate = .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimParticleInVortex }; -const struct SpriteTemplate gExtremeEvoboostYellowChargeUpSpriteTemplate = +const struct SpriteTemplate gExtremeEvoboostYellowChargeUpSpriteTemplate = { .tileTag = ANIM_TAG_CIRCLE_OF_LIGHT, .paletteTag = ANIM_TAG_CIRCLE_OF_LIGHT, @@ -5346,7 +5346,7 @@ const struct SpriteTemplate gExtremeEvoboostYellowChargeUpSpriteTemplate = .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimParticleInVortex }; -const struct SpriteTemplate gExtremeEvoboostGreenChargeUpSpriteTemplate = +const struct SpriteTemplate gExtremeEvoboostGreenChargeUpSpriteTemplate = { .tileTag = ANIM_TAG_CIRCLE_OF_LIGHT, .paletteTag = ANIM_TAG_LEAF, @@ -5356,7 +5356,7 @@ const struct SpriteTemplate gExtremeEvoboostGreenChargeUpSpriteTemplate = .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimParticleInVortex }; -const struct SpriteTemplate gExtremeEvoboostRedChargeCircleSpriteTemplate = +const struct SpriteTemplate gExtremeEvoboostRedChargeCircleSpriteTemplate = { .tileTag = ANIM_TAG_CIRCLE_OF_LIGHT, .paletteTag = ANIM_TAG_VERTICAL_HEX, @@ -5366,7 +5366,7 @@ const struct SpriteTemplate gExtremeEvoboostRedChargeCircleSpriteTemplate = .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimExtremeEvoboostCircle }; -const struct SpriteTemplate gExtremeEvoboostPinkChargeCircleSpriteTemplate = +const struct SpriteTemplate gExtremeEvoboostPinkChargeCircleSpriteTemplate = { .tileTag = ANIM_TAG_CIRCLE_OF_LIGHT, .paletteTag = ANIM_TAG_BERRY_EATEN, @@ -5376,7 +5376,7 @@ const struct SpriteTemplate gExtremeEvoboostPinkChargeCircleSpriteTemplate = .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimExtremeEvoboostCircle }; -const struct SpriteTemplate gExtremeEvoboostIceChargeCircleSpriteTemplate = +const struct SpriteTemplate gExtremeEvoboostIceChargeCircleSpriteTemplate = { .tileTag = ANIM_TAG_CIRCLE_OF_LIGHT, .paletteTag = ANIM_TAG_ICE_CHUNK, @@ -5386,7 +5386,7 @@ const struct SpriteTemplate gExtremeEvoboostIceChargeCircleSpriteTemplate = .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimExtremeEvoboostCircle }; -const struct SpriteTemplate gExtremeEvoboostBlackChargeCircleSpriteTemplate = +const struct SpriteTemplate gExtremeEvoboostBlackChargeCircleSpriteTemplate = { .tileTag = ANIM_TAG_CIRCLE_OF_LIGHT, .paletteTag = ANIM_TAG_WISP_ORB, @@ -5396,7 +5396,7 @@ const struct SpriteTemplate gExtremeEvoboostBlackChargeCircleSpriteTemplate = .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimExtremeEvoboostCircle }; -const struct SpriteTemplate gExtremeEvoboostBlueChargeCircleSpriteTemplate = +const struct SpriteTemplate gExtremeEvoboostBlueChargeCircleSpriteTemplate = { .tileTag = ANIM_TAG_CIRCLE_OF_LIGHT, .paletteTag = ANIM_TAG_WATER_ORB, @@ -5406,7 +5406,7 @@ const struct SpriteTemplate gExtremeEvoboostBlueChargeCircleSpriteTemplate = .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimExtremeEvoboostCircle }; -const struct SpriteTemplate gExtremeEvoboostPurpleChargeCircleSpriteTemplate = +const struct SpriteTemplate gExtremeEvoboostPurpleChargeCircleSpriteTemplate = { .tileTag = ANIM_TAG_CIRCLE_OF_LIGHT, .paletteTag = ANIM_TAG_POISON_BUBBLE, @@ -5416,7 +5416,7 @@ const struct SpriteTemplate gExtremeEvoboostPurpleChargeCircleSpriteTemplate = .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimExtremeEvoboostCircle }; -const struct SpriteTemplate gExtremeEvoboostYellowChargeCircleSpriteTemplate = +const struct SpriteTemplate gExtremeEvoboostYellowChargeCircleSpriteTemplate = { .tileTag = ANIM_TAG_CIRCLE_OF_LIGHT, .paletteTag = ANIM_TAG_CIRCLE_OF_LIGHT, @@ -5426,7 +5426,7 @@ const struct SpriteTemplate gExtremeEvoboostYellowChargeCircleSpriteTemplate = .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimExtremeEvoboostCircle }; -const struct SpriteTemplate gExtremeEvoboostGreenChargeCircleSpriteTemplate = +const struct SpriteTemplate gExtremeEvoboostGreenChargeCircleSpriteTemplate = { .tileTag = ANIM_TAG_CIRCLE_OF_LIGHT, .paletteTag = ANIM_TAG_LEAF, @@ -5436,7 +5436,7 @@ const struct SpriteTemplate gExtremeEvoboostGreenChargeCircleSpriteTemplate = .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimExtremeEvoboostCircle }; -const struct SpriteTemplate gExtremeEvoboostRedStockpileSpriteTemplate = +const struct SpriteTemplate gExtremeEvoboostRedStockpileSpriteTemplate = { .tileTag = ANIM_TAG_WATER_ORB, .paletteTag = ANIM_TAG_VERTICAL_HEX, @@ -5446,7 +5446,7 @@ const struct SpriteTemplate gExtremeEvoboostRedStockpileSpriteTemplate = .affineAnims = gStockpileAbsorptionOrbAffineAnimTable, .callback = AnimPowerAbsorptionOrb }; -const struct SpriteTemplate gExtremeEvoboostPinkStockpileSpriteTemplate = +const struct SpriteTemplate gExtremeEvoboostPinkStockpileSpriteTemplate = { .tileTag = ANIM_TAG_WATER_ORB, .paletteTag = ANIM_TAG_BERRY_EATEN, @@ -5456,7 +5456,7 @@ const struct SpriteTemplate gExtremeEvoboostPinkStockpileSpriteTemplate = .affineAnims = gStockpileAbsorptionOrbAffineAnimTable, .callback = AnimPowerAbsorptionOrb }; -const struct SpriteTemplate gExtremeEvoboostIceStockpileSpriteTemplate = +const struct SpriteTemplate gExtremeEvoboostIceStockpileSpriteTemplate = { .tileTag = ANIM_TAG_WATER_ORB, .paletteTag = ANIM_TAG_ICE_CHUNK, @@ -5466,7 +5466,7 @@ const struct SpriteTemplate gExtremeEvoboostIceStockpileSpriteTemplate = .affineAnims = gStockpileAbsorptionOrbAffineAnimTable, .callback = AnimPowerAbsorptionOrb }; -const struct SpriteTemplate gExtremeEvoboostBlackStockpileSpriteTemplate = +const struct SpriteTemplate gExtremeEvoboostBlackStockpileSpriteTemplate = { .tileTag = ANIM_TAG_WATER_ORB, .paletteTag = ANIM_TAG_WISP_ORB, @@ -5476,7 +5476,7 @@ const struct SpriteTemplate gExtremeEvoboostBlackStockpileSpriteTemplate = .affineAnims = gStockpileAbsorptionOrbAffineAnimTable, .callback = AnimPowerAbsorptionOrb }; -const struct SpriteTemplate gExtremeEvoboostBlueStockpileSpriteTemplate = +const struct SpriteTemplate gExtremeEvoboostBlueStockpileSpriteTemplate = { .tileTag = ANIM_TAG_WATER_ORB, .paletteTag = ANIM_TAG_WATER_ORB, @@ -5486,7 +5486,7 @@ const struct SpriteTemplate gExtremeEvoboostBlueStockpileSpriteTemplate = .affineAnims = gStockpileAbsorptionOrbAffineAnimTable, .callback = AnimPowerAbsorptionOrb }; -const struct SpriteTemplate gExtremeEvoboostPurpleStockpileSpriteTemplate = +const struct SpriteTemplate gExtremeEvoboostPurpleStockpileSpriteTemplate = { .tileTag = ANIM_TAG_WATER_ORB, .paletteTag = ANIM_TAG_POISON_BUBBLE, @@ -5496,7 +5496,7 @@ const struct SpriteTemplate gExtremeEvoboostPurpleStockpileSpriteTemplate = .affineAnims = gStockpileAbsorptionOrbAffineAnimTable, .callback = AnimPowerAbsorptionOrb }; -const struct SpriteTemplate gExtremeEvoboostYellowStockpileSpriteTemplate = +const struct SpriteTemplate gExtremeEvoboostYellowStockpileSpriteTemplate = { .tileTag = ANIM_TAG_WATER_ORB, .paletteTag = ANIM_TAG_CIRCLE_OF_LIGHT, @@ -5506,7 +5506,7 @@ const struct SpriteTemplate gExtremeEvoboostYellowStockpileSpriteTemplate = .affineAnims = gStockpileAbsorptionOrbAffineAnimTable, .callback = AnimPowerAbsorptionOrb }; -const struct SpriteTemplate gExtremeEvoboostGreenStockpileSpriteTemplate = +const struct SpriteTemplate gExtremeEvoboostGreenStockpileSpriteTemplate = { .tileTag = ANIM_TAG_WATER_ORB, .paletteTag = ANIM_TAG_LEAF, @@ -5518,7 +5518,7 @@ const struct SpriteTemplate gExtremeEvoboostGreenStockpileSpriteTemplate = }; // pulverizing pancake -const struct SpriteTemplate gPulverizingPancakeRedDetectSpriteTemplate = +const struct SpriteTemplate gPulverizingPancakeRedDetectSpriteTemplate = { .tileTag = ANIM_TAG_SPARKLE_4, .paletteTag = ANIM_TAG_VERTICAL_HEX, @@ -5528,7 +5528,7 @@ const struct SpriteTemplate gPulverizingPancakeRedDetectSpriteTemplate = .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimSpinningSparkle }; -const struct SpriteTemplate gPulverizingPancakeExplosionSpriteTemplate = +const struct SpriteTemplate gPulverizingPancakeExplosionSpriteTemplate = { .tileTag = ANIM_TAG_EXPLOSION, .paletteTag = ANIM_TAG_ELECTRIC_ORBS, @@ -5538,7 +5538,7 @@ const struct SpriteTemplate gPulverizingPancakeExplosionSpriteTemplate = .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimSpriteOnMonPos }; -const struct SpriteTemplate gPulverizingPancakeYellowRingSpriteTemplate = +const struct SpriteTemplate gPulverizingPancakeYellowRingSpriteTemplate = { .tileTag = ANIM_TAG_THIN_RING, .paletteTag = ANIM_TAG_ELECTRIC_ORBS, @@ -5550,7 +5550,7 @@ const struct SpriteTemplate gPulverizingPancakeYellowRingSpriteTemplate = }; // genesis supernova -const struct SpriteTemplate gGenesisSupernovaOrbRiseSpriteTemplate = +const struct SpriteTemplate gGenesisSupernovaOrbRiseSpriteTemplate = { .tileTag = ANIM_TAG_POISON_BUBBLE, .paletteTag = ANIM_TAG_POISON_JAB, @@ -5560,7 +5560,7 @@ const struct SpriteTemplate gGenesisSupernovaOrbRiseSpriteTemplate = .affineAnims = gAffineAnims_Bubble, .callback = AnimAssistPawprint }; -const struct SpriteTemplate gGenesisSupernovaReversalSpriteTemplate = +const struct SpriteTemplate gGenesisSupernovaReversalSpriteTemplate = { .tileTag = ANIM_TAG_POISON_BUBBLE, .paletteTag = ANIM_TAG_POISON_JAB, @@ -5570,7 +5570,7 @@ const struct SpriteTemplate gGenesisSupernovaReversalSpriteTemplate = .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimReversalOrb }; -const struct SpriteTemplate gGenesisSupernovaSpinUpSpriteTemplate = +const struct SpriteTemplate gGenesisSupernovaSpinUpSpriteTemplate = { .tileTag = ANIM_TAG_POISON_BUBBLE, .paletteTag = ANIM_TAG_POISON_JAB, @@ -5580,7 +5580,7 @@ const struct SpriteTemplate gGenesisSupernovaSpinUpSpriteTemplate = .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimParticleInVortex }; -const struct SpriteTemplate gGenesisSupernovaChargeSpriteTemplate = +const struct SpriteTemplate gGenesisSupernovaChargeSpriteTemplate = { .tileTag = ANIM_TAG_CIRCLE_OF_LIGHT, .paletteTag = ANIM_TAG_POISON_JAB, @@ -5590,7 +5590,7 @@ const struct SpriteTemplate gGenesisSupernovaChargeSpriteTemplate = .affineAnims = gAffineAnims_GrowingElectricOrb, .callback = AnimGrowingChargeOrb }; -const struct SpriteTemplate gGenesisSupernovaSuperpowerSpriteTemplate = +const struct SpriteTemplate gGenesisSupernovaSuperpowerSpriteTemplate = { .tileTag = ANIM_TAG_METEOR, .paletteTag = ANIM_TAG_WISP_ORB, @@ -5600,7 +5600,7 @@ const struct SpriteTemplate gGenesisSupernovaSuperpowerSpriteTemplate = .affineAnims = sSpriteAffineAnimTable_GrowingSuperpower, .callback = SpriteCB_GrowingSuperpower }; -const struct SpriteTemplate gGenesisSupernovaBubbleSpriteTemplate = +const struct SpriteTemplate gGenesisSupernovaBubbleSpriteTemplate = { .tileTag = ANIM_TAG_POISON_BUBBLE, .paletteTag = ANIM_TAG_POISON_JAB, @@ -5610,7 +5610,7 @@ const struct SpriteTemplate gGenesisSupernovaBubbleSpriteTemplate = .affineAnims = gAffineAnims_Bubble, .callback = AnimBubbleEffect }; -const struct SpriteTemplate gGenesisSupernovaExplosionSpriteTemplate = +const struct SpriteTemplate gGenesisSupernovaExplosionSpriteTemplate = { .tileTag = ANIM_TAG_EXPLOSION, .paletteTag = ANIM_TAG_WISP_ORB, @@ -5650,7 +5650,7 @@ static const union AffineAnimCmd *const sArrowRaidFlyLeftAffineAnimTable[] = { sArrowRaidFlyLeftAffineAnims, sArrowRaidFlyLeftAffineAnims }; -const struct SpriteTemplate gArrowRaidExplosionSpriteTemplate = +const struct SpriteTemplate gArrowRaidExplosionSpriteTemplate = { .tileTag = ANIM_TAG_EXPLOSION_2, .paletteTag = ANIM_TAG_POISON_BUBBLE, @@ -5660,7 +5660,7 @@ const struct SpriteTemplate gArrowRaidExplosionSpriteTemplate = .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimSpriteOnMonPos }; -const struct SpriteTemplate gArrowRaidFlyUpSpriteTemplate = +const struct SpriteTemplate gArrowRaidFlyUpSpriteTemplate = { .tileTag = ANIM_TAG_ROUND_SHADOW, .paletteTag = ANIM_TAG_LEAF, @@ -5670,7 +5670,7 @@ const struct SpriteTemplate gArrowRaidFlyUpSpriteTemplate = .affineAnims = gAffineAnims_FlyBallUp, .callback = AnimFlyBallUp }; -const struct SpriteTemplate gArrowRaidFlyRightSpriteTemplate = +const struct SpriteTemplate gArrowRaidFlyRightSpriteTemplate = { .tileTag = ANIM_TAG_BIRD, .paletteTag = ANIM_TAG_LEAF, @@ -5680,7 +5680,7 @@ const struct SpriteTemplate gArrowRaidFlyRightSpriteTemplate = .affineAnims = sArrowRaidFlyRightAffineAnimTable, .callback = AnimAssistPawprint }; -const struct SpriteTemplate gArrowRaidFlyLeftSpriteTemplate = +const struct SpriteTemplate gArrowRaidFlyLeftSpriteTemplate = { .tileTag = ANIM_TAG_BIRD, .paletteTag = ANIM_TAG_LEAF, @@ -5690,7 +5690,7 @@ const struct SpriteTemplate gArrowRaidFlyLeftSpriteTemplate = .affineAnims = sArrowRaidFlyLeftAffineAnimTable, .callback = AnimAssistPawprint }; -const struct SpriteTemplate gArrowRaidFlyStrikeSpriteTemplate = +const struct SpriteTemplate gArrowRaidFlyStrikeSpriteTemplate = { .tileTag = ANIM_TAG_BIRD, .paletteTag = ANIM_TAG_LEAF, @@ -5707,7 +5707,7 @@ static const union AffineAnimCmd sArrowRaidArrowUpAffineAnims[] = { static const union AffineAnimCmd *const sArrowRaidArrowUpAffineAnimTable[] = { sArrowRaidArrowUpAffineAnims, }; -const struct SpriteTemplate gArrowRaidArrowUpSpriteTemplate = +const struct SpriteTemplate gArrowRaidArrowUpSpriteTemplate = { .tileTag = ANIM_TAG_SPIRIT_ARROW, .paletteTag = ANIM_TAG_SPIRIT_ARROW, @@ -5724,7 +5724,7 @@ static const union AffineAnimCmd sArrowRaidArrowRightUpAffineAnims[] = { static const union AffineAnimCmd *const sArrowRaidArrowRightUpAffineAnimTable[] = { sArrowRaidArrowRightUpAffineAnims, }; -const struct SpriteTemplate gArrowRaidRightUpSpriteTemplate = +const struct SpriteTemplate gArrowRaidRightUpSpriteTemplate = { .tileTag = ANIM_TAG_SPIRIT_ARROW, .paletteTag = ANIM_TAG_SPIRIT_ARROW, @@ -5741,7 +5741,7 @@ static const union AffineAnimCmd sArrowRaidRightDownAffineAnims[] = { static const union AffineAnimCmd *const sArrowRaidRightDownAffineAnimTable[] = { sArrowRaidRightDownAffineAnims, }; -const struct SpriteTemplate gArrowRaidRightDownSpriteTemplate = +const struct SpriteTemplate gArrowRaidRightDownSpriteTemplate = { .tileTag = ANIM_TAG_SPIRIT_ARROW, .paletteTag = ANIM_TAG_SPIRIT_ARROW, @@ -5758,7 +5758,7 @@ static const union AffineAnimCmd sArrowRaidArrowLeftUpAffineAnims[] = { static const union AffineAnimCmd *const sArrowRaidLeftUpAffineAnimTable[] = { sArrowRaidArrowLeftUpAffineAnims, }; -const struct SpriteTemplate gArrowRaidLeftUpSpriteTemplate = +const struct SpriteTemplate gArrowRaidLeftUpSpriteTemplate = { .tileTag = ANIM_TAG_SPIRIT_ARROW, .paletteTag = ANIM_TAG_SPIRIT_ARROW, @@ -5775,7 +5775,7 @@ static const union AffineAnimCmd sArrowRaidFaceUpLeftAffineAnims[] = { static const union AffineAnimCmd *const sArrowRaidFaceUpLeftAffineAnimTable[] = { sArrowRaidFaceUpLeftAffineAnims, }; -const struct SpriteTemplate gArrowRaidFaceUpLeftSpriteTemplate = +const struct SpriteTemplate gArrowRaidFaceUpLeftSpriteTemplate = { .tileTag = ANIM_TAG_SPIRIT_ARROW, .paletteTag = ANIM_TAG_SPIRIT_ARROW, @@ -5792,7 +5792,7 @@ static const union AffineAnimCmd sArrowRaidArrowFaceRightAffineAnims[] = { static const union AffineAnimCmd *const sArrowRaidArrowFaceRightAffineAnimTable[] = { sArrowRaidArrowFaceRightAffineAnims }; -const struct SpriteTemplate gArrowRaidRightSpriteTemplate = +const struct SpriteTemplate gArrowRaidRightSpriteTemplate = { .tileTag = ANIM_TAG_SPIRIT_ARROW, .paletteTag = ANIM_TAG_SPIRIT_ARROW, @@ -5809,7 +5809,7 @@ static const union AffineAnimCmd sArrowRaidLeftDownAffineAnims[] = { static const union AffineAnimCmd *const sArrowRaidLeftDownAffineAnimTable[] = { sArrowRaidLeftDownAffineAnims }; -const struct SpriteTemplate gArrowRaidLeftDownSpriteTemplate = +const struct SpriteTemplate gArrowRaidLeftDownSpriteTemplate = { .tileTag = ANIM_TAG_SPIRIT_ARROW, .paletteTag = ANIM_TAG_SPIRIT_ARROW, @@ -5826,7 +5826,7 @@ static const union AffineAnimCmd sArrowRaidOnslaughtAffineAnims[] = { static const union AffineAnimCmd *const sArrowRaidOnslaughtAffineAnimTable[] = { sArrowRaidOnslaughtAffineAnims }; -const struct SpriteTemplate gArrowRaidArrowOnslaughtSpriteTemplate = +const struct SpriteTemplate gArrowRaidArrowOnslaughtSpriteTemplate = { .tileTag = ANIM_TAG_SPIRIT_ARROW, .paletteTag = ANIM_TAG_SPIRIT_ARROW, @@ -5838,7 +5838,7 @@ const struct SpriteTemplate gArrowRaidArrowOnslaughtSpriteTemplate = }; // malicious moonsault -const struct SpriteTemplate gMaliciousMoonsaultRedFlySpriteTemplate = +const struct SpriteTemplate gMaliciousMoonsaultRedFlySpriteTemplate = { .tileTag = ANIM_TAG_ROUND_SHADOW, .paletteTag = ANIM_TAG_VERTICAL_HEX, @@ -5848,7 +5848,7 @@ const struct SpriteTemplate gMaliciousMoonsaultRedFlySpriteTemplate = .affineAnims = gAffineAnims_FlyBallUp, .callback = AnimFlyBallUp }; -const struct SpriteTemplate gMaliciousMoonsaultRedBounceSpriteTemplate = +const struct SpriteTemplate gMaliciousMoonsaultRedBounceSpriteTemplate = { .tileTag = ANIM_TAG_ROUND_SHADOW, .paletteTag = ANIM_TAG_VERTICAL_HEX, @@ -5858,7 +5858,7 @@ const struct SpriteTemplate gMaliciousMoonsaultRedBounceSpriteTemplate = .affineAnims = gAffineAnims_BounceBallLand, .callback = AnimBounceBallLand }; -const struct SpriteTemplate gMaliciousMoonsaultRedImpactSpriteTemplate = +const struct SpriteTemplate gMaliciousMoonsaultRedImpactSpriteTemplate = { .tileTag = ANIM_TAG_IMPACT, .paletteTag = ANIM_TAG_VERTICAL_HEX, @@ -5868,7 +5868,7 @@ const struct SpriteTemplate gMaliciousMoonsaultRedImpactSpriteTemplate = .affineAnims = gAffineAnims_HitSplat, .callback = AnimHitSplatBasic }; -const struct SpriteTemplate gMaliciousMoonsaultFireblastSpriteTemplate = +const struct SpriteTemplate gMaliciousMoonsaultFireblastSpriteTemplate = { .tileTag = ANIM_TAG_SMALL_EMBER, .paletteTag = ANIM_TAG_VERTICAL_HEX, @@ -5878,7 +5878,7 @@ const struct SpriteTemplate gMaliciousMoonsaultFireblastSpriteTemplate = .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimFireCross }; -const struct SpriteTemplate gMaliciousMoonsaultExplosionSpriteTemplate = +const struct SpriteTemplate gMaliciousMoonsaultExplosionSpriteTemplate = { .tileTag = ANIM_TAG_EXPLOSION_2, .paletteTag = ANIM_TAG_EXPLOSION_2, @@ -5900,7 +5900,7 @@ const struct SpriteTemplate gOceanOperaSpotlightSpriteTemplate = .affineAnims = gSpotlightAffineAnimTable, .callback = AnimOceanicOperettaSpotlight, }; -const struct SpriteTemplate gOceanOperaBlueFlareSpriteTemplate = +const struct SpriteTemplate gOceanOperaBlueFlareSpriteTemplate = { .tileTag = ANIM_TAG_FOCUS_ENERGY, .paletteTag = ANIM_TAG_WATER_ORB, @@ -5910,7 +5910,7 @@ const struct SpriteTemplate gOceanOperaBlueFlareSpriteTemplate = .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimEndureEnergy }; -const struct SpriteTemplate gOceanOperaBlueChargeSpriteTemplate = +const struct SpriteTemplate gOceanOperaBlueChargeSpriteTemplate = { .tileTag = ANIM_TAG_CIRCLE_OF_LIGHT, .paletteTag = ANIM_TAG_WATER_ORB, @@ -5920,7 +5920,7 @@ const struct SpriteTemplate gOceanOperaBlueChargeSpriteTemplate = .affineAnims = gAffineAnims_GrowingElectricOrb, .callback = AnimGrowingChargeOrb }; -const struct SpriteTemplate gOceanOperaBlueRingSpriteTemplate = +const struct SpriteTemplate gOceanOperaBlueRingSpriteTemplate = { .tileTag = ANIM_TAG_THIN_RING, .paletteTag = ANIM_TAG_WATER_ORB, @@ -5930,7 +5930,7 @@ const struct SpriteTemplate gOceanOperaBlueRingSpriteTemplate = .affineAnims = gThinRingShrinkingAffineAnimTable, .callback = AnimSpriteOnMonPos }; -const struct SpriteTemplate gOceanOperaMovingOrbsSpriteTemplate = +const struct SpriteTemplate gOceanOperaMovingOrbsSpriteTemplate = { .tileTag = ANIM_TAG_CIRCLE_OF_LIGHT, .paletteTag = ANIM_TAG_WATER_ORB, @@ -5940,7 +5940,7 @@ const struct SpriteTemplate gOceanOperaMovingOrbsSpriteTemplate = .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimThrowMistBall }; -const struct SpriteTemplate gOceanOperaBlueOrbsSpriteTemplate = +const struct SpriteTemplate gOceanOperaBlueOrbsSpriteTemplate = { .tileTag = ANIM_TAG_CIRCLE_OF_LIGHT, .paletteTag = ANIM_TAG_WATER_ORB, @@ -5950,7 +5950,7 @@ const struct SpriteTemplate gOceanOperaBlueOrbsSpriteTemplate = .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimBite }; -const struct SpriteTemplate gOceanOperaExpandingRingSpriteTemplate = +const struct SpriteTemplate gOceanOperaExpandingRingSpriteTemplate = { .tileTag = ANIM_TAG_THIN_RING, .paletteTag = ANIM_TAG_WATER_ORB, @@ -5960,7 +5960,7 @@ const struct SpriteTemplate gOceanOperaExpandingRingSpriteTemplate = .affineAnims = gThinRingExpandingAffineAnimTable, .callback = AnimSpriteOnMonPos }; -const struct SpriteTemplate gOceanOperaExplosionSpriteTemplate = +const struct SpriteTemplate gOceanOperaExplosionSpriteTemplate = { .tileTag = ANIM_TAG_EXPLOSION, .paletteTag = ANIM_TAG_WATER_ORB, @@ -5970,7 +5970,7 @@ const struct SpriteTemplate gOceanOperaExplosionSpriteTemplate = .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimSpriteOnMonPos }; -const struct SpriteTemplate gOceanOperaSparkleSpriteTemplate = +const struct SpriteTemplate gOceanOperaSparkleSpriteTemplate = { .tileTag = ANIM_TAG_SPARKLE_2, .paletteTag = ANIM_TAG_WATER_ORB, @@ -5982,7 +5982,7 @@ const struct SpriteTemplate gOceanOperaSparkleSpriteTemplate = }; // splintered stormshards -const struct SpriteTemplate gSplinteredShardsFlySpriteTemplate = +const struct SpriteTemplate gSplinteredShardsFlySpriteTemplate = { .tileTag = ANIM_TAG_ROUND_SHADOW, .paletteTag = ANIM_TAG_ROCKS, @@ -5992,7 +5992,7 @@ const struct SpriteTemplate gSplinteredShardsFlySpriteTemplate = .affineAnims = gAffineAnims_FlyBallUp, .callback = AnimFlyBallUp }; -const struct SpriteTemplate gSplinteredShardsExplosionSpriteTemplate = +const struct SpriteTemplate gSplinteredShardsExplosionSpriteTemplate = { .tileTag = ANIM_TAG_EXPLOSION, .paletteTag = ANIM_TAG_ROCKS, @@ -6002,7 +6002,7 @@ const struct SpriteTemplate gSplinteredShardsExplosionSpriteTemplate = .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimSpriteOnMonPos }; -const struct SpriteTemplate gSplinteredShardsRisingSpearSpriteTemplate = +const struct SpriteTemplate gSplinteredShardsRisingSpearSpriteTemplate = { .tileTag = ANIM_TAG_ICICLE_SPEAR, .paletteTag = ANIM_TAG_ROCKS, @@ -6019,7 +6019,7 @@ static const union AffineAnimCmd sSplinteredShardsOpponentSteepAffineAnims[] = { static const union AffineAnimCmd *const sSplinteredShardsOpponentSteepAffineAnimTable[] = { sSplinteredShardsOpponentSteepAffineAnims, }; -const struct SpriteTemplate gSplinteredShardsSplinterOpponentSteepSpriteTemplate = +const struct SpriteTemplate gSplinteredShardsSplinterOpponentSteepSpriteTemplate = { .tileTag = ANIM_TAG_ICICLE_SPEAR, .paletteTag = ANIM_TAG_ROCKS, @@ -6036,7 +6036,7 @@ static const union AffineAnimCmd sSplinteredShardsOpponentShallowAffineAnims[] = static const union AffineAnimCmd *const sSplinteredShardsOpponentShallowAffineAnimTable[] = { sSplinteredShardsOpponentShallowAffineAnims }; -const struct SpriteTemplate gSplinteredShardsSplinterOpponentShallowSpriteTemplate = +const struct SpriteTemplate gSplinteredShardsSplinterOpponentShallowSpriteTemplate = { .tileTag = ANIM_TAG_ICICLE_SPEAR, .paletteTag = ANIM_TAG_ROCKS, @@ -6053,7 +6053,7 @@ static const union AffineAnimCmd sSplinteredShardsPlayerSteepAffineAnims[] = { static const union AffineAnimCmd *const sSplinteredShardsPlayerSteepAffineAnimTable[] = { sSplinteredShardsPlayerSteepAffineAnims }; -const struct SpriteTemplate gSplinteredShardsSplinterPlayerSteepSpriteTemplate = +const struct SpriteTemplate gSplinteredShardsSplinterPlayerSteepSpriteTemplate = { .tileTag = ANIM_TAG_ICICLE_SPEAR, .paletteTag = ANIM_TAG_ROCKS, @@ -6070,7 +6070,7 @@ static const union AffineAnimCmd sSplinteredShardsPlayerShallowAffineAnims[] = { static const union AffineAnimCmd *const sSplinteredShardsPlayerShallowAffineAnimTable[] = { sSplinteredShardsPlayerShallowAffineAnims }; -const struct SpriteTemplate gSplinteredShardsSplinterPlayerShallowSpriteTemplate = +const struct SpriteTemplate gSplinteredShardsSplinterPlayerShallowSpriteTemplate = { .tileTag = ANIM_TAG_ICICLE_SPEAR, .paletteTag = ANIM_TAG_ROCKS, @@ -6082,7 +6082,7 @@ const struct SpriteTemplate gSplinteredShardsSplinterPlayerShallowSpriteTemplate }; // lets snuggle forever -const struct SpriteTemplate gSnuggleForeverEyesSpriteTemplate = +const struct SpriteTemplate gSnuggleForeverEyesSpriteTemplate = { .tileTag = ANIM_TAG_SPARKLE_4, .paletteTag = ANIM_TAG_VERTICAL_HEX, @@ -6092,7 +6092,7 @@ const struct SpriteTemplate gSnuggleForeverEyesSpriteTemplate = .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimSpinningSparkle }; -const struct SpriteTemplate gSnuggleForeverStarSpriteTemplate = +const struct SpriteTemplate gSnuggleForeverStarSpriteTemplate = { .tileTag = ANIM_TAG_PAIN_SPLIT, .paletteTag = ANIM_TAG_DUCK, @@ -6102,7 +6102,7 @@ const struct SpriteTemplate gSnuggleForeverStarSpriteTemplate = .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimDizzyPunchDuck }; -const struct SpriteTemplate gSnuggleForeverHeartSpriteTemplate = +const struct SpriteTemplate gSnuggleForeverHeartSpriteTemplate = { .tileTag = ANIM_TAG_MAGENTA_HEART, .paletteTag = ANIM_TAG_VERTICAL_HEX, @@ -6114,7 +6114,7 @@ const struct SpriteTemplate gSnuggleForeverHeartSpriteTemplate = }; // clangorous soulblaze -const struct SpriteTemplate gClangoorousSoulblazeWhiteFlySpriteTemplate = +const struct SpriteTemplate gClangoorousSoulblazeWhiteFlySpriteTemplate = { .tileTag = ANIM_TAG_ROUND_SHADOW, .paletteTag = ANIM_TAG_AIR_WAVE_2, @@ -6124,7 +6124,7 @@ const struct SpriteTemplate gClangoorousSoulblazeWhiteFlySpriteTemplate = .affineAnims = gAffineAnims_FlyBallUp, .callback = AnimFlyBallUp }; -const struct SpriteTemplate gClangoorousSoulblazePurpleSwirlSpriteTemplate = +const struct SpriteTemplate gClangoorousSoulblazePurpleSwirlSpriteTemplate = { .tileTag = ANIM_TAG_WATER_ORB, .paletteTag = ANIM_TAG_POISON_BUBBLE, @@ -6134,7 +6134,7 @@ const struct SpriteTemplate gClangoorousSoulblazePurpleSwirlSpriteTemplate = .affineAnims = gAffineAnims_Whirlpool, .callback = AnimParticleInVortex }; -const struct SpriteTemplate gClangoorousSoulblazePurpleChargeSpriteTemplate = +const struct SpriteTemplate gClangoorousSoulblazePurpleChargeSpriteTemplate = { .tileTag = ANIM_TAG_CIRCLE_OF_LIGHT, .paletteTag = ANIM_TAG_POISON_BUBBLE, @@ -6144,7 +6144,7 @@ const struct SpriteTemplate gClangoorousSoulblazePurpleChargeSpriteTemplate = .affineAnims = gAffineAnims_GrowingElectricOrb, .callback = AnimGrowingChargeOrb }; -const struct SpriteTemplate gClangoorousSoulblazePulseSpriteTemplate = +const struct SpriteTemplate gClangoorousSoulblazePulseSpriteTemplate = { .tileTag = ANIM_TAG_THIN_RING, .paletteTag = ANIM_TAG_POISON_BUBBLE, @@ -6155,8 +6155,8 @@ const struct SpriteTemplate gClangoorousSoulblazePulseSpriteTemplate = .callback = TranslateAnimSpriteToTargetMonLocation }; -// guardian of alola -const struct SpriteTemplate gGuardianOfAlolaFistSpriteTemplate = +// guardian of alola +const struct SpriteTemplate gGuardianOfAlolaFistSpriteTemplate = { .tileTag = ANIM_TAG_HORSESHOE_SIDE_FIST, .paletteTag = ANIM_TAG_HORSESHOE_SIDE_FIST, @@ -6166,7 +6166,7 @@ const struct SpriteTemplate gGuardianOfAlolaFistSpriteTemplate = .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimStompFoot }; -const struct SpriteTemplate gGuardianOfAlolaDirtGeyserSpriteTemplate = +const struct SpriteTemplate gGuardianOfAlolaDirtGeyserSpriteTemplate = { .tileTag = ANIM_TAG_MUD_SAND, .paletteTag = ANIM_TAG_MUD_SAND, @@ -6186,7 +6186,7 @@ static const union AffineAnimCmd sSearingSunrazeSmashWormholeGrowingAffineAnims[ static const union AffineAnimCmd *const sSearingSunrazeSmashWormholeGrowingAffineAnimTable[] = { sSearingSunrazeSmashWormholeGrowingAffineAnims }; -const struct SpriteTemplate gSearingSunrazeSmashGrowWormholeSpriteTemplate = +const struct SpriteTemplate gSearingSunrazeSmashGrowWormholeSpriteTemplate = { .tileTag = ANIM_TAG_SHADOW_BALL, .paletteTag = ANIM_TAG_WATER_ORB, @@ -6196,7 +6196,7 @@ const struct SpriteTemplate gSearingSunrazeSmashGrowWormholeSpriteTemplate = .affineAnims = sSearingSunrazeSmashWormholeGrowingAffineAnimTable, .callback = AnimSpriteOnMonPos }; -const struct SpriteTemplate gSearingSunrazeSmashBlueRingInwardsSpriteTemplate = +const struct SpriteTemplate gSearingSunrazeSmashBlueRingInwardsSpriteTemplate = { .tileTag = ANIM_TAG_THIN_RING, .paletteTag = ANIM_TAG_WATER_ORB, @@ -6206,7 +6206,7 @@ const struct SpriteTemplate gSearingSunrazeSmashBlueRingInwardsSpriteTemplate = .affineAnims = gThinRingShrinkingAffineAnimTable, .callback = AnimSpriteOnMonPos }; -const struct SpriteTemplate gSearingSunrazeSmashWhiteRingInwardsSpriteTemplate = +const struct SpriteTemplate gSearingSunrazeSmashWhiteRingInwardsSpriteTemplate = { .tileTag = ANIM_TAG_THIN_RING, .paletteTag = ANIM_TAG_AIR_WAVE_2, @@ -6216,7 +6216,7 @@ const struct SpriteTemplate gSearingSunrazeSmashWhiteRingInwardsSpriteTemplate = .affineAnims = gThinRingShrinkingAffineAnimTable, .callback = AnimSpriteOnMonPos }; -const struct SpriteTemplate gSearingSunrazeSmashCrossImpactSpriteTemplate = +const struct SpriteTemplate gSearingSunrazeSmashCrossImpactSpriteTemplate = { .tileTag = ANIM_TAG_CROSS_IMPACT, .paletteTag = ANIM_TAG_AIR_WAVE_2, @@ -6226,7 +6226,7 @@ const struct SpriteTemplate gSearingSunrazeSmashCrossImpactSpriteTemplate = .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimCrossImpact }; -const struct SpriteTemplate gSearingSunrazeSmashWhiteCutSpriteTemplate = +const struct SpriteTemplate gSearingSunrazeSmashWhiteCutSpriteTemplate = { .tileTag = ANIM_TAG_CUT, .paletteTag = ANIM_TAG_AIR_WAVE_2, @@ -6236,7 +6236,7 @@ const struct SpriteTemplate gSearingSunrazeSmashWhiteCutSpriteTemplate = .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimCuttingSlice }; -const struct SpriteTemplate gSearingSunrazeSmashInfernoOrbSpriteTemplate = +const struct SpriteTemplate gSearingSunrazeSmashInfernoOrbSpriteTemplate = { .tileTag = ANIM_TAG_CIRCLE_OF_LIGHT, .paletteTag = ANIM_TAG_VERTICAL_HEX, @@ -6246,7 +6246,7 @@ const struct SpriteTemplate gSearingSunrazeSmashInfernoOrbSpriteTemplate = .affineAnims = gAffineAnims_GrowingElectricOrb, .callback = AnimGrowingChargeOrb }; -const struct SpriteTemplate gSearingSunrazeSmashShockwaveSpriteTemplate = +const struct SpriteTemplate gSearingSunrazeSmashShockwaveSpriteTemplate = { .tileTag = ANIM_TAG_CIRCLE_OF_LIGHT, .paletteTag = ANIM_TAG_VERTICAL_HEX, @@ -6256,7 +6256,7 @@ const struct SpriteTemplate gSearingSunrazeSmashShockwaveSpriteTemplate = .affineAnims = gAffineAnims_GrowingElectricOrb, .callback = AnimGrowingShockWaveOrbOnTarget }; -const struct SpriteTemplate gSearingSunrazeSmashRedFlySpriteTemplate = +const struct SpriteTemplate gSearingSunrazeSmashRedFlySpriteTemplate = { .tileTag = ANIM_TAG_ROUND_SHADOW, .paletteTag = ANIM_TAG_VERTICAL_HEX, @@ -6268,7 +6268,7 @@ const struct SpriteTemplate gSearingSunrazeSmashRedFlySpriteTemplate = }; // menacing moonraze maelstrom -const struct SpriteTemplate gMoonrazeMaelstromBlueBuffSpriteTemplate = +const struct SpriteTemplate gMoonrazeMaelstromBlueBuffSpriteTemplate = { .tileTag = ANIM_TAG_FOCUS_ENERGY, .paletteTag = ANIM_TAG_WATER_ORB, @@ -6278,7 +6278,7 @@ const struct SpriteTemplate gMoonrazeMaelstromBlueBuffSpriteTemplate = .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimEndureEnergy }; -const struct SpriteTemplate gMoonrazeMaelstromBlackBuffSpriteTemplate = +const struct SpriteTemplate gMoonrazeMaelstromBlackBuffSpriteTemplate = { .tileTag = ANIM_TAG_FOCUS_ENERGY, .paletteTag = ANIM_TAG_HANDS_AND_FEET, @@ -6288,7 +6288,7 @@ const struct SpriteTemplate gMoonrazeMaelstromBlackBuffSpriteTemplate = .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimEndureEnergy }; -const struct SpriteTemplate gMoonrazeMaelstromPurpleBuffSpriteTemplate = +const struct SpriteTemplate gMoonrazeMaelstromPurpleBuffSpriteTemplate = { .tileTag = ANIM_TAG_FOCUS_ENERGY, .paletteTag = ANIM_TAG_POISON_BUBBLE, @@ -6298,7 +6298,7 @@ const struct SpriteTemplate gMoonrazeMaelstromPurpleBuffSpriteTemplate = .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimEndureEnergy }; -const struct SpriteTemplate gMoonrazeMaelstromBlackSparklesSpriteTemplate = +const struct SpriteTemplate gMoonrazeMaelstromBlackSparklesSpriteTemplate = { .tileTag = ANIM_TAG_SPARKLE_2, .paletteTag = ANIM_TAG_HANDS_AND_FEET, @@ -6308,27 +6308,27 @@ const struct SpriteTemplate gMoonrazeMaelstromBlackSparklesSpriteTemplate = .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimGrantingStars }; -const struct SpriteTemplate gMoonrazeMaelstromBlueRingSpriteTemplate = +const struct SpriteTemplate gMoonrazeMaelstromBlueRingSpriteTemplate = { .tileTag = ANIM_TAG_THIN_RING, .paletteTag = ANIM_TAG_WATER_ORB, .oam = &gOamData_AffineDouble_ObjBlend_64x64, .anims = gDummySpriteAnimTable, - .images = NULL, + .images = NULL, .affineAnims = gThinRingShrinkingAffineAnimTable, .callback = AnimSpriteOnMonPos }; -const struct SpriteTemplate gMoonrazeMaelstromWhiteRingSpriteTemplate = +const struct SpriteTemplate gMoonrazeMaelstromWhiteRingSpriteTemplate = { .tileTag = ANIM_TAG_THIN_RING, .paletteTag = ANIM_TAG_AIR_WAVE_2, .oam = &gOamData_AffineDouble_ObjBlend_64x64, .anims = gDummySpriteAnimTable, - .images = NULL, + .images = NULL, .affineAnims = gThinRingShrinkingAffineAnimTable, .callback = AnimSpriteOnMonPos }; -const struct SpriteTemplate gMoonrazeMaelstromSuperpowerSpriteTemplate = +const struct SpriteTemplate gMoonrazeMaelstromSuperpowerSpriteTemplate = { .tileTag = ANIM_TAG_METEOR, .paletteTag = ANIM_TAG_HANDS_AND_FEET, @@ -6338,7 +6338,7 @@ const struct SpriteTemplate gMoonrazeMaelstromSuperpowerSpriteTemplate = .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimSuperpowerFireball }; -const struct SpriteTemplate gMoonrazeMaelstromBlackOrbsSpriteTemplate = +const struct SpriteTemplate gMoonrazeMaelstromBlackOrbsSpriteTemplate = { .tileTag = ANIM_TAG_POISON_BUBBLE, .paletteTag = ANIM_TAG_HANDS_AND_FEET, @@ -6348,7 +6348,7 @@ const struct SpriteTemplate gMoonrazeMaelstromBlackOrbsSpriteTemplate = .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimParticleInVortex }; -const struct SpriteTemplate gMoonrazeMaelstromBeamSpriteTemplate = +const struct SpriteTemplate gMoonrazeMaelstromBeamSpriteTemplate = { .tileTag = ANIM_TAG_ORBS, .paletteTag = ANIM_TAG_POISON_BUBBLE, @@ -6358,7 +6358,7 @@ const struct SpriteTemplate gMoonrazeMaelstromBeamSpriteTemplate = .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimHyperBeamOrb }; -const struct SpriteTemplate gMoonrazeMaelstromExplosionSpriteTemplate = +const struct SpriteTemplate gMoonrazeMaelstromExplosionSpriteTemplate = { .tileTag = ANIM_TAG_EXPLOSION_2, .paletteTag = ANIM_TAG_POISON_BUBBLE, @@ -6368,7 +6368,7 @@ const struct SpriteTemplate gMoonrazeMaelstromExplosionSpriteTemplate = .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimSpriteOnMonPos }; -const struct SpriteTemplate gMoonrazeMaelstromShockwaveSpriteTemplate = +const struct SpriteTemplate gMoonrazeMaelstromShockwaveSpriteTemplate = { .tileTag = ANIM_TAG_CIRCLE_OF_LIGHT, .paletteTag = ANIM_TAG_POISON_BUBBLE, @@ -6386,7 +6386,7 @@ static const union AffineAnimCmd sMoonrazeMaelstromWormholeAffineAnims[] = { static const union AffineAnimCmd *const sMoonrazeMaelstromWormholeAffineAnimTable[] = { sMoonrazeMaelstromWormholeAffineAnims }; -const struct SpriteTemplate gMoonrazeMaelstromWormholeSpriteTemplate = +const struct SpriteTemplate gMoonrazeMaelstromWormholeSpriteTemplate = { .tileTag = ANIM_TAG_SHADOW_BALL, .paletteTag = ANIM_TAG_WATER_ORB, @@ -6398,7 +6398,7 @@ const struct SpriteTemplate gMoonrazeMaelstromWormholeSpriteTemplate = }; // light that burns the sky -const struct SpriteTemplate gLightThatBurnsTheSkyGreenSparkSpriteTemplate = +const struct SpriteTemplate gLightThatBurnsTheSkyGreenSparkSpriteTemplate = { .tileTag = ANIM_TAG_SPARK_2, .paletteTag = ANIM_TAG_LEAF, @@ -6408,7 +6408,7 @@ const struct SpriteTemplate gLightThatBurnsTheSkyGreenSparkSpriteTemplate = .affineAnims = gAffineAnims_FlashingSpark, .callback = AnimSparkElectricityFlashing }; -const struct SpriteTemplate gLightThatBurnsTheSkyBlastBurnSpriteTemplate = +const struct SpriteTemplate gLightThatBurnsTheSkyBlastBurnSpriteTemplate = { .tileTag = ANIM_TAG_FIRE_PLUME, .paletteTag = ANIM_TAG_CIRCLE_OF_LIGHT, @@ -6426,7 +6426,7 @@ static const struct OamData sGeyserOam = .size = SPRITE_SIZE(32x32), .priority = 1, //Above sprites }; -const struct SpriteTemplate gLightThatBurnsTheSkyExplosionSpriteTemplate = +const struct SpriteTemplate gLightThatBurnsTheSkyExplosionSpriteTemplate = { .tileTag = ANIM_TAG_EXPLOSION_2, .paletteTag = ANIM_TAG_EXPLOSION_2, @@ -6438,7 +6438,7 @@ const struct SpriteTemplate gLightThatBurnsTheSkyExplosionSpriteTemplate = }; // soul stealing 7star strike -const struct SpriteTemplate gSoulStealBlackFlySpriteTemplate = +const struct SpriteTemplate gSoulStealBlackFlySpriteTemplate = { .tileTag = ANIM_TAG_ROUND_SHADOW, .paletteTag = ANIM_TAG_HANDS_AND_FEET, @@ -6448,7 +6448,7 @@ const struct SpriteTemplate gSoulStealBlackFlySpriteTemplate = .affineAnims = gAffineAnims_FlyBallUp, .callback = AnimFlyBallUp }; -const struct SpriteTemplate gSoulStealIceBuffSpriteTemplate = +const struct SpriteTemplate gSoulStealIceBuffSpriteTemplate = { .tileTag = ANIM_TAG_FOCUS_ENERGY, .paletteTag = ANIM_TAG_ICE_CRYSTALS, @@ -6458,7 +6458,7 @@ const struct SpriteTemplate gSoulStealIceBuffSpriteTemplate = .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimEndureEnergy }; -const struct SpriteTemplate gSoulStealBlueFistSpriteTemplate = +const struct SpriteTemplate gSoulStealBlueFistSpriteTemplate = { .tileTag = ANIM_TAG_HANDS_AND_FEET, .paletteTag = ANIM_TAG_ICE_CRYSTALS, @@ -6468,7 +6468,7 @@ const struct SpriteTemplate gSoulStealBlueFistSpriteTemplate = .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimJumpKick }; -const struct SpriteTemplate gSoulStealBlueStarSpriteTemplate = +const struct SpriteTemplate gSoulStealBlueStarSpriteTemplate = { .tileTag = ANIM_TAG_PAIN_SPLIT, .paletteTag = ANIM_TAG_ICE_CRYSTALS, @@ -6478,7 +6478,7 @@ const struct SpriteTemplate gSoulStealBlueStarSpriteTemplate = .affineAnims = gAffineAnims_Bite, .callback = AnimSoulStealingStar }; -const struct SpriteTemplate gSoulStealBlueParalyzeSpriteTemplate = +const struct SpriteTemplate gSoulStealBlueParalyzeSpriteTemplate = { .tileTag = ANIM_TAG_SPARK_2, .paletteTag = ANIM_TAG_ICE_CRYSTALS, @@ -6488,7 +6488,7 @@ const struct SpriteTemplate gSoulStealBlueParalyzeSpriteTemplate = .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimElectricity }; -const struct SpriteTemplate gSoulStealBlastburnSpriteTemplate = +const struct SpriteTemplate gSoulStealBlastburnSpriteTemplate = { .tileTag = ANIM_TAG_FIRE_PLUME, .paletteTag = ANIM_TAG_WISP_FIRE, @@ -6498,7 +6498,7 @@ const struct SpriteTemplate gSoulStealBlastburnSpriteTemplate = .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimFirePlume }; -const struct SpriteTemplate gSoulStealExplosionSpriteTemplate = +const struct SpriteTemplate gSoulStealExplosionSpriteTemplate = { .tileTag = ANIM_TAG_EXPLOSION, .paletteTag = ANIM_TAG_WISP_FIRE, @@ -6508,7 +6508,7 @@ const struct SpriteTemplate gSoulStealExplosionSpriteTemplate = .affineAnims = gDummySpriteAffineAnimTable, .callback = AnimSpriteOnMonPos }; -const struct SpriteTemplate gSoulStealZStarSpriteTemplate = +const struct SpriteTemplate gSoulStealZStarSpriteTemplate = { .tileTag = ANIM_TAG_SNORE_Z, .paletteTag = ANIM_TAG_SNORE_Z, @@ -6572,7 +6572,7 @@ void AnimTask_AllBanksInvisibleExceptAttackerAndTarget(u8 taskId) static u8 LoadBattleAnimTarget(u8 arg) { u8 battler; - + if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE) { switch (gBattleAnimArgs[arg]) @@ -6598,7 +6598,7 @@ static u8 LoadBattleAnimTarget(u8 arg) else battler = gBattleAnimTarget; } - + return battler; } @@ -7276,7 +7276,7 @@ static void SpriteCB_PyroBallRockBounceStep(struct Sprite *sprite) { s8 initialVerticalVelocity; s8 initialHorizontalVelocity; - + if (sprite->y2 > 0) //Rock returned back down { if (gBattleAnimArgs[2] || sMovingBackHorizontally) //Finished moving from left to right @@ -7357,7 +7357,7 @@ static void SpriteCB_PyroBallLaunch(struct Sprite *sprite) static void SpriteCB_AcidLaunchSingleTarget(struct Sprite *sprite) { s16 l1, l2; - + if (!gBattleAnimArgs[3]) StartSpriteAnim(sprite, 2); @@ -7550,7 +7550,7 @@ static void AnimHappyHourCoinShower(struct Sprite *sprite) { if (gBattleAnimArgs[3] != 0) SetAverageBattlerPositions(gBattleAnimAttacker, 0, &sprite->x, &sprite->y); //coin shower on attacker - + sprite->x += gBattleAnimArgs[0]; sprite->y += 14; StartSpriteAnim(sprite, gBattleAnimArgs[1]); @@ -7707,7 +7707,7 @@ void AnimTask_GetTimeOfDay(u8 taskId) gBattleAnimArgs[0] = 1; else if (gLocalTime.hours >= 17 && gLocalTime.hours < 20) gBattleAnimArgs[0] = 2; - + DestroyAnimVisualTask(taskId); } @@ -7717,7 +7717,7 @@ void AnimTask_GetLycanrocForm(u8 taskId) gBattleAnimArgs[0] = 1; else gBattleAnimArgs[0] = 0; - + gBattleAnimArgs[0] = 0; DestroyAnimVisualTask(taskId); } @@ -7766,7 +7766,7 @@ static void AnimOceanicOperettaSpotlight(struct Sprite *sprite) static void AnimTask_WaitAffineAnim(u8 taskId) { struct Task* task = &gTasks[taskId]; - + if (!RunAffineAnimFromTaskData(task)) DestroyAnimVisualTask(taskId); } @@ -7775,7 +7775,7 @@ void AnimTask_SquishTarget(u8 taskId) { struct Task* task = &gTasks[taskId]; u8 spriteId = GetAnimBattlerSpriteId(ANIM_TARGET); - + PrepareAffineAnimInTaskData(task, spriteId, sSquishTargetAffineAnimCmds); task->func = AnimTask_WaitAffineAnim; } diff --git a/src/battle_debug.c b/src/battle_debug.c index 9911154022..8e869df9cb 100644 --- a/src/battle_debug.c +++ b/src/battle_debug.c @@ -817,7 +817,7 @@ static void SwitchToAiPointsView(u8 taskId) GetStructPtr(taskId)->aiViewState = 0; } -static const u8 *const sAiInfoItemNames[] = +static const u8 *const sAiInfoItemNames[] = { sText_Ability, sText_HeldItem, @@ -829,13 +829,13 @@ static void PutAiInfoText(struct BattleDebugMenu *data) u8 *text = malloc(0x50); FillWindowPixelBuffer(data->aiMovesWindowId, 0x11); - + // item names for (i = 0; i < ARRAY_COUNT(sAiInfoItemNames); i++) { AddTextPrinterParameterized(data->aiMovesWindowId, 1, sAiInfoItemNames[i], 3, i * 15, 0, NULL); } - + // items info for (i = 0; i < gBattlersCount; i++) { @@ -2004,7 +2004,7 @@ static const u8 sText_HoldEffectRoomService[] = _("Room Service"); static const u8 sText_HoldEffectBlunderPolicy[] = _("Blunder Policy"); static const u8 sText_HoldEffectHeavyDutyBoots[] = _("Heavy Duty Boots"); static const u8 sText_HoldEffectThroatSpray[] = _("Throat Spray"); -static const u8 *const sHoldEffectNames[] = +static const u8 *const sHoldEffectNames[] = { [HOLD_EFFECT_NONE] = sText_HoldEffectNone, [HOLD_EFFECT_RESTORE_HP] = sText_HoldEffectRestoreHp, diff --git a/src/battle_interface.c b/src/battle_interface.c index 5be969105f..7eea5f3564 100644 --- a/src/battle_interface.c +++ b/src/battle_interface.c @@ -3123,7 +3123,7 @@ void CreateAbilityPopUp(u8 battlerId, u32 ability, bool32 isDoubleBattle) const s16 (*coords)[2]; u8 spriteId1, spriteId2, battlerPosition, taskId; - + return; if (gBattleScripting.abilityPopupOverwrite != 0) diff --git a/src/battle_message.c b/src/battle_message.c index 8298accf1f..e56269eb5f 100644 --- a/src/battle_message.c +++ b/src/battle_message.c @@ -1383,7 +1383,7 @@ const u8 *const gBattleStringsTable[BATTLESTRINGS_COUNT] = [STRINGID_TARGETTOOHEAVY - BATTLESTRINGS_TABLE_START] = sText_TargetTooHeavy, }; -const u16 gZEffectStringIds[] = +const u16 gZEffectStringIds[] = { [B_MSG_Z_RESET_STATS] = STRINGID_ZMOVERESETSSTATS, [B_MSG_Z_ALL_STATS_UP]= STRINGID_ZMOVEALLSTATSUP, @@ -1394,7 +1394,7 @@ const u16 gZEffectStringIds[] = [B_MSG_Z_HP_TRAP] = STRINGID_ZMOVEHPTRAP, }; -const u16 gMentalHerbCureStringIds[] = +const u16 gMentalHerbCureStringIds[] = { [B_MSG_MENTALHERBCURE_INFATUATION] = STRINGID_ATKGOTOVERINFATUATION, [B_MSG_MENTALHERBCURE_TAUNT] = STRINGID_BUFFERENDS, @@ -1409,7 +1409,7 @@ const u16 gTerrainStringIds[] = STRINGID_TERRAINBECOMESMISTY, STRINGID_TERRAINBECOMESGRASSY, STRINGID_TERRAINBECOMESELECTRIC, STRINGID_TERRAINBECOMESPSYCHIC, STRINGID_TERRAINREMOVED, }; -const u16 gTerrainEndingStringIds[] = +const u16 gTerrainEndingStringIds[] = { STRINGID_MISTYTERRAINENDS, STRINGID_GRASSYTERRAINENDS, STRINGID_ELECTRICTERRAINENDS, STRINGID_PSYCHICTERRAINENDS }; diff --git a/src/battle_z_move.c b/src/battle_z_move.c index d41e28ac23..c257df5990 100644 --- a/src/battle_z_move.c +++ b/src/battle_z_move.c @@ -165,23 +165,23 @@ bool32 IsViableZMove(u8 battlerId, u16 move) u32 item; u16 holdEffect; u16 species; - + if (gBattleStruct->zmove.used[battlerId]) return FALSE; - + species = gBattleMons[battlerId].species; item = gBattleMons[battlerId].item; if (gBattleTypeFlags & (BATTLE_TYPE_SAFARI | BATTLE_TYPE_WALLY_TUTORIAL | BATTLE_TYPE_FRONTIER)) return FALSE; - + #ifdef ITEM_Z_RING if ((GetBattlerPosition(battlerId) == B_POSITION_PLAYER_LEFT || (!(gBattleTypeFlags & BATTLE_TYPE_MULTI) && GetBattlerPosition(battlerId) == B_POSITION_PLAYER_RIGHT)) && !CheckBagHasItem(ITEM_Z_RING, 1)) return FALSE; #endif - + if (mega->alreadyEvolved[battlerPosition]) return FALSE; // Trainer has mega evolved - + if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE) { if (IsPartnerMonFromSameTrainer(battlerId) && (mega->alreadyEvolved[partnerPosition] || (mega->toEvolve & gBitTable[BATTLE_PARTNER(battlerId)]))) @@ -194,10 +194,10 @@ bool32 IsViableZMove(u8 battlerId, u16 move) else #endif if (item == ITEM_ENIGMA_BERRY) - return FALSE; // HoldEffect = gEnigmaBerries[battlerId].holdEffect; + return FALSE; // HoldEffect = gEnigmaBerries[battlerId].holdEffect; else holdEffect = ItemId_GetHoldEffect(item); - + #ifdef ITEM_ULTRANECROZIUM_Z if (holdEffect == HOLD_EFFECT_Z_CRYSTAL || item == ITEM_ULTRANECROZIUM_Z) #else @@ -210,18 +210,18 @@ bool32 IsViableZMove(u8 battlerId, u16 move) gBattleStruct->zmove.chosenZMove = zMove; // Signature z move exists return TRUE; } - + if (move != MOVE_NONE && zMove != MOVE_Z_STATUS && gBattleMoves[move].type == ItemId_GetSecondaryId(item)) { if (IS_MOVE_STATUS(move)) gBattleStruct->zmove.chosenZMove = move; else gBattleStruct->zmove.chosenZMove = GetTypeBasedZMove(move, battlerId); - + return TRUE; } } - + return FALSE; } @@ -248,7 +248,7 @@ bool32 IsZMoveUsable(u8 battlerId, u16 moveIndex) bool32 TryChangeZIndicator(u8 battlerId, u8 moveIndex) { bool32 viableZMove = IsZMoveUsable(battlerId, moveIndex); - + if (gBattleStruct->zmove.viable && !viableZMove) HideZMoveTriggerSprite(); // Was a viable z move, now is not -> slide out else if (!gBattleStruct->zmove.viable && viableZMove) @@ -271,11 +271,11 @@ bool32 TryChangeZIndicator(u8 battlerId, u8 moveIndex) void CreateZMoveTriggerSprite(u8 battlerId, bool8 viable) { s16 x, y; - + LoadSpritePalette(&sSpritePalette_ZMoveTrigger); if (GetSpriteTileStartByTag(TAG_ZMOVE_TRIGGER_TILE) == 0xFFFF) LoadCompressedSpriteSheetUsingHeap(&sSpriteSheet_ZMoveTrigger); - + if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE) { x = gSprites[gHealthboxSpriteIds[battlerId]].x - DOUBLES_Z_TRIGGER_POS_X_SLIDE; @@ -286,10 +286,10 @@ void CreateZMoveTriggerSprite(u8 battlerId, bool8 viable) x = gSprites[gHealthboxSpriteIds[battlerId]].x - SINGLES_Z_TRIGGER_POS_X_SLIDE; y = gSprites[gHealthboxSpriteIds[battlerId]].y - SINGLES_Z_TRIGGER_POS_Y_DIFF, 0; } - + if (gBattleStruct->zmove.triggerSpriteId == 0xFF) gBattleStruct->zmove.triggerSpriteId = CreateSprite(&sSpriteTemplate_ZMoveTrigger, x, y, 0); - + gSprites[gBattleStruct->zmove.triggerSpriteId].tBattler = battlerId; gSprites[gBattleStruct->zmove.triggerSpriteId].tHide = (viable == TRUE) ? FALSE : TRUE; } @@ -375,14 +375,14 @@ void DestroyZMoveTriggerSprite(void) FreeSpriteTilesByTag(TAG_ZMOVE_TRIGGER_TILE); if (gBattleStruct->zmove.triggerSpriteId != 0xFF) DestroySprite(&gSprites[gBattleStruct->zmove.triggerSpriteId]); - + gBattleStruct->zmove.triggerSpriteId = 0xFF; } static u16 GetSignatureZMove(u16 move, u16 species, u16 item) { u32 i; - + // Check signature z move for (i = 0; i < ARRAY_COUNT(sSignatureZMoves); ++i) { @@ -396,7 +396,7 @@ static u16 GetSignatureZMove(u16 move, u16 species, u16 item) static u16 GetTypeBasedZMove(u16 move, u8 battler) { u8 moveType = gBattleMoves[move].type; - + // Get z move from type if (moveType < TYPE_FIRE) return MOVE_BREAKNECK_BLITZ + moveType; @@ -411,7 +411,7 @@ bool32 MoveSelectionDisplayZMove(u16 zmove) u32 i; struct ChooseMoveStruct *moveInfo = (struct ChooseMoveStruct *)(&gBattleResources->bufferA[gActiveBattler][4]); u16 move = moveInfo->moves[gMoveSelectionCursor[gActiveBattler]]; - + PlaySE(SE_SELECT); gBattleStruct->zmove.viewing = TRUE; if (zmove != MOVE_NONE) @@ -421,15 +421,15 @@ bool32 MoveSelectionDisplayZMove(u16 zmove) { MoveSelectionDestroyCursorAt(i); StringCopy(gDisplayedStringBattle, gText_EmptyString2); - BattlePutTextOnWindow(gDisplayedStringBattle, i + 3); + BattlePutTextOnWindow(gDisplayedStringBattle, i + 3); } if (IS_MOVE_STATUS(move)) { u8 zEffect = gBattleMoves[move].zMoveEffect; - + gDisplayedStringBattle[0] = EOS; - + if (zEffect == Z_EFFECT_CURSE) { if (moveInfo->monType1 == TYPE_GHOST || moveInfo->monType2 == TYPE_GHOST || moveInfo->monType3 == TYPE_GHOST) @@ -437,7 +437,7 @@ bool32 MoveSelectionDisplayZMove(u16 zmove) else zEffect = Z_EFFECT_ATK_UP_1; } - + switch (zEffect) { case Z_EFFECT_RESET_STATS: @@ -501,7 +501,7 @@ bool32 MoveSelectionDisplayZMove(u16 zmove) ExpandBattleTextBuffPlaceholders(gBattleTextBuff1, gDisplayedStringBattle + 4); break; } - + BattlePutTextOnWindow(gDisplayedStringBattle, B_WIN_MOVE_NAME_3); gDisplayedStringBattle[0] = CHAR_Z; gDisplayedStringBattle[1] = CHAR_HYPHEN; @@ -584,11 +584,11 @@ void SetZEffect(void) else gBattleStruct->zmove.effect = Z_EFFECT_ATK_UP_1; } - + gBattleScripting.savedStatChanger = gBattleScripting.statChanger; // Save used move's stat changer (e.g. for Z-Growl) gBattleScripting.battler = gBattlerAttacker; - - switch (gBattleStruct->zmove.effect) + + switch (gBattleStruct->zmove.effect) { case Z_EFFECT_RESET_STATS: for (i = 0; i < NUM_BATTLE_STATS - 1; i++) @@ -645,7 +645,7 @@ void SetZEffect(void) gBattlescriptCurrInstr = BattleScript_ZEffectPrintString; break; case Z_EFFECT_ATK_UP_1 ... Z_EFFECT_EVSN_UP_1: - SET_STATCHANGER(gBattleStruct->zmove.effect - Z_EFFECT_ATK_UP_1 + 1, 1, FALSE); + SET_STATCHANGER(gBattleStruct->zmove.effect - Z_EFFECT_ATK_UP_1 + 1, 1, FALSE); BattleScriptPush(gBattlescriptCurrInstr + Z_EFFECT_BS_LENGTH); gBattlescriptCurrInstr = BattleScript_StatUpZMove; break; @@ -663,7 +663,7 @@ void SetZEffect(void) gBattlescriptCurrInstr += 3; break; } - + gBattleStruct->zmove.zStatusActive = FALSE; } diff --git a/src/data/battle_moves.h b/src/data/battle_moves.h index 4b5cde44c0..89e1a042c6 100644 --- a/src/data/battle_moves.h +++ b/src/data/battle_moves.h @@ -11881,7 +11881,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_Z] = .zMovePower = 180, .zMoveEffect = Z_EFFECT_NONE, }, - + [MOVE_ZIPPY_ZAP] = { #if B_UPDATED_MOVE_DATA >= GEN_8 @@ -12193,7 +12193,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_Z] = .zMovePower = 120, .zMoveEffect = Z_EFFECT_NONE, }, - + [MOVE_DYNAMAX_CANNON] = { .effect = EFFECT_DYNAMAX_DOUBLE_DMG, @@ -13105,7 +13105,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_Z] = .zMovePower = 100, .zMoveEffect = Z_EFFECT_NONE, }, - + [MOVE_THUNDER_CAGE] = { .effect = EFFECT_TRAP, diff --git a/src/data/pokemon/base_stats.h b/src/data/pokemon/base_stats.h index 41b5143cf1..6b866e92ef 100644 --- a/src/data/pokemon/base_stats.h +++ b/src/data/pokemon/base_stats.h @@ -859,7 +859,7 @@ .bodyColor = color, \ .noFlip = FALSE, \ } - + #define MORPEKO_BASE_STATS \ { \ .baseHP = 58, \ @@ -883,7 +883,7 @@ .bodyColor = BODY_COLOR_YELLOW, \ .noFlip = FALSE, \ } - + #define ZARUDE_BASE_STATS \ { \ .baseHP = 105, \ @@ -22755,7 +22755,7 @@ const struct BaseStats gBaseStats[] = .bodyColor = BODY_COLOR_BROWN, .noFlip = FALSE, }, - + [SPECIES_BASCULEGION] = { .baseHP = 120, @@ -26464,7 +26464,7 @@ const struct BaseStats gBaseStats[] = [SPECIES_MINIOR_CORE_BLUE] = MINIOR_CORE_BASE_STATS(BODY_COLOR_BLUE), [SPECIES_MINIOR_CORE_INDIGO] = MINIOR_CORE_BASE_STATS(BODY_COLOR_BLUE), [SPECIES_MINIOR_CORE_VIOLET] = MINIOR_CORE_BASE_STATS(BODY_COLOR_PURPLE), - + [SPECIES_MIMIKYU_BUSTED] = MIMIKYU_BASE_STATS, [SPECIES_NECROZMA_DUSK_MANE] = @@ -26563,7 +26563,7 @@ const struct BaseStats gBaseStats[] = [SPECIES_ALCREMIE_RUBY_SWIRL] = ALCREMIE_BASE_STATS(BODY_COLOR_YELLOW), [SPECIES_ALCREMIE_CARAMEL_SWIRL] = ALCREMIE_BASE_STATS(BODY_COLOR_BROWN), [SPECIES_ALCREMIE_RAINBOW_SWIRL] = ALCREMIE_BASE_STATS(BODY_COLOR_YELLOW), - + [SPECIES_EISCUE_NOICE_FACE] = { .baseHP = 75, diff --git a/src/data/pokemon/form_change_table_pointers.h b/src/data/pokemon/form_change_table_pointers.h index 85685e50ef..0668855cc4 100644 --- a/src/data/pokemon/form_change_table_pointers.h +++ b/src/data/pokemon/form_change_table_pointers.h @@ -1,4 +1,4 @@ -const struct FormChange *const gFormChangeTablePointers[NUM_SPECIES] = +const struct FormChange *const gFormChangeTablePointers[NUM_SPECIES] = { #if P_NEW_POKEMON == TRUE [SPECIES_GIRATINA] = sGiratinaFormChangeTable, diff --git a/src/data/pokemon/form_species_table_pointers.h b/src/data/pokemon/form_species_table_pointers.h index 71a210e402..dee4e5813f 100644 --- a/src/data/pokemon/form_species_table_pointers.h +++ b/src/data/pokemon/form_species_table_pointers.h @@ -19,8 +19,8 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] = [SPECIES_MEOWTH] = sMeowthFormSpeciesIdTable, [SPECIES_PERSIAN] = sPersianFormSpeciesIdTable, [SPECIES_ALAKAZAM] = sAlakazamFormSpeciesIdTable, - [SPECIES_GROWLITHE] = sGrowlitheFormSpeciesIdTable, - [SPECIES_ARCANINE] = sArcanineFormSpeciesIdTable, + [SPECIES_GROWLITHE] = sGrowlitheFormSpeciesIdTable, + [SPECIES_ARCANINE] = sArcanineFormSpeciesIdTable, [SPECIES_GEODUDE] = sGeodudeFormSpeciesIdTable, [SPECIES_GRAVELER] = sGravelerFormSpeciesIdTable, [SPECIES_GOLEM] = sGolemFormSpeciesIdTable, @@ -113,7 +113,7 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] = [SPECIES_LILLIGANT] = sLilligantFormSpeciesIdTable, [SPECIES_DARUMAKA] = sDarumakaFormSpeciesIdTable, [SPECIES_DARMANITAN] = sDarmanitanFormSpeciesIdTable, - [SPECIES_YAMASK] = sYamaskFormSpeciesIdTable, + [SPECIES_YAMASK] = sYamaskFormSpeciesIdTable, [SPECIES_ZORUA] = sZoruaFormSpeciesIdTable, [SPECIES_ZOROARK] = sZoroarkFormSpeciesIdTable, [SPECIES_DEERLING] = sDeerlingFormSpeciesIdTable, @@ -139,7 +139,7 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] = [SPECIES_GOODRA] = sGoodraFormSpeciesIdTable, [SPECIES_PUMPKABOO] = sPumpkabooFormSpeciesIdTable, [SPECIES_GOURGEIST] = sGourgeistFormSpeciesIdTable, - [SPECIES_AVALUGG] = sAvaluggFormSpeciesIdTable, + [SPECIES_AVALUGG] = sAvaluggFormSpeciesIdTable, [SPECIES_XERNEAS] = sXerneasFormSpeciesIdTable, [SPECIES_ZYGARDE] = sZygardeFormSpeciesIdTable, [SPECIES_DIANCIE] = sDiancieFormSpeciesIdTable, @@ -394,7 +394,7 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] = [SPECIES_TORNADUS_THERIAN] = sTornadusFormSpeciesIdTable, [SPECIES_THUNDURUS_THERIAN] = sThundurusFormSpeciesIdTable, [SPECIES_LANDORUS_THERIAN] = sLandorusFormSpeciesIdTable, - [SPECIES_ENAMORUS_THERIAN] = sEnamorusFormSpeciesIdTable, + [SPECIES_ENAMORUS_THERIAN] = sEnamorusFormSpeciesIdTable, // Kyurem [SPECIES_KYUREM_WHITE] = sKyuremFormSpeciesIdTable, [SPECIES_KYUREM_BLACK] = sKyuremFormSpeciesIdTable, diff --git a/src/data/pokemon/level_up_learnsets.h b/src/data/pokemon/level_up_learnsets.h index a8c696f1f4..d06e4d00be 100644 --- a/src/data/pokemon/level_up_learnsets.h +++ b/src/data/pokemon/level_up_learnsets.h @@ -18095,8 +18095,8 @@ static const struct LevelUpMove sWyrdeerLevelUpLearnset[] = { LEVEL_UP_MOVE(15, MOVE_CALM_MIND), //LEVEL_UP_MOVE(21, MOVE_PSYSHIELD_BASH), LEVEL_UP_MOVE(29, MOVE_EXTRASENSORY), - //LEVEL_UP_MOVE(37, MOVE_ZEN_HEADBUTT), - LEVEL_UP_MOVE(47, MOVE_DOUBLE_EDGE), + //LEVEL_UP_MOVE(37, MOVE_ZEN_HEADBUTT), + LEVEL_UP_MOVE(47, MOVE_DOUBLE_EDGE), LEVEL_UP_END }; @@ -18105,7 +18105,7 @@ static const struct LevelUpMove sKleavorLevelUpLearnset[] = { LEVEL_UP_MOVE( 6, MOVE_SILVER_WIND), LEVEL_UP_MOVE(11, MOVE_AERIAL_ACE), LEVEL_UP_MOVE(14, MOVE_DOUBLE_HIT), - //LEVEL_UP_MOVE(14, MOVE_STEALTH_ROCK), + //LEVEL_UP_MOVE(14, MOVE_STEALTH_ROCK), //LEVEL_UP_MOVE(18, MOVE_AIR_SLASH), LEVEL_UP_MOVE(25, MOVE_SWORDS_DANCE), //LEVEL_UP_MOVE(29, MOVE_STONE_AXE), @@ -18121,8 +18121,8 @@ static const struct LevelUpMove sUrsalunaLevelUpLearnset[] = { LEVEL_UP_MOVE(18, MOVE_SLASH), //LEVEL_UP_MOVE(25, MOVE_PLAY_ROUGH), //LEVEL_UP_MOVE(34, MOVE_HIGH_HORSEPOWER), - LEVEL_UP_MOVE(43, MOVE_DOUBLE_EDGE), - //LEVEL_UP_MOVE(47, MOVE_HEADLONG_RUSH), + LEVEL_UP_MOVE(43, MOVE_DOUBLE_EDGE), + //LEVEL_UP_MOVE(47, MOVE_HEADLONG_RUSH), LEVEL_UP_END }; @@ -18135,7 +18135,7 @@ static const struct LevelUpMove sBasculegionLevelUpLearnset[] = { LEVEL_UP_MOVE(25, MOVE_CRUNCH), LEVEL_UP_MOVE(25, MOVE_SHADOW_BALL), //LEVEL_UP_MOVE(34, MOVE_WAVE_CRASH), - LEVEL_UP_MOVE(43, MOVE_DOUBLE_EDGE), + LEVEL_UP_MOVE(43, MOVE_DOUBLE_EDGE), LEVEL_UP_END }; @@ -18145,9 +18145,9 @@ static const struct LevelUpMove sSneaslerLevelUpLearnset[] = { //LEVEL_UP_MOVE(11, MOVE_DIRE_CLAW), LEVEL_UP_MOVE(11, MOVE_SWIFT), LEVEL_UP_MOVE(18, MOVE_SLASH), - //LEVEL_UP_MOVE(25, MOVE_POISON_JAB), - LEVEL_UP_MOVE(34, MOVE_SWORDS_DANCE), - //LEVEL_UP_MOVE(43, MOVE_CLOSE_COMBAT), + //LEVEL_UP_MOVE(25, MOVE_POISON_JAB), + LEVEL_UP_MOVE(34, MOVE_SWORDS_DANCE), + //LEVEL_UP_MOVE(43, MOVE_CLOSE_COMBAT), LEVEL_UP_END }; @@ -18938,7 +18938,7 @@ static const struct LevelUpMove sGrowlitheHisuianLevelUpLearnset[] = { LEVEL_UP_MOVE( 9, MOVE_BITE), //LEVEL_UP_MOVE(15, MOVE_FIRE_FANG), LEVEL_UP_MOVE(21, MOVE_ROCK_SLIDE), - LEVEL_UP_MOVE(29, MOVE_CRUNCH), + LEVEL_UP_MOVE(29, MOVE_CRUNCH), LEVEL_UP_MOVE(37, MOVE_DOUBLE_EDGE), //LEVEL_UP_MOVE(47, MOVE_FLARE_BLITZ), LEVEL_UP_END @@ -18951,7 +18951,7 @@ static const struct LevelUpMove sArcanineHisuianLevelUpLearnset[] = { //LEVEL_UP_MOVE(15, MOVE_FIRE_FANG), LEVEL_UP_MOVE(21, MOVE_ROCK_SLIDE), LEVEL_UP_MOVE(29, MOVE_CRUNCH), - //LEVEL_UP_MOVE(29, MOVE_RAGING_FURY), + //LEVEL_UP_MOVE(29, MOVE_RAGING_FURY), LEVEL_UP_MOVE(37, MOVE_DOUBLE_EDGE), //LEVEL_UP_MOVE(47, MOVE_FLARE_BLITZ), LEVEL_UP_END @@ -19015,9 +19015,9 @@ static const struct LevelUpMove sSneaselHisuianLevelUpLearnset[] = { LEVEL_UP_MOVE( 6, MOVE_ROCK_SMASH), LEVEL_UP_MOVE(11, MOVE_SWIFT), LEVEL_UP_MOVE(18, MOVE_SLASH), - //LEVEL_UP_MOVE(25, MOVE_POISON_JAB), - LEVEL_UP_MOVE(34, MOVE_SWORDS_DANCE), - //LEVEL_UP_MOVE(43, MOVE_CLOSE_COMBAT), + //LEVEL_UP_MOVE(25, MOVE_POISON_JAB), + LEVEL_UP_MOVE(34, MOVE_SWORDS_DANCE), + //LEVEL_UP_MOVE(43, MOVE_CLOSE_COMBAT), LEVEL_UP_END }; @@ -19116,7 +19116,7 @@ static const struct LevelUpMove sGoodraHisuianLevelUpLearnset[] = { }; static const struct LevelUpMove sAvaluggHisuianLevelUpLearnset[] = { - //LEVEL_UP_MOVE( 0, MOVE_ROCK_SLIDE), + //LEVEL_UP_MOVE( 0, MOVE_ROCK_SLIDE), LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 5, MOVE_POWDER_SNOW), //LEVEL_UP_MOVE( 9, MOVE_ICE_SHARD), diff --git a/src/data/pokemon/pokedex_orders.h b/src/data/pokemon/pokedex_orders.h index 0ca5ccb417..e1d8cc4792 100644 --- a/src/data/pokemon/pokedex_orders.h +++ b/src/data/pokemon/pokedex_orders.h @@ -1423,7 +1423,7 @@ const u16 gPokedexOrder_Weight[] = NATIONAL_DEX_ESPEON, NATIONAL_DEX_FROSLASS, NATIONAL_DEX_UMBREON, - //NATIONAL_DEX_SNEASEL, //Hisuian Form + //NATIONAL_DEX_SNEASEL, //Hisuian Form NATIONAL_DEX_HUNTAIL, NATIONAL_DEX_CARNIVINE, NATIONAL_DEX_WATCHOG, @@ -1577,7 +1577,7 @@ const u16 gPokedexOrder_Weight[] = NATIONAL_DEX_GLISCOR, NATIONAL_DEX_DUBWOOL, NATIONAL_DEX_SNEASLER, - //NATIONAL_DEX_BRAVIARY, //Hisuian Form + //NATIONAL_DEX_BRAVIARY, //Hisuian Form NATIONAL_DEX_PURUGLY, //NATIONAL_DEX_MANECTRIC, // Mega NATIONAL_DEX_GOTHITELLE, @@ -1600,7 +1600,7 @@ const u16 gPokedexOrder_Weight[] = NATIONAL_DEX_HAKAMO_O, NATIONAL_DEX_ALAKAZAM, NATIONAL_DEX_HITMONTOP, - NATIONAL_DEX_ENAMORUS, + NATIONAL_DEX_ENAMORUS, NATIONAL_DEX_GARDEVOIR, NATIONAL_DEX_KELDEO, NATIONAL_DEX_GRANBULL, @@ -1660,7 +1660,7 @@ const u16 gPokedexOrder_Weight[] = NATIONAL_DEX_HEATMOR, //NATIONAL_DEX_LURANTIS, // Totem-sized //NATIONAL_DEX_ZAPDOS, // Galarian Form - //NATIONAL_DEX_SAMUROTT, // Hisuian Form + //NATIONAL_DEX_SAMUROTT, // Hisuian Form NATIONAL_DEX_MR_RIME, NATIONAL_DEX_WHIRLIPEDE, //NATIONAL_DEX_PINSIR, // Mega @@ -1823,7 +1823,7 @@ const u16 gPokedexOrder_Weight[] = NATIONAL_DEX_FERROTHORN, NATIONAL_DEX_MUDBRAY, NATIONAL_DEX_ZACIAN, // Hero of Many Battles - NATIONAL_DEX_BASCULEGION, + NATIONAL_DEX_BASCULEGION, //NATIONAL_DEX_CHARIZARD, // Mega X NATIONAL_DEX_SHELGON, //NATIONAL_DEX_SALAMENCE, // Mega @@ -1933,7 +1933,7 @@ const u16 gPokedexOrder_Weight[] = //NATIONAL_DEX_AVALUGG, //Hisuian Form NATIONAL_DEX_TYRANTRUM, NATIONAL_DEX_RHYPERIOR, - NATIONAL_DEX_URSALUNA, + NATIONAL_DEX_URSALUNA, NATIONAL_DEX_MAMOSWINE, // 661.4 - 667.0 lbs / 300.0 - 307.1 kg NATIONAL_DEX_GOLEM, @@ -2642,7 +2642,7 @@ const u16 gPokedexOrder_Height[] = NATIONAL_DEX_GURDURR, NATIONAL_DEX_LEAVANNY, NATIONAL_DEX_WHIRLIPEDE, - //NATIONAL_DEX_LILLIGANT, //Hisuian Form + //NATIONAL_DEX_LILLIGANT, //Hisuian Form NATIONAL_DEX_CARRACOSTA, NATIONAL_DEX_FRILLISH, NATIONAL_DEX_ALOMOMOLA, @@ -2697,7 +2697,7 @@ const u16 gPokedexOrder_Height[] = NATIONAL_DEX_DUBWOOL, NATIONAL_DEX_BARRASKEWDA, NATIONAL_DEX_FROSMOTH, - NATIONAL_DEX_SNEASLER, + NATIONAL_DEX_SNEASLER, // 4'07" / 1.4m //NATIONAL_DEX_BEEDRILL, // Mega //NATIONAL_DEX_RATICATE, // Alolan Form, Totem-sized @@ -2734,7 +2734,7 @@ const u16 gPokedexOrder_Height[] = NATIONAL_DEX_ZWEILOUS, //NATIONAL_DEX_TORNADUS, // Therian Forme NATIONAL_DEX_KELDEO, - //NATIONAL_DEX_AVALUGG, // Hisuian Form + //NATIONAL_DEX_AVALUGG, // Hisuian Form //NATIONAL_DEX_GUMSHOOS, // Totem-sized NATIONAL_DEX_CINDERACE, NATIONAL_DEX_EISCUE, @@ -2805,7 +2805,7 @@ const u16 gPokedexOrder_Height[] = NATIONAL_DEX_HYPNO, NATIONAL_DEX_ZAPDOS, //NATIONAL_DEX_ZAPDOS, // Galarian Form - //NATIONAL_DEX_TYPHLOSION, // Hisuian Form + //NATIONAL_DEX_TYPHLOSION, // Hisuian Form NATIONAL_DEX_NOCTOWL, NATIONAL_DEX_GARDEVOIR, //NATIONAL_DEX_GARDEVOIR, // Mega @@ -2818,15 +2818,15 @@ const u16 gPokedexOrder_Height[] = NATIONAL_DEX_EMBOAR, NATIONAL_DEX_ZEBSTRIKA, NATIONAL_DEX_ZOROARK, - //NATIONAL_DEX_ZOROARK, // Hisuian Form + //NATIONAL_DEX_ZOROARK, // Hisuian Form NATIONAL_DEX_DRUDDIGON, NATIONAL_DEX_BISHARP, NATIONAL_DEX_BOUFFALANT, - //NATIONAL_DEX_BRAVIARY, // Hisuian Form + //NATIONAL_DEX_BRAVIARY, // Hisuian Form NATIONAL_DEX_VOLCARONA, NATIONAL_DEX_CHESNAUGHT, NATIONAL_DEX_DECIDUEYE, - //NATIONAL_DEX_DECIDUEYE, // Hisuian Form + //NATIONAL_DEX_DECIDUEYE, // Hisuian Form NATIONAL_DEX_KOMMO_O, NATIONAL_DEX_TOXTRICITY, NATIONAL_DEX_GRAPPLOCT, @@ -3010,7 +3010,7 @@ const u16 gPokedexOrder_Height[] = NATIONAL_DEX_MUDSDALE, NATIONAL_DEX_MELMETAL, NATIONAL_DEX_STONJOURNER, - NATIONAL_DEX_OVERQWIL, + NATIONAL_DEX_OVERQWIL, // 8'06" / 2.6m NATIONAL_DEX_BEARTIC, //NATIONAL_DEX_VIKAVOLT, // Totem-sized diff --git a/src/data/text/move_descriptions.h b/src/data/text/move_descriptions.h index ac7c910d7e..a4a1941adc 100644 --- a/src/data/text/move_descriptions.h +++ b/src/data/text/move_descriptions.h @@ -2691,144 +2691,144 @@ static const u8 sVeeveeVolleyDescription[] = _( static const u8 sDoubleIronBashDescription[] = _( "The user spins and hits with\n" "its arms. May cause flinch."); - + // GEN 8 static const u8 sDynamaxCannonDescription[] = _( "Fires a strong beam. Deals\n" "2x damage to Dynamaxed foes."); - + static const u8 sSnipeShotDescription[] = _( "The user ignores effects\n" "that draw in moves."); - + static const u8 sJawLockDescription[] = _( "Prevents the user and\n" "the target from escaping."); - + static const u8 sStuffCheeksDescription[] = _( "Consumes the user's Berry,\n" "then sharply raises Def."); - + static const u8 sNoRetreatDescription[] = _( "Raises all of the user's\n" "stats but prevents escape."); - + static const u8 sTarShotDescription[] = _( "Lowers the foe's Speed and\n" "makes it weak to Fire."); - + static const u8 sMagicPowderDescription[] = _( "Magic powder changes the\n" "target into a Psychic-type."); - + static const u8 sDragonDartsDescription[] = _( "The user attacks twice. Two\n" "targets are hit once each."); - + static const u8 sTeatimeDescription[] = _( "All Pokémon have teatime\n" "and eat their Berries."); - + static const u8 sOctolockDescription[] = _( "Traps the foe to lower Def\n" "and Sp. Def fall each turn."); - + static const u8 sBoltBeakDescription[] = _( "Double power if the user\n" "moves before the target."); - + static const u8 sFishiousRendDescription[] = _( "Double power if the user\n" "moves before the target."); - + static const u8 sCourtChangeDescription[] = _( "The user swaps effects on\n" "either side of the field."); - + static const u8 sClangorousSoulDescription[] = _( "The user uses some of its\n" "HP to raise all its stats."); - + static const u8 sBodyPressDescription[] = _( "Does more damage the\n" "higher the user's Def."); - + static const u8 sDecorateDescription[] = _( "The user sharply raises\n" "the target's Atk and Sp.Atk"); - + static const u8 sDrumBeatingDescription[] = _( "Plays a drum to attack.\n" "The foe's Speed is lowered."); - + static const u8 sSnapTrapDescription[] = _( "Snares the target in a snap\n" "trap for four to five turns."); - + static const u8 sPyroBallDescription[] = _( "Launches a fiery ball at the\n" "target. It may cause a burn."); - + static const u8 sBehemothBladeDescription[] = _( "Strikes as a sword. Deals 2x\n" "damage to Dynamaxed foes."); - + static const u8 sBehemothBashDescription[] = _( "Attacks as a shield. Deals 2x\n" "damage to Dynamaxed foes."); - + static const u8 sAuraWheelDescription[] = _( "Raises Speed to attack. The\n" "Type is based on its form."); - + static const u8 sBreakingSwipeDescription[] = _( "Swings its tail to attack.\n" "Lowers the Atk of those hit."); - + static const u8 sBranchPokeDescription[] = _( "The user pokes the target\n" "with a pointed branch."); - + static const u8 sOverdriveDescription[] = _( "The user twangs its guitar,\n" "causing strong vibrations."); - + static const u8 sAppleAcidDescription[] = _( "Attacks with tart apple acid\n" "to lower the foe's Sp. Def."); - + static const u8 sGravAppleDescription[] = _( "Drops an apple from above.\n" "Lowers the foe's Defense."); - + static const u8 sSpiritBreakDescription[] = _( "Attacks with spirit-breaking\n" "force. Lowers Sp. Atk."); - + static const u8 sStrangeSteamDescription[] = _( "Emits a strange steam to\n" "potentially confuse the foe."); - + static const u8 sLifeDewDescription[] = _( "Scatters water to restore\n" "the HP of itself and allies."); - + static const u8 sObstructDescription[] = _( "Protects itself, harshly\n" "lowering Def on contact."); - + static const u8 sFalseSurrenderDescription[] = _( "Bows to stab the foe\n" "with hair. It never misses."); - + static const u8 sMeteorAssaultDescription[] = _( "Attacks with a thick leek.\n" "The user must then rest."); - + static const u8 sEternabeamDescription[] = _( "Eternatus' strongest move.\n" "The user rests next turn."); - + static const u8 sSteelBeamDescription[] = _( "Fires a beam of steel from\n" "its body. It hurts the user."); diff --git a/src/data/text/move_names.h b/src/data/text/move_names.h index ffa00e3f63..5f0a741cb4 100644 --- a/src/data/text/move_names.h +++ b/src/data/text/move_names.h @@ -1604,7 +1604,7 @@ static const u8 sText_Menacing_Moonraze_Maelstrom[] = _("Menacing Moonraze Maels static const u8 sText_Light_That_Burns_The_Sky[] = _("Light That Burns The Sky"); static const u8 sText_Soul_Stealing_7_Star_Strike[] = _("Soul Stealing 7 Star Strike"); -const u8 *const gZMoveNames[] = +const u8 *const gZMoveNames[] = { [MOVE_BREAKNECK_BLITZ - FIRST_Z_MOVE] = sText_Breakneck_Blitz, [MOVE_ALL_OUT_PUMMELING - FIRST_Z_MOVE] = sText_All_Out_Pummeling, diff --git a/src/daycare.c b/src/daycare.c index 6108c6daa8..18bc45eb01 100644 --- a/src/daycare.c +++ b/src/daycare.c @@ -261,7 +261,7 @@ static u16 TakeSelectedPokemonFromDaycare(struct DaycareMon *daycareMon) CalculateMonStats(&pokemon); species = newSpecies; } - + if (GetMonData(&pokemon, MON_DATA_LEVEL) != MAX_LEVEL) { experience = GetMonData(&pokemon, MON_DATA_EXP) + daycareMon->steps; @@ -1359,7 +1359,7 @@ static u8 ModifyBreedingScoreForOvalCharm(u8 score) return 88; } } - + return score; } diff --git a/src/debug.c b/src/debug.c index 4cc1ac6168..950c82c8d7 100644 --- a/src/debug.c +++ b/src/debug.c @@ -1493,7 +1493,7 @@ static void DebugAction_Flags_CatchingOnOff(u8 taskId) FlagToggle(B_FLAG_NO_CATCHING); #endif } - + // ******************************* // Actions Variables static void DebugAction_Vars_Vars(u8 taskId) @@ -2589,7 +2589,7 @@ static void DebugAction_Give_Pokemon_ComplexCreateMon(u8 taskId) //https://githu } //Pokedex entry - nationalDexNum = SpeciesToNationalPokedexNum(species); + nationalDexNum = SpeciesToNationalPokedexNum(species); switch(sentToPc) { case MON_GIVEN_TO_PARTY: diff --git a/src/evolution_scene.c b/src/evolution_scene.c index 91a3122226..39cf8e4c23 100644 --- a/src/evolution_scene.c +++ b/src/evolution_scene.c @@ -565,7 +565,7 @@ static void CreateShedinja(u16 preEvoSpecies, struct Pokemon *mon) SetMonData(&gPlayerParty[gPlayerPartyCount], MON_DATA_HELD_ITEM, &data); SetMonData(&gPlayerParty[gPlayerPartyCount], MON_DATA_MARKINGS, &data); SetMonData(&gPlayerParty[gPlayerPartyCount], MON_DATA_ENCRYPT_SEPARATOR, &data); - + #if P_SHEDINJA_BALL >= GEN_4 SetMonData(&gPlayerParty[gPlayerPartyCount], MON_DATA_POKEBALL, &ball); RemoveBagItem(ball, 1); diff --git a/src/item_use.c b/src/item_use.c index 44da679857..913c0700fa 100644 --- a/src/item_use.c +++ b/src/item_use.c @@ -1188,7 +1188,7 @@ void ItemUseInBattle_EnigmaBerry(u8 taskId) } } -void ItemUseOutOfBattle_FormChange(u8 taskId) +void ItemUseOutOfBattle_FormChange(u8 taskId) { gItemUseCB = ItemUseCB_FormChange; gTasks[taskId].data[0] = FALSE; diff --git a/src/pokemon.c b/src/pokemon.c index f36f8acf25..c04d9236bf 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -3307,7 +3307,7 @@ void CreateBoxMon(struct BoxPokemon *boxMon, u16 species, u8 level, u8 fixedIV, | (gSaveBlock2Ptr->playerTrainerId[1] << 8) | (gSaveBlock2Ptr->playerTrainerId[2] << 16) | (gSaveBlock2Ptr->playerTrainerId[3] << 24); - + if (CheckBagHasItem(ITEM_SHINY_CHARM, 1)) { u32 shinyValue; @@ -3415,7 +3415,7 @@ void CreateBoxMon(struct BoxPokemon *boxMon, u16 species, u8 level, u8 fixedIV, } } #endif - + } if (gBaseStats[species].abilities[1]) @@ -5292,7 +5292,7 @@ u16 GetAbilityBySpecies(u16 species, u8 abilityNum) gLastUsedAbility = gBaseStats[species].abilities[abilityNum]; else gLastUsedAbility = ABILITY_NONE; - + if (abilityNum >= NUM_NORMAL_ABILITY_SLOTS) // if abilityNum is empty hidden ability, look for other hidden abilities { for (i = NUM_NORMAL_ABILITY_SLOTS; i < NUM_ABILITY_SLOTS && gLastUsedAbility == ABILITY_NONE; i++) @@ -5300,12 +5300,12 @@ u16 GetAbilityBySpecies(u16 species, u8 abilityNum) gLastUsedAbility = gBaseStats[species].abilities[i]; } } - + for (i = 0; i < NUM_ABILITY_SLOTS && gLastUsedAbility == ABILITY_NONE; i++) // look for any non-empty ability { gLastUsedAbility = gBaseStats[species].abilities[i]; } - + return gLastUsedAbility; } @@ -6346,7 +6346,7 @@ u16 GetEvolutionTargetSpecies(struct Pokemon *mon, u8 mode, u16 evolutionItem, s { partnerSpecies = GetMonData(tradePartner, MON_DATA_SPECIES, 0); partnerHeldItem = GetMonData(tradePartner, MON_DATA_HELD_ITEM, 0); - + if (partnerHeldItem == ITEM_ENIGMA_BERRY) partnerHoldEffect = gSaveBlock1Ptr->enigmaBerry.holdEffect; else @@ -7717,7 +7717,7 @@ void SetWildMonHeldItem(void) { if (GetMonData(&gEnemyParty[i], MON_DATA_HELD_ITEM, NULL) != ITEM_NONE) continue; // prevent ovewriting previously set item - + rnd = Random() % 100; species = GetMonData(&gEnemyParty[i], MON_DATA_SPECIES, 0); if (gMapHeader.mapLayoutId == LAYOUT_ALTERING_CAVE) diff --git a/src/pokemon_debug.c b/src/pokemon_debug.c index 8775889fdf..4168b75242 100644 --- a/src/pokemon_debug.c +++ b/src/pokemon_debug.c @@ -337,7 +337,7 @@ const u8 gFrontAnimNames[][34] = [ANIM_SHAKE_GLOW_WHITE_SLOW] = _("SHAKE GLOW WHITE SLOW"), [ANIM_SHAKE_GLOW_PURPLE_SLOW] = _("SHAKE GLOW PURPLE SLOW"), }; -const u8 gBattleBackgroundNames[][30] = +const u8 gBattleBackgroundNames[][30] = { [MAP_BATTLE_SCENE_NORMAL] = _("NORMAL "), [MAP_BATTLE_SCENE_GYM] = _("GYM "), @@ -354,7 +354,7 @@ const u8 gBattleBackgroundNames[][30] = [MAP_BATTLE_SCENE_KYOGRE] = _("KYOGRE "), [MAP_BATTLE_SCENE_RAYQUAZA] = _("RAYQUAZA "), }; -const u8 gBattleBackgroundTerrainNames[][26] = +const u8 gBattleBackgroundTerrainNames[][26] = { [BATTLE_TERRAIN_GRASS] = _("NORMAL - GRASS "), [BATTLE_TERRAIN_LONG_GRASS] = _("NORMAL - LONG GRASS "), @@ -403,13 +403,13 @@ static void PrintInstructionsOnWindow(struct PokemonDebugMenu *data) u8 textInstructionsSubmenuOneGender[] = _("{START_BUTTON} Shiny {SELECT_BUTTON} Gender\n{B_BUTTON} Back {A_BUTTON} Submenu 2$"); u8 textInstructionsSubmenuTwo[] = _("{START_BUTTON} Shiny\n{B_BUTTON} Back$"); u8 textInstructionsSubmenuTwoGender[] = _("{START_BUTTON} Shiny {SELECT_BUTTON} Gender\n{B_BUTTON} Back$"); - + u8 textBottom[] = _("BACK:\nFRONT:\nBG:$"); u8 textBottomForms[] = _("BACK:\nFRONT:\nBG:\nFORMS:$"); u8 textBottomSubmenuTwo[] = _("B coords:\nF coords:\nF elev:"); u16 species = data->modifyArrows.currValue; - + u8 textL[] = _("{L_BUTTON}"); u8 textR[] = _("{R_BUTTON}"); @@ -481,7 +481,7 @@ static void PrintDigitChars(struct PokemonDebugMenu *data) for (i = 0; i < data->modifyArrows.maxDigits; i++) text[i] = data->modifyArrows.charDigits[i]; - + text[i++] = CHAR_SPACE; text[i++] = CHAR_HYPHEN; @@ -490,7 +490,7 @@ static void PrintDigitChars(struct PokemonDebugMenu *data) if (data->isFemale) text[i++] = CHAR_FEMALE; else - text[i++] = CHAR_MALE; + text[i++] = CHAR_MALE; text[i++] = CHAR_HYPHEN; } @@ -641,7 +641,7 @@ static bool32 TryMoveDigit(struct PokemonDebugModifyArrows *modArrows, bool32 mo if (charDigits[modArrows->currentDigit] == CHAR_0) { charDigits[modArrows->currentDigit] = CHAR_9; - + for (i = modArrows->currentDigit - 1; i >= 0; i--) { if (charDigits[i] == CHAR_0) @@ -796,7 +796,7 @@ static u8 GetBattlerSpriteFinal_YCustom(u16 species, s8 offset_picCoords, s8 off //FrontPicCoords offset = gMonFrontPicCoords[species].y_offset + offset_picCoords; - + //Elevation offset -= GetElevationValue(species) + offset_elevation; @@ -805,7 +805,7 @@ static u8 GetBattlerSpriteFinal_YCustom(u16 species, s8 offset_picCoords, s8 off if (y > DISPLAY_HEIGHT - MON_PIC_HEIGHT + 8) y = DISPLAY_HEIGHT - MON_PIC_HEIGHT + 8; - + return y; } @@ -839,7 +839,7 @@ static void LoadAndCreateEnemyShadowSpriteCustom(struct PokemonDebugMenu *data, data->frontShadowSpriteId = CreateSprite(&gSpriteTemplate_EnemyShadow, x, y + 29, 0xC8); gSprites[data->frontShadowSpriteId].data[0] = data->frontspriteId; - + gSprites[data->frontShadowSpriteId].callback = SpriteCB_EnemyShadowCustom; gSprites[data->frontShadowSpriteId].oam.priority = 0; gSprites[data->frontShadowSpriteId].invisible = invisible; @@ -945,7 +945,7 @@ static void LoadBattleBg(u8 battleBgType, u8 battleTerrain) LZDecompressVram(gBattleTerrainTiles_Rayquaza, (void*)(BG_CHAR_ADDR(2))); LZDecompressVram(gBattleTerrainTilemap_Rayquaza, (void*)(BG_SCREEN_ADDR(26))); LoadCompressedPalette(gBattleTerrainPalette_Rayquaza, 0x20, 0x60); - break; + break; } } static void PrintBattleBgName(u8 taskId) @@ -1005,7 +1005,7 @@ static void UpdateBattleBg(u8 taskId, bool8 increment) { if (increment) data->battleBgType += 1; - else + else data->battleBgType -= 1; } @@ -1148,7 +1148,7 @@ void CB2_Debug_Pokemon(void) data->battleBgType = 0; data->battleTerrain = 0; LoadBattleBg(data->battleBgType , data->battleTerrain); - + gMain.state++; break; case 2: @@ -1377,7 +1377,7 @@ static void UpdateSubmenuOneOptionValue(u8 taskId, bool8 increment) data->animIdFront = sMonFrontAnimIdsTable[modArrows->currValue - 1]; UpdateMonAnimNames(taskId); ResetOffsetSpriteValues(data); - + UpdateBattlerValue(data); ReloadPokemonSprites(data); while (!(gMain.intrCheck & INTR_FLAG_VBLANK)); @@ -1486,7 +1486,7 @@ static void Handle_Input_Debug_Pokemon(u8 taskId) if (JOY_NEW(START_BUTTON)) { data->isShiny = !data->isShiny; - + if(data->isShiny) PlaySE(SE_SHINY); @@ -1641,7 +1641,7 @@ static void Handle_Input_Debug_Pokemon(u8 taskId) data->submenuYpos[2] += 1; if (data->submenuYpos[2] >= 3) data->submenuYpos[2] = 0; - + data->yPosModifyArrows.currentDigit = data->submenuYpos[2]; gSprites[data->yPosModifyArrows.arrowSpriteId[0]].y = OPTIONS_ARROW_Y + data->yPosModifyArrows.currentDigit * 12; } @@ -1672,7 +1672,7 @@ static void ReloadPokemonSprites(struct PokemonDebugMenu *data) u16 species = data->currentmonId; s16 offset_y; u8 front_x = sBattlerCoords[0][1].x; - u8 front_y; + u8 front_y; DestroySprite(&gSprites[data->frontspriteId]); DestroySprite(&gSprites[data->backspriteId]); @@ -1706,7 +1706,7 @@ static void ReloadPokemonSprites(struct PokemonDebugMenu *data) gSprites[data->frontspriteId].oam.priority = 0; //Front Shadow LoadAndCreateEnemyShadowSpriteCustom(data, species); - + //Back HandleLoadSpecialPokePic(FALSE, gMonSpritesGfxPtr->sprites.ptr[2], species, (data->isFemale ? FEMALE_PERSONALITY : MALE_PERSONALITY)); BattleLoadOpponentMonSpriteGfxCustom(species, data->isFemale, data->isShiny, 5); @@ -1720,7 +1720,7 @@ static void ReloadPokemonSprites(struct PokemonDebugMenu *data) //Icon Sprite data->iconspriteId = CreateMonIcon(species, SpriteCB_MonIcon, DEBUG_ICON_X, DEBUG_ICON_Y, 4, (data->isFemale ? FEMALE_PERSONALITY : MALE_PERSONALITY)); gSprites[data->iconspriteId].oam.priority = 0; - + //Modify Arrows LoadSpritePalette(&gSpritePalette_Arrow); data->modifyArrows.arrowSpriteId[0] = CreateSprite(&gSpriteTemplate_Arrow, MODIFY_DIGITS_ARROW_X + (data->modifyArrows.currentDigit * 6), MODIFY_DIGITS_ARROW1_Y, 0); diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c index 66bfa817cc..a0193ff6e7 100644 --- a/src/pokemon_summary_screen.c +++ b/src/pokemon_summary_screen.c @@ -3742,7 +3742,7 @@ static void PrintMoveDetails(u16 move) ShowSplitIcon(GetBattleMoveSplit(move)); #endif PrintMovePowerAndAccuracy(move); - + if (moveEffect != EFFECT_PLACEHOLDER) PrintTextOnWindow(windowId, gMoveDescriptionPointers[move - 1], 6, 1, 0, 0); else diff --git a/src/scrcmd.c b/src/scrcmd.c index 2813a37f37..e5ea3d5e11 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -1885,7 +1885,7 @@ bool8 ScrCmd_setwildbattle(struct ScriptContext *ctx) gIsScriptedWildDouble = FALSE; } else - { + { CreateScriptedDoubleWildMon(species, level, item, species2, level2, item2); gIsScriptedWildDouble = TRUE; } diff --git a/src/start_menu.c b/src/start_menu.c index a0cff087cd..b79b25741b 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -324,7 +324,7 @@ static void BuildNormalStartMenu(void) } static void BuildDebugStartMenu(void) -{ +{ AddStartMenuAction(MENU_ACTION_DEBUG); if (FlagGet(FLAG_SYS_POKEDEX_GET) == TRUE) AddStartMenuAction(MENU_ACTION_POKEDEX); diff --git a/src/wild_encounter.c b/src/wild_encounter.c index 4e8aceb2b3..8bf8c45e0e 100644 --- a/src/wild_encounter.c +++ b/src/wild_encounter.c @@ -1006,7 +1006,7 @@ bool8 TryDoDoubleWildBattle(void) { if (GetSafariZoneFlag() || GetMonsStateToDoubles() != PLAYER_HAS_TWO_USABLE_MONS) return FALSE; -#if B_FLAG_FORCE_DOUBLE_WILD != 0 +#if B_FLAG_FORCE_DOUBLE_WILD != 0 else if (FlagGet(B_FLAG_FORCE_DOUBLE_WILD)) return TRUE; #endif diff --git a/tools/aif2pcm/main.c b/tools/aif2pcm/main.c index 720db1acae..0824b92da8 100644 --- a/tools/aif2pcm/main.c +++ b/tools/aif2pcm/main.c @@ -238,7 +238,7 @@ void read_aif(struct Bytes *aif, AifData *aif_data) { FATAL_ERROR("More than one MARK Chunk in file!\n"); } - + markers = calloc(num_markers, sizeof(struct Marker)); // Read each marker. @@ -289,7 +289,7 @@ void read_aif(struct Bytes *aif, AifData *aif_data) // Skip NoLooping sustain loop. pos += 4; } - + // Skip release loop, we don't need it. pos += 6; } @@ -303,7 +303,7 @@ void read_aif(struct Bytes *aif, AifData *aif_data) { uint8_t *sample_data = (uint8_t *)malloc(num_samples * sizeof(uint8_t)); memcpy(sample_data, &aif->data[pos], num_samples); - + aif_data->samples8 = sample_data; aif_data->real_num_samples = num_samples; } @@ -316,7 +316,7 @@ void read_aif(struct Bytes *aif, AifData *aif_data) { sample_data_swapped[i] = __builtin_bswap16(sample_data[i]); } - + aif_data->samples16 = sample_data_swapped; aif_data->real_num_samples = num_samples; free(sample_data); @@ -329,12 +329,12 @@ void read_aif(struct Bytes *aif, AifData *aif_data) pos += chunk_size; } } - + if (markers) { // Resolve loop points. struct Marker *cur_marker = markers; - + // Grab loop start point. for (int i = 0; i < num_markers; i++, cur_marker++) { @@ -573,7 +573,7 @@ void aif2pcm(const char *aif_filename, const char *pcm_filename, bool compress) struct Bytes *aif = read_bytearray(aif_filename); AifData aif_data = {0}; read_aif(aif, &aif_data); - + // Convert 16-bit to 8-bit if necessary if (aif_data.sample_size == 16) { diff --git a/tools/gbagfx/font.c b/tools/gbagfx/font.c index 0dd6fbc3ee..1251b5c647 100644 --- a/tools/gbagfx/font.c +++ b/tools/gbagfx/font.c @@ -26,7 +26,7 @@ static void ConvertFromLatinFont(unsigned char *src, unsigned char *dest, unsign unsigned int pixelsX = (column * 16) + ((glyphTile & 1) * 8); for (unsigned int i = 0; i < 8; i++) { - unsigned int pixelsY = (row * 16) + ((glyphTile >> 1) * 8) + i; + unsigned int pixelsY = (row * 16) + ((glyphTile >> 1) * 8) + i; unsigned int destPixelsOffset = (pixelsY * 64) + (pixelsX / 4); dest[destPixelsOffset] = src[srcPixelsOffset + 1]; @@ -75,7 +75,7 @@ static void ConvertFromHalfwidthJapaneseFont(unsigned char *src, unsigned char * for (unsigned int i = 0; i < 8; i++) { unsigned int pixelsY = (row * 16) + (glyphTile * 8) + i; unsigned int destPixelsOffset = (pixelsY * 32) + (pixelsX / 4); - + dest[destPixelsOffset] = src[srcPixelsOffset + 1]; dest[destPixelsOffset + 1] = src[srcPixelsOffset]; @@ -233,7 +233,7 @@ void ReadHalfwidthJapaneseFont(char *path, struct Image *image) FATAL_ERROR("The file size (%d) is not a multiple of %d.\n", fileSize, glyphSize); int numGlyphs = fileSize / glyphSize; - + if (numGlyphs % 16 != 0) FATAL_ERROR("The number of glyphs (%d) is not a multiple of 16.\n", numGlyphs); diff --git a/tools/jsonproc/inja.hpp b/tools/jsonproc/inja.hpp index d5bf5bcba4..21478ea115 100755 --- a/tools/jsonproc/inja.hpp +++ b/tools/jsonproc/inja.hpp @@ -1675,7 +1675,7 @@ class FunctionStorage { #include #include -#include +#include #include // #include "bytecode.hpp" diff --git a/tools/mapjson/mapjson.cpp b/tools/mapjson/mapjson.cpp index 8de9ff8d01..9b02350f04 100644 --- a/tools/mapjson/mapjson.cpp +++ b/tools/mapjson/mapjson.cpp @@ -77,8 +77,8 @@ string generate_map_header_text(Json map_data, Json layouts_data, string version ostringstream text; - text << "@\n@ DO NOT MODIFY THIS FILE! It is auto-generated from data/maps/" - << map_data["name"].string_value() + text << "@\n@ DO NOT MODIFY THIS FILE! It is auto-generated from data/maps/" + << map_data["name"].string_value() << "/map.json\n@\n\n"; text << map_data["name"].string_value() << ":\n" @@ -128,8 +128,8 @@ string generate_map_connections_text(Json map_data) { ostringstream text; - text << "@\n@ DO NOT MODIFY THIS FILE! It is auto-generated from data/maps/" - << map_data["name"].string_value() + text << "@\n@ DO NOT MODIFY THIS FILE! It is auto-generated from data/maps/" + << map_data["name"].string_value() << "/map.json\n@\n\n"; text << map_data["name"].string_value() << "_MapConnectionsList:\n"; @@ -154,8 +154,8 @@ string generate_map_events_text(Json map_data) { ostringstream text; - text << "@\n@ DO NOT MODIFY THIS FILE! It is auto-generated from data/maps/" - << map_data["name"].string_value() + text << "@\n@ DO NOT MODIFY THIS FILE! It is auto-generated from data/maps/" + << map_data["name"].string_value() << "/map.json\n@\n\n"; string objects_label, warps_label, coords_label, bgs_label; @@ -399,7 +399,7 @@ string generate_map_constants_text(string groups_filepath, Json groups_data) { text << "// " << group.string_value() << "\n"; vector map_ids; size_t max_length = 0; - + int map_count = 0; //DEBUG for (auto &map_name : groups_data[group.string_value()].array_items()) { diff --git a/tools/preproc/c_file.cpp b/tools/preproc/c_file.cpp index 17a08cc9f7..508c628731 100644 --- a/tools/preproc/c_file.cpp +++ b/tools/preproc/c_file.cpp @@ -383,7 +383,7 @@ void CFile::TryConvertIncbin() if (m_buffer[m_pos] == '\\') RaiseError("unexpected escape in path string"); - + m_pos++; } @@ -418,7 +418,7 @@ void CFile::TryConvertIncbin() m_pos++; } - + if (m_buffer[m_pos] != ')') RaiseError("expected ')'"); diff --git a/tools/preproc/charmap.cpp b/tools/preproc/charmap.cpp index a7bedfe26f..a0c631026c 100644 --- a/tools/preproc/charmap.cpp +++ b/tools/preproc/charmap.cpp @@ -119,7 +119,7 @@ Lhs CharmapReader::ReadLhs() break; } } - + if (m_buffer[m_pos] == '\'') { m_pos++; diff --git a/tools/scaninc/source_file.cpp b/tools/scaninc/source_file.cpp index df31282f80..9d188eb738 100644 --- a/tools/scaninc/source_file.cpp +++ b/tools/scaninc/source_file.cpp @@ -41,7 +41,7 @@ SourceFileType GetFileType(std::string& path) return SourceFileType::Inc; else FATAL_ERROR("Unrecognized extension \"%s\"\n", extension.c_str()); - + // Unreachable return SourceFileType::Cpp; } @@ -84,7 +84,7 @@ SourceFile::SourceFile(std::string path) else incbins.insert(outputPath); } - + new (&m_source_file.asm_wrapper) SourceFile::InnerUnion::AsmWrapper{incbins, includes}; } }