diff --git a/Makefile b/Makefile index d641228fb..a0927755e 100644 --- a/Makefile +++ b/Makefile @@ -219,8 +219,8 @@ include songs.mk %.lz: % ; $(GFX) $< $@ %.rl: % ; $(GFX) $< $@ -$(CRY_SUBDIR)/cry_not_%.bin: $(CRY_SUBDIR)/cry_not_%.aif ; $(AIF) $< $@ -$(CRY_SUBDIR)/cry_%.bin: $(CRY_SUBDIR)/cry_%.aif ; $(AIF) $< $@ --compress +$(CRY_SUBDIR)/uncomp_%.bin: $(CRY_SUBDIR)/uncomp_%.aif ; $(AIF) $< $@ +$(CRY_SUBDIR)/%.bin: $(CRY_SUBDIR)/%.aif ; $(AIF) $< $@ --compress sound/%.bin: sound/%.aif ; $(AIF) $< $@ diff --git a/asm/macros/music_voice.inc b/asm/macros/music_voice.inc index 14fa3f48c..832c76511 100644 --- a/asm/macros/music_voice.inc +++ b/asm/macros/music_voice.inc @@ -151,13 +151,13 @@ .byte 0xff, 0, 0xff, 0 .endm - .macro cry_not sample @ not compressed + .macro cry_uncomp sample @ not compressed .byte 0x0, 60, 0, 0 .4byte \sample .byte 0xff, 0, 0xff, 0 .endm - .macro cry2_not sample @ not compressed + .macro cry2_uncomp sample @ not compressed .byte 0x10, 60, 0, 0 .4byte \sample .byte 0xff, 0, 0xff, 0 diff --git a/common_syms/battle_factory_screen.txt b/common_syms/battle_factory_screen.txt index 9f6868139..3ddeb6d3b 100644 --- a/common_syms/battle_factory_screen.txt +++ b/common_syms/battle_factory_screen.txt @@ -1 +1 @@ -gUnknown_030062E8 +gFactorySelect_CurrentOptionFunc diff --git a/constants/m4a_constants.inc b/constants/m4a_constants.inc index 08d888acd..1a744dc7f 100644 --- a/constants/m4a_constants.inc +++ b/constants/m4a_constants.inc @@ -1,6 +1,7 @@ .equiv ID_NUMBER, 0x68736d53 .equiv PCM_DMA_BUF_SIZE, 1584 + .equiv MAX_DIRECTSOUND_CHANNELS, 12 .equiv C_V, 0x40 @@ -93,7 +94,7 @@ struct_field o_SoundInfo_plynote, 4 struct_field o_SoundInfo_ExtVolPit, 4 struct_field o_SoundInfo_gap2, 16 - struct_field o_SoundInfo_chans, 768 + struct_field o_SoundInfo_chans, MAX_DIRECTSOUND_CHANNELS * 64 struct_field o_SoundInfo_pcmBuffer, PCM_DMA_BUF_SIZE * 2 struct_field SoundInfo_size, 0 diff --git a/data/battle_ai_scripts.s b/data/battle_ai_scripts.s index d1dd1caed..56be92c5e 100644 --- a/data/battle_ai_scripts.s +++ b/data/battle_ai_scripts.s @@ -462,18 +462,18 @@ AI_CBM_Attract: @ 82DC5F5 get_ability AI_TARGET if_equal ABILITY_OBLIVIOUS, Score_Minus10 get_gender AI_USER - if_equal 0, AI_CBM_Attract_CheckIfTargetIsFemale - if_equal 254, AI_CBM_Attract_CheckIfTargetIsMale + if_equal MON_MALE, AI_CBM_Attract_CheckIfTargetIsFemale + if_equal MON_FEMALE, AI_CBM_Attract_CheckIfTargetIsMale goto Score_Minus10 AI_CBM_Attract_CheckIfTargetIsFemale: @ 82DC61A get_gender AI_TARGET - if_equal 254, AI_CBM_Attract_End + if_equal MON_FEMALE, AI_CBM_Attract_End goto Score_Minus10 AI_CBM_Attract_CheckIfTargetIsMale: @ 82DC627 get_gender AI_TARGET - if_equal 0, AI_CBM_Attract_End + if_equal MON_MALE, AI_CBM_Attract_End goto Score_Minus10 AI_CBM_Attract_End: @ 82DC634 @@ -2057,12 +2057,22 @@ AI_CV_Protect_ScoreDown2: AI_CV_Protect_End: end +@ BUG: Foresight is only encouraged if the user is Ghost type or +@ has high evasion, but should check target instead AI_CV_Foresight: +.ifdef BUGFIX + get_target_type1 + if_equal TYPE_GHOST, AI_CV_Foresight2 + get_target_type2 + if_equal TYPE_GHOST, AI_CV_Foresight2 + if_stat_level_more_than AI_TARGET, STAT_EVASION, 8, AI_CV_Foresight3 +.else get_user_type1 if_equal TYPE_GHOST, AI_CV_Foresight2 get_user_type2 if_equal TYPE_GHOST, AI_CV_Foresight2 if_stat_level_more_than AI_USER, STAT_EVASION, 8, AI_CV_Foresight3 +.endif score -2 goto AI_CV_Foresight_End @@ -2329,13 +2339,13 @@ AI_CV_SemiInvulnerable2: if_status2 AI_TARGET, STATUS2_CURSED, AI_CV_SemiInvulnerable_TryEncourage if_status3 AI_TARGET, STATUS3_LEECHSEED, AI_CV_SemiInvulnerable_TryEncourage get_weather - .ifdef BUGFIX +.ifdef BUGFIX if_equal AI_WEATHER_HAIL, AI_CV_SemiInvulnerable_CheckIceType if_equal AI_WEATHER_SANDSTORM, AI_CV_SemiInvulnerable_CheckSandstormTypes - .else +.else if_equal AI_WEATHER_HAIL, AI_CV_SemiInvulnerable_CheckSandstormTypes if_equal AI_WEATHER_SANDSTORM, AI_CV_SemiInvulnerable_CheckIceType - .endif +.endif goto AI_CV_SemiInvulnerable5 AI_CV_SemiInvulnerable_CheckSandstormTypes: @@ -2404,11 +2414,11 @@ AI_CV_Hail_End: @ BUG: Facade score is increased if the target is statused, but should be if the user is AI_CV_Facade: - .ifdef BUGFIX +.ifdef BUGFIX if_not_status AI_USER, STATUS1_POISON | STATUS1_BURN | STATUS1_PARALYSIS | STATUS1_TOXIC_POISON, AI_CV_Facade_End - .else +.else if_not_status AI_TARGET, STATUS1_POISON | STATUS1_BURN | STATUS1_PARALYSIS | STATUS1_TOXIC_POISON, AI_CV_Facade_End - .endif +.endif score +1 AI_CV_Facade_End: end diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index b4bb33993..2344007a5 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -374,41 +374,41 @@ gBattleAnims_Moves:: .align 2 gBattleAnims_StatusConditions:: - .4byte Status_Poison - .4byte Status_Confusion - .4byte Status_Burn - .4byte Status_Infatuation - .4byte Status_Sleep - .4byte Status_Paralysis - .4byte Status_Freeze - .4byte Status_Curse - .4byte Status_Nightmare + .4byte Status_Poison @ B_ANIM_STATUS_PSN + .4byte Status_Confusion @ B_ANIM_STATUS_CONFUSION + .4byte Status_Burn @ B_ANIM_STATUS_BRN + .4byte Status_Infatuation @ B_ANIM_STATUS_INFATUATION + .4byte Status_Sleep @ B_ANIM_STATUS_SLP + .4byte Status_Paralysis @ B_ANIM_STATUS_PRZ + .4byte Status_Freeze @ B_ANIM_STATUS_FRZ + .4byte Status_Curse @ B_ANIM_STATUS_CURSED + .4byte Status_Nightmare @ B_ANIM_STATUS_NIGHTMARE .align 2 gBattleAnims_General:: - .4byte General_CastformChange - .4byte General_StatsChange - .4byte General_SubstituteFade - .4byte General_SubstituteAppear - .4byte General_PokeblockThrow - .4byte General_ItemKnockoff - .4byte General_TurnTrap - .4byte General_HeldItemEffect - .4byte General_SmokeballEscape - .4byte General_FocusBand - .4byte General_Rain - .4byte General_Sun - .4byte General_Sandstorm - .4byte General_Hail - .4byte General_LeechSeedDrain - .4byte General_MonHit - .4byte General_ItemSteal - .4byte General_SnatchMove - .4byte General_FutureSightHit - .4byte General_DoomDesireHit - .4byte General_FocusPunchSetUp - .4byte General_IngrainHeal - .4byte General_WishHeal + .4byte General_CastformChange @ B_ANIM_CASTFORM_CHANGE + .4byte General_StatsChange @ B_ANIM_STATS_CHANGE + .4byte General_SubstituteFade @ B_ANIM_SUBSTITUTE_FADE + .4byte General_SubstituteAppear @ B_ANIM_SUBSTITUTE_APPEAR + .4byte General_PokeblockThrow @ B_ANIM_POKEBLOCK_THROW + .4byte General_ItemKnockoff @ B_ANIM_ITEM_KNOCKOFF + .4byte General_TurnTrap @ B_ANIM_TURN_TRAP + .4byte General_HeldItemEffect @ B_ANIM_HELD_ITEM_EFFECT + .4byte General_SmokeballEscape @ B_ANIM_SMOKEBALL_ESCAPE + .4byte General_FocusBand @ B_ANIM_FOCUS_BAND + .4byte General_Rain @ B_ANIM_RAIN_CONTINUES + .4byte General_Sun @ B_ANIM_SUN_CONTINUES + .4byte General_Sandstorm @ B_ANIM_SANDSTORM_CONTINUES + .4byte General_Hail @ B_ANIM_HAIL_CONTINUES + .4byte General_LeechSeedDrain @ B_ANIM_LEECH_SEED_DRAIN + .4byte General_MonHit @ B_ANIM_MON_HIT + .4byte General_ItemSteal @ B_ANIM_ITEM_STEAL + .4byte General_SnatchMove @ B_ANIM_SNATCH_MOVE + .4byte General_FutureSightHit @ B_ANIM_FUTURE_SIGHT_HIT + .4byte General_DoomDesireHit @ B_ANIM_DOOM_DESIRE_HIT + .4byte General_FocusPunchSetUp @ B_ANIM_FOCUS_PUNCH_SETUP + .4byte General_IngrainHeal @ B_ANIM_INGRAIN_HEAL + .4byte General_WishHeal @ B_ANIM_WISH_HEAL .align 2 gBattleAnims_Special:: diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 873425c63..1c3f3ea5b 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -2860,7 +2860,7 @@ BattleScript_FaintedMonTryChooseAnother:: switchhandleorder BS_FAINTED, 0x2 jumpifnotbattletype BATTLE_TYPE_TRAINER, BattleScript_FaintedMonChooseAnother jumpifbattletype BATTLE_TYPE_LINK, BattleScript_FaintedMonChooseAnother - jumpifbattletype BATTLE_TYPE_x2000000, BattleScript_FaintedMonChooseAnother + jumpifbattletype BATTLE_TYPE_RECORDED_LINK, BattleScript_FaintedMonChooseAnother jumpifbattletype BATTLE_TYPE_FRONTIER, BattleScript_FaintedMonChooseAnother jumpifbattletype BATTLE_TYPE_DOUBLE, BattleScript_FaintedMonChooseAnother jumpifword CMP_COMMON_BITS, gHitMarker, HITMARKER_x400000, BattleScript_FaintedMonChooseAnother @@ -2978,7 +2978,7 @@ BattleScript_LocalBattleLostPrintTrainersWinText:: trainerslidein BS_ATTACKER waitstate printstring STRINGID_TRAINER1WINTEXT - jumpifbattletype BATTLE_TYPE_x800000, BattleScript_LocalBattleLostDoTrainer2WinText + jumpifbattletype BATTLE_TYPE_TOWER_LINK_MULTI, BattleScript_LocalBattleLostDoTrainer2WinText jumpifnotbattletype BATTLE_TYPE_TWO_OPPONENTS, BattleScript_LocalBattleLostEnd_ BattleScript_LocalBattleLostDoTrainer2WinText:: trainerslideout B_POSITION_OPPONENT_LEFT @@ -3834,7 +3834,7 @@ BattleScript_MoveUsedIsConfusedNoMore:: return BattleScript_PrintPayDayMoneyString:: - printstring STRINGID_PKMNPICKEDUPITEM + printstring STRINGID_PLAYERPICKEDUPMONEY waitmessage 0x40 return diff --git a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc index 48d2bcc3a..e85697146 100644 --- a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc @@ -168,7 +168,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_SwapMons:: @ 8259DF2 fadescreen FADE_TO_BLACK factory_swapmons waitstate - compare VAR_RESULT, 1 + compare VAR_RESULT, TRUE @ Did player keep current pokemon goto_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_EnterBattleRoom factory_setswapped msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_YourSwapIsComplete, MSGBOX_DEFAULT diff --git a/data/maps/CaveOfOrigin_1F/scripts.inc b/data/maps/CaveOfOrigin_1F/scripts.inc index de1d979d4..943a9e9ed 100644 --- a/data/maps/CaveOfOrigin_1F/scripts.inc +++ b/data/maps/CaveOfOrigin_1F/scripts.inc @@ -3,5 +3,5 @@ CaveOfOrigin_1F_MapScripts:: @ 8235768 .byte 0 CaveOfOrigin_1F_OnTransition: @ 823576E - call_if_set FLAG_UNUSED_RS_LEGENDARY_BATTLE_DONE, CaveOfOrigin_EventScript_SetTempVars + call_if_set FLAG_UNUSED_RS_LEGENDARY_BATTLE_DONE, CaveOfOrigin_EventScript_DisableTriggers end diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/scripts.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/scripts.inc index 326ea21e3..9f3fefdeb 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/scripts.inc +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/scripts.inc @@ -3,5 +3,5 @@ CaveOfOrigin_UnusedRubySapphireMap1_MapScripts:: @ 8235778 .byte 0 CaveOfOrigin_UnusedRubySapphireMap1_OnTransition: @ 823577E - call_if_set FLAG_UNUSED_RS_LEGENDARY_BATTLE_DONE, CaveOfOrigin_EventScript_SetTempVars + call_if_set FLAG_UNUSED_RS_LEGENDARY_BATTLE_DONE, CaveOfOrigin_EventScript_DisableTriggers end diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/scripts.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/scripts.inc index 5e92a7d45..60b1f0cca 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/scripts.inc +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/scripts.inc @@ -3,6 +3,6 @@ CaveOfOrigin_UnusedRubySapphireMap2_MapScripts:: @ 8235788 .byte 0 CaveOfOrigin_UnusedRubySapphireMap2_OnTransition: @ 823578E - call_if_set FLAG_UNUSED_RS_LEGENDARY_BATTLE_DONE, CaveOfOrigin_EventScript_SetTempVars + call_if_set FLAG_UNUSED_RS_LEGENDARY_BATTLE_DONE, CaveOfOrigin_EventScript_DisableTriggers end diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/scripts.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/scripts.inc index 2f0e2b66c..e30b50cbe 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/scripts.inc +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/scripts.inc @@ -3,6 +3,6 @@ CaveOfOrigin_UnusedRubySapphireMap3_MapScripts:: @ 8235798 .byte 0 CaveOfOrigin_UnusedRubySapphireMap3_OnTransition: @ 823579E - call_if_set FLAG_UNUSED_RS_LEGENDARY_BATTLE_DONE, CaveOfOrigin_EventScript_SetTempVars + call_if_set FLAG_UNUSED_RS_LEGENDARY_BATTLE_DONE, CaveOfOrigin_EventScript_DisableTriggers end diff --git a/data/script_cmd_table.inc b/data/script_cmd_table.inc index 0971358a1..7edb5c4b7 100644 --- a/data/script_cmd_table.inc +++ b/data/script_cmd_table.inc @@ -209,7 +209,7 @@ gScriptCmdTable:: @ 81DB67C .4byte ScrCmd_checkmonobedience @ 0xce .4byte ScrCmd_gotoram @ 0xcf .4byte ScrCmd_nop1 @ 0xd0 - .4byte ScrCmd_warpD1 @ 0xd1 + .4byte ScrCmd_warpspinenter @ 0xd1 .4byte ScrCmd_setmonmetlocation @ 0xd2 .4byte ScrCmd_moverotatingtileobjects @ 0xd3 .4byte ScrCmd_turnrotatingtileobjects @ 0xd4 diff --git a/data/scripts/cave_of_origin.inc b/data/scripts/cave_of_origin.inc index 52a1da84f..579efdb89 100644 --- a/data/scripts/cave_of_origin.inc +++ b/data/scripts/cave_of_origin.inc @@ -36,7 +36,7 @@ CaveOfOrigin_EventScript_Shake:: @ 82722A7 releaseall end -CaveOfOrigin_EventScript_SetTempVars:: @ 82722C1 +CaveOfOrigin_EventScript_DisableTriggers:: @ 82722C1 setvar VAR_TEMP_1, 1 setvar VAR_TEMP_2, 1 setvar VAR_TEMP_3, 1 diff --git a/data/scripts/pkmn_center_nurse.inc b/data/scripts/pkmn_center_nurse.inc index a26e9e22a..6b4bbe2ef 100644 --- a/data/scripts/pkmn_center_nurse.inc +++ b/data/scripts/pkmn_center_nurse.inc @@ -65,7 +65,7 @@ EventScript_PkmnCenterNurse_ReturnPkmn:: @ 82719E2 goto_if_eq EventScript_PkmnCenterNurse_ReturnPkmn2 message gText_RestoredPkmnToFullHealth waitmessage - applymovement VAR_0x800B, EventScript_PkmnCenterNurse_Bow + applymovement VAR_0x800B, Movement_PkmnCenterNurse_Bow waitmovement 0 message gText_WeHopeToSeeYouAgain return @@ -73,7 +73,7 @@ EventScript_PkmnCenterNurse_ReturnPkmn:: @ 82719E2 EventScript_PkmnCenterNurse_ReturnPkmn2:: @ 8271A03 message gText_ThankYouForWaiting waitmessage - applymovement VAR_0x800B, EventScript_PkmnCenterNurse_Bow + applymovement VAR_0x800B, Movement_PkmnCenterNurse_Bow waitmovement 0 message gText_WeHopeToSeeYouAgain2 return @@ -84,7 +84,7 @@ EventScript_PkmnCenterNurse_PlayerWaitingInUnionRoom:: @ 8271A19 setflag FLAG_NURSE_UNION_ROOM_REMINDER message CableClub_Text_PlayerIsWaiting waitmessage - applymovement VAR_0x800B, EventScript_PkmnCenterNurse_Bow + applymovement VAR_0x800B, Movement_PkmnCenterNurse_Bow waitmovement 0 message gText_WeHopeToSeeYouAgain return @@ -129,7 +129,7 @@ EventScript_PkmnCenterNurse_GoldCardHealPkmn:: @ 8271AC5 goto EventScript_PkmnCenterNurse_HealPkmn end -EventScript_PkmnCenterNurse_Bow: @ 8271AD0 +Movement_PkmnCenterNurse_Bow: @ 8271AD0 nurse_joy_bow delay_4 step_end diff --git a/data/scripts/record_mix.inc b/data/scripts/record_mix.inc index 23f224ae4..e058816ab 100644 --- a/data/scripts/record_mix.inc +++ b/data/scripts/record_mix.inc @@ -6,16 +6,15 @@ EventScript_MixRecordsPrompt:: @ 8271D5E compare VAR_RESULT, YES goto_if_eq EventScript_MixRecords compare VAR_RESULT, NO - goto_if_eq EventScript_DeclineMixRecords - goto EventScript_DeclineMixRecords + goto_if_eq EventScript_EndMixRecords + goto EventScript_EndMixRecords EventScript_MixRecords:: @ 8271D83 special RecordMixingPlayerSpotTriggered waitstate lock faceplayer - -EventScript_DeclineMixRecords:: @ 8271D89 +EventScript_EndMixRecords:: @ 8271D89 message Text_WeHopeToSeeYouAgain waitmessage waitbuttonpress diff --git a/docs/bugs_and_glitches.md b/docs/bugs_and_glitches.md index 285718598..ce06c1489 100644 --- a/docs/bugs_and_glitches.md +++ b/docs/bugs_and_glitches.md @@ -1,7 +1,7 @@ # Bugs and Glitches -These are known bugs and glitches in the original Pokémon Emerald game: code that clearly does not work as intended, or that only works in limited circumstances but has the possibility to fail or crash. Defining the `BUGFIX` preprocessor variable will fix some of these automatically. +These are known bugs and glitches in the original Pokémon Emerald game: code that clearly does not work as intended, or that only works in limited circumstances but has the possibility to fail or crash. Defining the `BUGFIX` and `UBFIX` preprocessor variables will fix some of these automatically. `UBFIX` will already be defined for MODERN builds. Fixes are written in the `diff` format. If you've used Git before, this should look familiar: @@ -13,55 +13,9 @@ Fixes are written in the `diff` format. If you've used Git before, this should l ## Contents -- [RNG does not get seeded](#rng-does-not-get-seeded) - [Scrolling through items in the bag causes the image to flicker](#scrolling-through-items-in-the-bag-causes-the-image-to-flicker) -## RNG does not get seeded - -**Fix:** Add the following function to [src/main.c](https://github.com/pret/pokeemerald/blob/master/src/main.c): -```diff -+static void SeedRngWithRtc(void) -+{ -+ u32 seed = RtcGetMinuteCount(); -+ seed = (seed >> 16) ^ (seed & 0xFFFF); -+ SeedRng(seed); -+} -``` - -And edit `AgbMain`: - -```diff - ... - RtcInit(); - CheckForFlashMemory(); - InitMainCallbacks(); - InitMapMusic(); -+ SeedRngWithRtc(); - ClearDma3Requests(); - ... -``` - -This restores the code of Ruby/Sapphire. - -**Alternate Fix:** Edit the following function in [src/title_screen.c](https://github.com/pret/pokeemerald/blob/master/src/title_screen.c): - -```diff -void CB2_InitTitleScreen(void) -{ - switch (gMain.state) - { - default: - case 0: - SetVBlankCallback(NULL); -+ StartTimer1(); - SetGpuReg(REG_OFFSET_BLDCNT, 0); - SetGpuReg(REG_OFFSET_BLDALPHA, 0); - SetGpuReg(REG_OFFSET_BLDY, 0); - ... -``` -This matches what FRLG does and obtains the seed differently than RS, independently of the RTC. - ## Scrolling through items in the bag causes the image to flicker **Fix:** Add the following function to [src/item_menu_icons.c](https://github.com/pret/pokeemerald/blob/master/src/item_menu_icons.c): @@ -89,27 +43,9 @@ Then edit `BagMenu_MoveCursorCallback` in [src/item_menu.c](https://github.com/p ```diff ... { -- RemoveBagItemIconSprite(1 ^ gBagMenu->unk81B_1); -+ HideBagItemIconSprite(gBagMenu->unk81B_1 ^ 1); -+ RemoveBagItemIconSprite(gBagMenu->unk81B_1); - if (a != -2) +- RemoveBagItemIconSprite(1 ^ gBagMenu->itemIconSlot); ++ HideBagItemIconSprite(gBagMenu->itemIconSlot ^ 1); ++ RemoveBagItemIconSprite(gBagMenu->itemIconSlot); + if (itemIndex != LIST_CANCEL) ... ``` - -## Pokémon that have an affine transform as part of their entry animation glitch when going in and out of Poké Balls without a screen transition in between - -**Fix:** Edit `sub_817F77C` in [src/pokemon_animation.c](https://github.com/pret/pokeemerald/blob/master/src/pokemon_animation.c#L1028): - -```diff - ... --#ifdef BUGFIX - else - { - // FIX: Reset these back to normal after they were changed so Poké Ball catch/release - // animations without a screen transition in between don't break - sprite->affineAnimPaused = FALSE; - sprite->affineAnims = gUnknown_082FF694; - } --#endif // BUGFIX -} -``` diff --git a/gflib/malloc.c b/gflib/malloc.c index 4d1a9fe5c..38fc8939e 100644 --- a/gflib/malloc.c +++ b/gflib/malloc.c @@ -2,7 +2,7 @@ static void *sHeapStart; static u32 sHeapSize; -static u32 malloc_c_unused_0300000c; // needed to align dma3_manager.o(.bss) +static u32 sFiller; // needed to align dma3_manager.o(.bss) #define MALLOC_SYSTEM_ID 0xA3A3 diff --git a/gflib/sprite.c b/gflib/sprite.c index c7e3d09a3..2616aeaed 100644 --- a/gflib/sprite.c +++ b/gflib/sprite.c @@ -1320,6 +1320,11 @@ void ApplyAffineAnimFrameRelativeAndUpdateMatrix(u8 matrixNum, struct AffineAnim s16 ConvertScaleParam(s16 scale) { s32 val = 0x10000; + // UB: possible division by zero +#ifdef UBFIX + if (scale == 0) + return 0; +#endif //UBFIX return val / scale; } diff --git a/gflib/text.c b/gflib/text.c index 4cbad1376..ffce2cb56 100644 --- a/gflib/text.c +++ b/gflib/text.c @@ -165,7 +165,6 @@ bool16 AddTextPrinter(struct TextPrinterTemplate *printerTemplate, u8 speed, voi { int i; u16 j; - u8 *ptr; if (!gFonts) return FALSE; @@ -1235,7 +1234,6 @@ s32 GetStringWidth(u8 fontId, const u8 *str, s16 letterSpacing) bool8 isJapanese; int minGlyphWidth; u32 (*func)(u16 glyphId, bool32 isJapanese); - s32 result; int localLetterSpacing; u32 lineWidth; const u8 *bufferPointer; diff --git a/graphics/battle_anims/sprites/substitute.bin b/graphics/battle_anims/sprites/substitute.bin deleted file mode 100644 index d30c07d4e..000000000 Binary files a/graphics/battle_anims/sprites/substitute.bin and /dev/null differ diff --git a/graphics/battle_anims/sprites/substitute_back.png b/graphics/battle_anims/sprites/substitute_back.png new file mode 100644 index 000000000..8ea1f7ff8 Binary files /dev/null and b/graphics/battle_anims/sprites/substitute_back.png differ diff --git a/graphics/battle_frontier/factory_screen/action_box_left.png b/graphics/battle_frontier/factory_screen/action_box_left.png new file mode 100644 index 000000000..c4c943a15 Binary files /dev/null and b/graphics/battle_frontier/factory_screen/action_box_left.png differ diff --git a/graphics/battle_frontier/factory_screen/action_box_right.png b/graphics/battle_frontier/factory_screen/action_box_right.png new file mode 100644 index 000000000..984244660 Binary files /dev/null and b/graphics/battle_frontier/factory_screen/action_box_right.png differ diff --git a/graphics/battle_frontier/factory_screen/action_highlight_left.png b/graphics/battle_frontier/factory_screen/action_highlight_left.png new file mode 100644 index 000000000..873049e64 Binary files /dev/null and b/graphics/battle_frontier/factory_screen/action_highlight_left.png differ diff --git a/graphics/battle_frontier/factory_screen/action_highlight_middle.png b/graphics/battle_frontier/factory_screen/action_highlight_middle.png new file mode 100644 index 000000000..e2bebe11b Binary files /dev/null and b/graphics/battle_frontier/factory_screen/action_highlight_middle.png differ diff --git a/graphics/battle_frontier/factory_screen/action_highlight_right.png b/graphics/battle_frontier/factory_screen/action_highlight_right.png new file mode 100644 index 000000000..e2bebe11b Binary files /dev/null and b/graphics/battle_frontier/factory_screen/action_highlight_right.png differ diff --git a/graphics/battle_frontier/factory_screen/arrow.png b/graphics/battle_frontier/factory_screen/arrow.png new file mode 100644 index 000000000..d0ec83dee Binary files /dev/null and b/graphics/battle_frontier/factory_screen/arrow.png differ diff --git a/graphics/unknown/unknown_60F17C.pal b/graphics/battle_frontier/factory_screen/interface.pal similarity index 100% rename from graphics/unknown/unknown_60F17C.pal rename to graphics/battle_frontier/factory_screen/interface.pal diff --git a/graphics/battle_frontier/factory_screen/menu_highlight_left.png b/graphics/battle_frontier/factory_screen/menu_highlight_left.png new file mode 100644 index 000000000..1c39f7250 Binary files /dev/null and b/graphics/battle_frontier/factory_screen/menu_highlight_left.png differ diff --git a/graphics/battle_frontier/factory_screen/menu_highlight_right.png b/graphics/battle_frontier/factory_screen/menu_highlight_right.png new file mode 100644 index 000000000..9e6800733 Binary files /dev/null and b/graphics/battle_frontier/factory_screen/menu_highlight_right.png differ diff --git a/graphics/unknown/unknown_61023C.bin b/graphics/battle_frontier/factory_screen/mon_pic_bg.bin similarity index 100% rename from graphics/unknown/unknown_61023C.bin rename to graphics/battle_frontier/factory_screen/mon_pic_bg.bin diff --git a/graphics/battle_frontier/factory_screen/mon_pic_bg.png b/graphics/battle_frontier/factory_screen/mon_pic_bg.png new file mode 100644 index 000000000..b72da6f44 Binary files /dev/null and b/graphics/battle_frontier/factory_screen/mon_pic_bg.png differ diff --git a/graphics/battle_frontier/factory_screen/mon_pic_bg_anim.png b/graphics/battle_frontier/factory_screen/mon_pic_bg_anim.png new file mode 100644 index 000000000..324063d0d Binary files /dev/null and b/graphics/battle_frontier/factory_screen/mon_pic_bg_anim.png differ diff --git a/graphics/battle_frontier/factory_screen/pokeball.png b/graphics/battle_frontier/factory_screen/pokeball.png new file mode 100644 index 000000000..b3426fc72 Binary files /dev/null and b/graphics/battle_frontier/factory_screen/pokeball.png differ diff --git a/graphics/unknown/unknown_60F13C.pal b/graphics/battle_frontier/factory_screen/pokeball_gray.pal similarity index 100% rename from graphics/unknown/unknown_60F13C.pal rename to graphics/battle_frontier/factory_screen/pokeball_gray.pal diff --git a/graphics/unknown/unknown_60F15C.pal b/graphics/battle_frontier/factory_screen/pokeball_selected.pal similarity index 100% rename from graphics/unknown/unknown_60F15C.pal rename to graphics/battle_frontier/factory_screen/pokeball_selected.pal diff --git a/graphics/unknown/unknown_61046C.pal b/graphics/battle_frontier/factory_screen/text.pal similarity index 100% rename from graphics/unknown/unknown_61046C.pal rename to graphics/battle_frontier/factory_screen/text.pal diff --git a/graphics/pokemon/mimejr/anim_front.png b/graphics/pokemon/mime_jr/anim_front.png similarity index 100% rename from graphics/pokemon/mimejr/anim_front.png rename to graphics/pokemon/mime_jr/anim_front.png diff --git a/graphics/pokemon/mimejr/back.png b/graphics/pokemon/mime_jr/back.png similarity index 100% rename from graphics/pokemon/mimejr/back.png rename to graphics/pokemon/mime_jr/back.png diff --git a/graphics/pokemon/mimejr/footprint.png b/graphics/pokemon/mime_jr/footprint.png similarity index 100% rename from graphics/pokemon/mimejr/footprint.png rename to graphics/pokemon/mime_jr/footprint.png diff --git a/graphics/pokemon/mimejr/front.png b/graphics/pokemon/mime_jr/front.png similarity index 100% rename from graphics/pokemon/mimejr/front.png rename to graphics/pokemon/mime_jr/front.png diff --git a/graphics/pokemon/mimejr/icon.png b/graphics/pokemon/mime_jr/icon.png similarity index 100% rename from graphics/pokemon/mimejr/icon.png rename to graphics/pokemon/mime_jr/icon.png diff --git a/graphics/pokemon/mimejr/normal.pal b/graphics/pokemon/mime_jr/normal.pal similarity index 100% rename from graphics/pokemon/mimejr/normal.pal rename to graphics/pokemon/mime_jr/normal.pal diff --git a/graphics/pokemon/mimejr/shiny.pal b/graphics/pokemon/mime_jr/shiny.pal similarity index 100% rename from graphics/pokemon/mimejr/shiny.pal rename to graphics/pokemon/mime_jr/shiny.pal diff --git a/graphics/pokemon/oricorio/pa_u/back.png b/graphics/pokemon/oricorio/pau/back.png similarity index 100% rename from graphics/pokemon/oricorio/pa_u/back.png rename to graphics/pokemon/oricorio/pau/back.png diff --git a/graphics/pokemon/oricorio/pa_u/front.png b/graphics/pokemon/oricorio/pau/front.png similarity index 100% rename from graphics/pokemon/oricorio/pa_u/front.png rename to graphics/pokemon/oricorio/pau/front.png diff --git a/graphics/pokemon/oricorio/pa_u/icon.png b/graphics/pokemon/oricorio/pau/icon.png similarity index 100% rename from graphics/pokemon/oricorio/pa_u/icon.png rename to graphics/pokemon/oricorio/pau/icon.png diff --git a/graphics/pokemon/oricorio/pa_u/normal.pal b/graphics/pokemon/oricorio/pau/normal.pal similarity index 100% rename from graphics/pokemon/oricorio/pa_u/normal.pal rename to graphics/pokemon/oricorio/pau/normal.pal diff --git a/graphics/pokemon/oricorio/pa_u/shiny.pal b/graphics/pokemon/oricorio/pau/shiny.pal similarity index 100% rename from graphics/pokemon/oricorio/pa_u/shiny.pal rename to graphics/pokemon/oricorio/pau/shiny.pal diff --git a/graphics/unknown/unknown_60F1BC.png b/graphics/unknown/unknown_60F1BC.png deleted file mode 100644 index 185b93d57..000000000 Binary files a/graphics/unknown/unknown_60F1BC.png and /dev/null differ diff --git a/graphics/unknown/unknown_60F3BC.png b/graphics/unknown/unknown_60F3BC.png deleted file mode 100644 index 3114f2eb8..000000000 Binary files a/graphics/unknown/unknown_60F3BC.png and /dev/null differ diff --git a/graphics/unknown/unknown_60F43C.png b/graphics/unknown/unknown_60F43C.png deleted file mode 100644 index 3c2c1d5cd..000000000 Binary files a/graphics/unknown/unknown_60F43C.png and /dev/null differ diff --git a/graphics/unknown/unknown_60F53C.png b/graphics/unknown/unknown_60F53C.png deleted file mode 100644 index 65450c7b3..000000000 Binary files a/graphics/unknown/unknown_60F53C.png and /dev/null differ diff --git a/graphics/unknown/unknown_60F63C.png b/graphics/unknown/unknown_60F63C.png deleted file mode 100644 index 01fcea2fa..000000000 Binary files a/graphics/unknown/unknown_60F63C.png and /dev/null differ diff --git a/graphics/unknown/unknown_60F6BC.png b/graphics/unknown/unknown_60F6BC.png deleted file mode 100644 index bda46587f..000000000 Binary files a/graphics/unknown/unknown_60F6BC.png and /dev/null differ diff --git a/graphics/unknown/unknown_60F7BC.png b/graphics/unknown/unknown_60F7BC.png deleted file mode 100644 index 487b428bd..000000000 Binary files a/graphics/unknown/unknown_60F7BC.png and /dev/null differ diff --git a/graphics/unknown/unknown_60F83C.png b/graphics/unknown/unknown_60F83C.png deleted file mode 100644 index 2a44e9455..000000000 Binary files a/graphics/unknown/unknown_60F83C.png and /dev/null differ diff --git a/graphics/unknown/unknown_60F93C.png b/graphics/unknown/unknown_60F93C.png deleted file mode 100644 index 2a44e9455..000000000 Binary files a/graphics/unknown/unknown_60F93C.png and /dev/null differ diff --git a/graphics/unknown/unknown_60FA3C.png b/graphics/unknown/unknown_60FA3C.png deleted file mode 100644 index c4ae096d0..000000000 Binary files a/graphics/unknown/unknown_60FA3C.png and /dev/null differ diff --git a/graphics/unknown/unknown_61033C.png b/graphics/unknown/unknown_61033C.png deleted file mode 100644 index ec874f98c..000000000 Binary files a/graphics/unknown/unknown_61033C.png and /dev/null differ diff --git a/graphics/unknown/unknown_61039C.pal b/graphics/unknown/unknown_61039C.pal deleted file mode 100644 index 89f527ce4..000000000 --- a/graphics/unknown/unknown_61039C.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -0 0 0 -213 255 238 -213 255 238 -213 255 238 -213 255 238 -213 255 238 -213 255 238 -213 255 238 -213 255 238 -213 255 238 -213 255 238 -213 255 238 -213 255 238 -213 255 238 -213 255 238 -213 255 238 diff --git a/include/battle_controllers.h b/include/battle_controllers.h index 32918fefb..5b1ada11a 100644 --- a/include/battle_controllers.h +++ b/include/battle_controllers.h @@ -85,8 +85,8 @@ enum struct UnusedControllerStruct { - u8 field_0:7; - u8 flag_x80:1; + u8 unk:7; + u8 flag:1; }; struct HpAndStatus @@ -145,19 +145,19 @@ enum CONTROLLER_STATUSXOR, CONTROLLER_DATATRANSFER, CONTROLLER_DMA3TRANSFER, - CONTROLLER_31, + CONTROLLER_PLAYBGM, CONTROLLER_32, CONTROLLER_TWORETURNVALUES, CONTROLLER_CHOSENMONRETURNVALUE, CONTROLLER_ONERETURNVALUE, CONTROLLER_ONERETURNVALUE_DUPLICATE, - CONTROLLER_37, - CONTROLLER_38, - CONTROLLER_39, - CONTROLLER_40, + CONTROLLER_CLEARUNKVAR, + CONTROLLER_SETUNKVAR, + CONTROLLER_CLEARUNKFLAG, + CONTROLLER_TOGGLEUNKFLAG, CONTROLLER_HITANIMATION, CONTROLLER_42, - CONTROLLER_EFFECTIVENESSSOUND, + CONTROLLER_PLAYSE, CONTROLLER_PLAYFANFAREORBGM, CONTROLLER_FAINTINGCRY, CONTROLLER_INTROSLIDE, @@ -175,7 +175,7 @@ enum CONTROLLER_CMDS_COUNT }; -extern struct UnusedControllerStruct gUnknown_02022D0C; +extern struct UnusedControllerStruct gUnusedControllerStruct; // general functions void HandleLinkBattleSetup(void); @@ -222,10 +222,10 @@ void BtlController_EmitTwoReturnValues(u8 bufferId, u8 arg1, u16 arg2); void BtlController_EmitChosenMonReturnValue(u8 bufferId, u8 b, u8 *c); void BtlController_EmitOneReturnValue(u8 bufferId, u16 arg1); void BtlController_EmitOneReturnValue_Duplicate(u8 bufferId, u16 b); -void BtlController_EmitCmd37(u8 bufferId); // unused -void BtlController_EmitCmd38(u8 bufferId, u8 b); // unused -void BtlController_EmitCmd39(u8 bufferId); // unused -void BtlController_EmitCmd40(u8 bufferId); // unused +void BtlController_EmitClearUnkVar(u8 bufferId); // unused +void BtlController_EmitSetUnkVar(u8 bufferId, u8 b); // unused +void BtlController_EmitClearUnkFlag(u8 bufferId); // unused +void BtlController_EmitToggleUnkFlag(u8 bufferId); // unused void BtlController_EmitHitAnimation(u8 bufferId); void BtlController_EmitCmd42(u8 bufferId); void BtlController_EmitPlaySE(u8 bufferId, u16 songId); diff --git a/include/constants/battle.h b/include/constants/battle.h index fa8f422c4..e6ebc85e4 100644 --- a/include/constants/battle.h +++ b/include/constants/battle.h @@ -44,38 +44,38 @@ #define BIT_FLANK 2 // Battle Type Flags -#define BATTLE_TYPE_DOUBLE (1 << 0) -#define BATTLE_TYPE_LINK (1 << 1) -#define BATTLE_TYPE_IS_MASTER (1 << 2) // In not-link battles, it's always set. -#define BATTLE_TYPE_TRAINER (1 << 3) -#define BATTLE_TYPE_FIRST_BATTLE (1 << 4) -#define BATTLE_TYPE_20 (1 << 5) -#define BATTLE_TYPE_MULTI (1 << 6) -#define BATTLE_TYPE_SAFARI (1 << 7) -#define BATTLE_TYPE_BATTLE_TOWER (1 << 8) -#define BATTLE_TYPE_WALLY_TUTORIAL (1 << 9) -#define BATTLE_TYPE_ROAMER (1 << 10) -#define BATTLE_TYPE_EREADER_TRAINER (1 << 11) -#define BATTLE_TYPE_KYOGRE_GROUDON (1 << 12) -#define BATTLE_TYPE_LEGENDARY (1 << 13) -#define BATTLE_TYPE_REGI (1 << 14) -#define BATTLE_TYPE_TWO_OPPONENTS (1 << 15) -#define BATTLE_TYPE_DOME (1 << 16) -#define BATTLE_TYPE_PALACE (1 << 17) -#define BATTLE_TYPE_ARENA (1 << 18) -#define BATTLE_TYPE_FACTORY (1 << 19) -#define BATTLE_TYPE_PIKE (1 << 20) -#define BATTLE_TYPE_PYRAMID (1 << 21) -#define BATTLE_TYPE_INGAME_PARTNER (1 << 22) -#define BATTLE_TYPE_x800000 (1 << 23) -#define BATTLE_TYPE_RECORDED (1 << 24) -#define BATTLE_TYPE_x2000000 (1 << 25) -#define BATTLE_TYPE_TRAINER_HILL (1 << 26) -#define BATTLE_TYPE_SECRET_BASE (1 << 27) -#define BATTLE_TYPE_GROUDON (1 << 28) -#define BATTLE_TYPE_KYOGRE (1 << 29) -#define BATTLE_TYPE_RAYQUAZA (1 << 30) -#define BATTLE_TYPE_x80000000 (1 << 31) +#define BATTLE_TYPE_DOUBLE (1 << 0) +#define BATTLE_TYPE_LINK (1 << 1) +#define BATTLE_TYPE_IS_MASTER (1 << 2) // In not-link battles, it's always set. +#define BATTLE_TYPE_TRAINER (1 << 3) +#define BATTLE_TYPE_FIRST_BATTLE (1 << 4) +#define BATTLE_TYPE_LINK_IN_BATTLE (1 << 5) // Set on battle entry, cleared on exit. Checked rarely +#define BATTLE_TYPE_MULTI (1 << 6) +#define BATTLE_TYPE_SAFARI (1 << 7) +#define BATTLE_TYPE_BATTLE_TOWER (1 << 8) +#define BATTLE_TYPE_WALLY_TUTORIAL (1 << 9) +#define BATTLE_TYPE_ROAMER (1 << 10) +#define BATTLE_TYPE_EREADER_TRAINER (1 << 11) +#define BATTLE_TYPE_KYOGRE_GROUDON (1 << 12) +#define BATTLE_TYPE_LEGENDARY (1 << 13) +#define BATTLE_TYPE_REGI (1 << 14) +#define BATTLE_TYPE_TWO_OPPONENTS (1 << 15) +#define BATTLE_TYPE_DOME (1 << 16) +#define BATTLE_TYPE_PALACE (1 << 17) +#define BATTLE_TYPE_ARENA (1 << 18) +#define BATTLE_TYPE_FACTORY (1 << 19) +#define BATTLE_TYPE_PIKE (1 << 20) +#define BATTLE_TYPE_PYRAMID (1 << 21) +#define BATTLE_TYPE_INGAME_PARTNER (1 << 22) +#define BATTLE_TYPE_TOWER_LINK_MULTI (1 << 23) +#define BATTLE_TYPE_RECORDED (1 << 24) +#define BATTLE_TYPE_RECORDED_LINK (1 << 25) +#define BATTLE_TYPE_TRAINER_HILL (1 << 26) +#define BATTLE_TYPE_SECRET_BASE (1 << 27) +#define BATTLE_TYPE_GROUDON (1 << 28) +#define BATTLE_TYPE_KYOGRE (1 << 29) +#define BATTLE_TYPE_RAYQUAZA (1 << 30) +#define BATTLE_TYPE_RECORDED_IS_MASTER (1 << 31) #define BATTLE_TYPE_FRONTIER (BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_DOME | BATTLE_TYPE_PALACE | BATTLE_TYPE_ARENA | BATTLE_TYPE_FACTORY | BATTLE_TYPE_PIKE | BATTLE_TYPE_PYRAMID) #define BATTLE_TYPE_FRONTIER_NO_PYRAMID (BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_DOME | BATTLE_TYPE_PALACE | BATTLE_TYPE_ARENA | BATTLE_TYPE_FACTORY | BATTLE_TYPE_PIKE) diff --git a/include/constants/battle_anim.h b/include/constants/battle_anim.h index ebc422b18..5f8900bf6 100644 --- a/include/constants/battle_anim.h +++ b/include/constants/battle_anim.h @@ -346,51 +346,51 @@ #define BG_SOLARBEAM_PLAYER 25 #define BG_SOLARBEAM_CONTESTS 26 -// table ids for general animations -#define B_ANIM_CASTFORM_CHANGE 0x0 -#define B_ANIM_STATS_CHANGE 0x1 -#define B_ANIM_SUBSTITUTE_FADE 0x2 -#define B_ANIM_SUBSTITUTE_APPEAR 0x3 -#define B_ANIM_POKEBLOCK_THROW 0x4 -#define B_ANIM_ITEM_KNOCKOFF 0x5 -#define B_ANIM_TURN_TRAP 0x6 -#define B_ANIM_HELD_ITEM_EFFECT 0x7 -#define B_ANIM_SMOKEBALL_ESCAPE 0x8 -#define B_ANIM_FOCUS_BAND 0x9 -#define B_ANIM_RAIN_CONTINUES 0xA -#define B_ANIM_SUN_CONTINUES 0xB -#define B_ANIM_SANDSTORM_CONTINUES 0xC -#define B_ANIM_HAIL_CONTINUES 0xD -#define B_ANIM_LEECH_SEED_DRAIN 0xE -#define B_ANIM_MON_HIT 0xF -#define B_ANIM_ITEM_STEAL 0x10 -#define B_ANIM_SNATCH_MOVE 0x11 -#define B_ANIM_FUTURE_SIGHT_HIT 0x12 -#define B_ANIM_DOOM_DESIRE_HIT 0x13 -#define B_ANIM_FOCUS_PUNCH_SETUP 0x14 -#define B_ANIM_INGRAIN_HEAL 0x15 -#define B_ANIM_WISH_HEAL 0x16 +// table ids for general animations (gBattleAnims_General) +#define B_ANIM_CASTFORM_CHANGE 0 +#define B_ANIM_STATS_CHANGE 1 +#define B_ANIM_SUBSTITUTE_FADE 2 +#define B_ANIM_SUBSTITUTE_APPEAR 3 +#define B_ANIM_POKEBLOCK_THROW 4 +#define B_ANIM_ITEM_KNOCKOFF 5 +#define B_ANIM_TURN_TRAP 6 +#define B_ANIM_HELD_ITEM_EFFECT 7 +#define B_ANIM_SMOKEBALL_ESCAPE 8 +#define B_ANIM_FOCUS_BAND 9 +#define B_ANIM_RAIN_CONTINUES 10 +#define B_ANIM_SUN_CONTINUES 11 +#define B_ANIM_SANDSTORM_CONTINUES 12 +#define B_ANIM_HAIL_CONTINUES 13 +#define B_ANIM_LEECH_SEED_DRAIN 14 +#define B_ANIM_MON_HIT 15 +#define B_ANIM_ITEM_STEAL 16 +#define B_ANIM_SNATCH_MOVE 17 +#define B_ANIM_FUTURE_SIGHT_HIT 18 +#define B_ANIM_DOOM_DESIRE_HIT 19 +#define B_ANIM_FOCUS_PUNCH_SETUP 20 +#define B_ANIM_INGRAIN_HEAL 21 +#define B_ANIM_WISH_HEAL 22 -// special animations table -#define B_ANIM_LVL_UP 0x0 -#define B_ANIM_SWITCH_OUT_PLAYER_MON 0x1 -#define B_ANIM_SWITCH_OUT_OPPONENT_MON 0x2 -#define B_ANIM_BALL_THROW 0x3 -#define B_ANIM_BALL_THROW_WITH_TRAINER 0x4 -#define B_ANIM_SUBSTITUTE_TO_MON 0x5 -#define B_ANIM_MON_TO_SUBSTITUTE 0x6 +// special animations table (gBattleAnims_Special) +#define B_ANIM_LVL_UP 0 +#define B_ANIM_SWITCH_OUT_PLAYER_MON 1 +#define B_ANIM_SWITCH_OUT_OPPONENT_MON 2 +#define B_ANIM_BALL_THROW 3 +#define B_ANIM_BALL_THROW_WITH_TRAINER 4 +#define B_ANIM_SUBSTITUTE_TO_MON 5 +#define B_ANIM_MON_TO_SUBSTITUTE 6 -// status animation table -#define B_ANIM_STATUS_PSN 0x0 -#define B_ANIM_STATUS_CONFUSION 0x1 -#define B_ANIM_STATUS_BRN 0x2 -#define B_ANIM_STATUS_INFATUATION 0x3 -#define B_ANIM_STATUS_SLP 0x4 -#define B_ANIM_STATUS_PRZ 0x5 -#define B_ANIM_STATUS_FRZ 0x6 -#define B_ANIM_STATUS_CURSED 0x7 -#define B_ANIM_STATUS_NIGHTMARE 0x8 -#define B_ANIM_STATUS_WRAPPED 0x9 // does not actually exist +// status animation table (gBattleAnims_StatusConditions) +#define B_ANIM_STATUS_PSN 0 +#define B_ANIM_STATUS_CONFUSION 1 +#define B_ANIM_STATUS_BRN 2 +#define B_ANIM_STATUS_INFATUATION 3 +#define B_ANIM_STATUS_SLP 4 +#define B_ANIM_STATUS_PRZ 5 +#define B_ANIM_STATUS_FRZ 6 +#define B_ANIM_STATUS_CURSED 7 +#define B_ANIM_STATUS_NIGHTMARE 8 +#define B_ANIM_STATUS_WRAPPED 9 // does not actually exist // Tasks with return values often assign them to gBattleAnimArgs[7]. #define ARG_RET_ID 7 diff --git a/include/constants/battle_move_effects.h b/include/constants/battle_move_effects.h index b54f01353..cc62208fa 100644 --- a/include/constants/battle_move_effects.h +++ b/include/constants/battle_move_effects.h @@ -216,4 +216,6 @@ #define EFFECT_DRAGON_DANCE 212 #define EFFECT_CAMOUFLAGE 213 +#define NUM_BATTLE_MOVE_EFFECTS 214 + #endif // GUARD_CONSTANTS_BATTLE_MOVE_EFFECTS_H diff --git a/include/constants/battle_string_ids.h b/include/constants/battle_string_ids.h index 9e0d8e0be..1886043f1 100644 --- a/include/constants/battle_string_ids.h +++ b/include/constants/battle_string_ids.h @@ -124,7 +124,7 @@ #define STRINGID_PKMNSTORINGENERGY 120 #define STRINGID_PKMNUNLEASHEDENERGY 121 #define STRINGID_PKMNFATIGUECONFUSION 122 -#define STRINGID_PKMNPICKEDUPITEM 123 +#define STRINGID_PLAYERPICKEDUPMONEY 123 #define STRINGID_PKMNUNAFFECTED 124 #define STRINGID_PKMNTRANSFORMEDINTO 125 #define STRINGID_PKMNMADESUBSTITUTE 126 diff --git a/include/constants/items.h b/include/constants/items.h index 95c6aacfe..71338da8e 100644 --- a/include/constants/items.h +++ b/include/constants/items.h @@ -17,7 +17,11 @@ #define ITEM_LUXURY_BALL 11 #define ITEM_PREMIER_BALL 12 -#define LAST_BALL ITEM_PREMIER_BALL +// Note: If moving ball IDs around, updating FIRST_BALL/LAST_BALL is not sufficient +// Several places expect the ball IDs to be first and contiguous (e.g. gBattlescriptsForBallThrow and MON_DATA_POKEBALL) +// If adding new balls, it's easiest to insert them after the last ball and increment the below IDs (and removing ITEM_034 for example) +#define FIRST_BALL ITEM_MASTER_BALL +#define LAST_BALL ITEM_PREMIER_BALL // Pokemon Items #define ITEM_POTION 13 @@ -145,6 +149,8 @@ #define ITEM_FAB_MAIL 131 #define ITEM_RETRO_MAIL 132 +#define FIRST_MAIL_INDEX ITEM_ORANGE_MAIL + // Berries #define ITEM_CHERI_BERRY 133 #define ITEM_CHESTO_BERRY 134 @@ -189,6 +195,10 @@ #define ITEM_LANSAT_BERRY 173 #define ITEM_STARF_BERRY 174 #define ITEM_ENIGMA_BERRY 175 + +#define FIRST_BERRY_INDEX ITEM_CHERI_BERRY +#define LAST_BERRY_INDEX ITEM_ENIGMA_BERRY + #define ITEM_0B0 176 #define ITEM_0B1 177 #define ITEM_0B2 178 @@ -467,9 +477,6 @@ #define ITEMS_COUNT 377 #define ITEM_FIELD_ARROW ITEMS_COUNT -#define FIRST_BERRY_INDEX ITEM_CHERI_BERRY -#define LAST_BERRY_INDEX ITEM_ENIGMA_BERRY - // Range of berries given out by various NPCS #define FIRST_BERRY_MASTER_BERRY ITEM_POMEG_BERRY #define LAST_BERRY_MASTER_BERRY ITEM_NOMEL_BERRY @@ -506,6 +513,21 @@ #define GOOD_ROD 1 #define SUPER_ROD 2 +// Secondary IDs for bikes +#define MACH_BIKE 0 +#define ACRO_BIKE 1 + +// Item type IDs (used to determine the exit callback) +#define ITEM_USE_MAIL 0 +#define ITEM_USE_PARTY_MENU 1 +#define ITEM_USE_FIELD 2 +#define ITEM_USE_PBLOCK_CASE 3 +#define ITEM_USE_BAG_MENU 4 // No exit callback, stays in bag menu + +// Item battle usage IDs (only checked to see if nonzero) +#define ITEM_B_USE_MEDICINE 1 +#define ITEM_B_USE_OTHER 2 + // Check if the item is one that can be used on a Pokemon. #define ITEM_HAS_EFFECT(item) ((item) >= ITEM_POTION && (item) <= ITEM_0B2) diff --git a/include/constants/pokemon.h b/include/constants/pokemon.h index ebb30a0cf..3f41072ce 100644 --- a/include/constants/pokemon.h +++ b/include/constants/pokemon.h @@ -233,6 +233,9 @@ #define STATUS_PRIMARY_POKERUS 6 #define STATUS_PRIMARY_FAINTED 7 +#define MAX_PER_STAT_IVS 31 +#define MAX_IV_MASK 31 +#define USE_RANDOM_IVS (MAX_PER_STAT_IVS + 1) #define MAX_PER_STAT_EVS 255 #define MAX_TOTAL_EVS 510 #define EV_ITEM_RAISE_LIMIT 100 diff --git a/include/constants/rgb.h b/include/constants/rgb.h index 69f07763f..3e0bf6fe0 100644 --- a/include/constants/rgb.h +++ b/include/constants/rgb.h @@ -5,19 +5,22 @@ #define GET_G(color) (((color) >> 5) & 0x1F) #define GET_B(color) (((color) >> 10) & 0x1F) -#define RGB(r, g, b) ((r) | ((g) << 5) | ((b) << 10)) +#define RGB(r, g, b) ((r) | ((g) << 5) | ((b) << 10)) #define RGB2(r, g, b) (((b) << 10) | ((g) << 5) | (r)) #define _RGB(r, g, b) ((((b) & 0x1F) << 10) + (((g) & 0x1F) << 5) + ((r) & 0x1F)) -#define RGB_BLACK RGB(0, 0, 0) -#define RGB_WHITE RGB(31, 31, 31) -#define RGB_RED RGB(31, 0, 0) -#define RGB_GREEN RGB(0, 31, 0) -#define RGB_BLUE RGB(0, 0, 31) -#define RGB_PURPLE RGB(24, 0, 24) -#define RGB_YELLOW RGB(31, 31, 0) -#define RGB_MAGENTA RGB(31, 0, 31) -#define RGB_CYAN RGB(0, 31, 31) -#define RGB_WHITEALPHA (RGB_WHITE | 0x8000) +#define RGB_ALPHA (1 << 15) +#define IS_ALPHA(color) ((color) & RGB_ALPHA) + +#define RGB_BLACK RGB(0, 0, 0) +#define RGB_WHITE RGB(31, 31, 31) +#define RGB_RED RGB(31, 0, 0) +#define RGB_GREEN RGB(0, 31, 0) +#define RGB_BLUE RGB(0, 0, 31) +#define RGB_PURPLE RGB(24, 0, 24) +#define RGB_YELLOW RGB(31, 31, 0) +#define RGB_MAGENTA RGB(31, 0, 31) +#define RGB_CYAN RGB(0, 31, 31) +#define RGB_WHITEALPHA (RGB_WHITE | RGB_ALPHA) #endif // GUARD_RGB_H diff --git a/include/constants/species.h b/include/constants/species.h index f4151466b..5a410aa5b 100644 --- a/include/constants/species.h +++ b/include/constants/species.h @@ -440,7 +440,7 @@ #define SPECIES_BRONZOR 436 #define SPECIES_BRONZONG 437 #define SPECIES_BONSLY 438 -#define SPECIES_MIMEJR 439 +#define SPECIES_MIME_JR 439 #define SPECIES_HAPPINY 440 #define SPECIES_CHATOT 441 #define SPECIES_SPIRITOMB 442 @@ -1232,7 +1232,7 @@ // Oricorio #define SPECIES_ORICORIO_POM_POM FORMS_START + 244 -#define SPECIES_ORICORIO_PA_U FORMS_START + 245 +#define SPECIES_ORICORIO_PAU FORMS_START + 245 #define SPECIES_ORICORIO_SENSU FORMS_START + 246 // Rockruff @@ -1791,7 +1791,7 @@ #define NATIONAL_DEX_BRONZOR 436 #define NATIONAL_DEX_BRONZONG 437 #define NATIONAL_DEX_BONSLY 438 -#define NATIONAL_DEX_MIMEJR 439 +#define NATIONAL_DEX_MIME_JR 439 #define NATIONAL_DEX_HAPPINY 440 #define NATIONAL_DEX_CHATOT 441 #define NATIONAL_DEX_SPIRITOMB 442 diff --git a/include/event_object_movement.h b/include/event_object_movement.h index 9b4d9302f..cd76cac11 100644 --- a/include/event_object_movement.h +++ b/include/event_object_movement.h @@ -16,14 +16,22 @@ enum SpinnerRunnerFollowPatterns RUNFOLLOW_SOUTH_EAST_WEST }; +enum ReflectionTypes +{ + REFL_TYPE_NONE, + REFL_TYPE_ICE, + REFL_TYPE_WATER, + NUM_REFLECTION_TYPES +}; + #define FIGURE_8_LENGTH 72 #define GROUND_EFFECT_FLAG_TALL_GRASS_ON_SPAWN (1 << 0) #define GROUND_EFFECT_FLAG_TALL_GRASS_ON_MOVE (1 << 1) #define GROUND_EFFECT_FLAG_LONG_GRASS_ON_SPAWN (1 << 2) #define GROUND_EFFECT_FLAG_LONG_GRASS_ON_MOVE (1 << 3) -#define GROUND_EFFECT_FLAG_ICE_REFLECTION (1 << 4) -#define GROUND_EFFECT_FLAG_REFLECTION (1 << 5) +#define GROUND_EFFECT_FLAG_WATER_REFLECTION (1 << 4) +#define GROUND_EFFECT_FLAG_ICE_REFLECTION (1 << 5) #define GROUND_EFFECT_FLAG_SHALLOW_FLOWING_WATER (1 << 6) #define GROUND_EFFECT_FLAG_SAND (1 << 7) #define GROUND_EFFECT_FLAG_DEEP_SAND (1 << 8) @@ -414,10 +422,10 @@ u8 MovementType_RunInPlace_Step0(struct ObjectEvent *, struct Sprite *); u8 MovementType_Invisible_Step0(struct ObjectEvent *, struct Sprite *); u8 MovementType_Invisible_Step1(struct ObjectEvent *, struct Sprite *); u8 MovementType_Invisible_Step2(struct ObjectEvent *, struct Sprite *); -void SetObjectEventSpriteInvisibility(u8 var, bool32 var2); -bool32 IsObjectEventSpriteInvisible(u8 var); -void SetObjectEventSpriteGraphics(u8 var1, u8 graphicsId); -void SetObjectEventSpriteAnim(u8 var1, u8 var2); -bool32 IsObjectEventSpriteAnimating(u8 var); +void SetObjectEventSpriteInvisibility(u8 objectEventId, bool32 invisible); +bool32 IsObjectEventSpriteInvisible(u8 objectEventId); +void SetObjectEventSpriteGraphics(u8 objectEventId, u8 graphicsId); +void SetObjectEventSpriteAnim(u8 objectEventId, u8 animNum); +bool32 IsObjectEventSpriteAnimating(u8 objectEventId); #endif //GUARD_EVENT_OBJECT_MOVEMENT_H diff --git a/include/field_player_avatar.h b/include/field_player_avatar.h index 722fe4444..aa1a2e0dc 100644 --- a/include/field_player_avatar.h +++ b/include/field_player_avatar.h @@ -36,7 +36,7 @@ void sub_808BCE8(void); void InitPlayerAvatar(s16 a, s16 b, u8 c, u8 d); void sub_808B864(void); void sub_808BCF4(void); -void sub_808D074(u8); +void SetSpinStartFacingDir(u8); void GetXYCoordsOneStepInFrontOfPlayer(s16 *xPtr, s16 *yPtr); u8 GetRivalAvatarGraphicsIdByStateIdAndGender(u8, u8); void SetPlayerAvatarFieldMove(void); @@ -57,10 +57,10 @@ void PlayerWheelieMove(u8 direction); void PlayerPopWheelieWhileMoving(u8 direction); void PlayerUseAcroBikeOnBumpySlope(u8 direction); void PlayerEndWheelieWhileMoving(u8 direction); -void sub_808D194(void); -void sub_808D1C8(void); -bool32 sub_808D1B4(void); -bool32 sub_808D1E8(void); +void DoPlayerSpinEntrance(void); +void DoPlayerSpinExit(void); +bool32 IsPlayerSpinEntranceActive(void); +bool32 IsPlayerSpinExitActive(void); void SetPlayerInvisibility(bool8 invisible); u8 player_get_pos_including_state_based_drift(s16 *x, s16 *y); void StartFishing(u8 rod); diff --git a/include/field_screen_effect.h b/include/field_screen_effect.h index 951bf0788..4e4725041 100644 --- a/include/field_screen_effect.h +++ b/include/field_screen_effect.h @@ -18,8 +18,8 @@ void FieldCB_WarpExitFadeFromBlack(void); void FieldCB_WarpExitFadeFromWhite(void); bool8 FieldCB_ReturnToFieldOpenStartMenu(void); void ReturnToFieldOpenStartMenu(void); -void sub_80AF6D4(void); -void sub_80AF6F0(void); +void FieldCB_ReturnToFieldNoScript(void); +void FieldCB_ReturnToFieldNoScriptCheckMusic(void); void DoWarp(void); void DoDiveWarp(void); void DoSootopolisLegendWarp(void); @@ -35,8 +35,8 @@ void DoCableClubWarp(void); void DoContestHallWarp(void); void AnimateFlash(u8 flashLevel); void WriteBattlePyramidViewScanlineEffectBuffer(void); -void sub_80B0244(void); -void sub_80B0268(void); +void DoSpinEnterWarp(void); +void DoSpinExitWarp(void); void DoOrbEffect(void); void FadeOutOrbEffect(void); void sub_80B05B4(void); diff --git a/include/graphics.h b/include/graphics.h index 423e27deb..898199713 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -158,7 +158,7 @@ extern const u32 gMonFrontPic_Goldeen[]; extern const u32 gMonFrontPic_Seaking[]; extern const u32 gMonFrontPic_Staryu[]; extern const u32 gMonFrontPic_Starmie[]; -extern const u32 gMonFrontPic_Mrmime[]; +extern const u32 gMonFrontPic_MrMime[]; extern const u32 gMonFrontPic_Scyther[]; extern const u32 gMonFrontPic_Jynx[]; extern const u32 gMonFrontPic_Electabuzz[]; @@ -476,7 +476,7 @@ extern const u32 gMonFrontPic_Skuntank[]; extern const u32 gMonFrontPic_Bronzor[]; extern const u32 gMonFrontPic_Bronzong[]; extern const u32 gMonFrontPic_Bonsly[]; -extern const u32 gMonFrontPic_Mimejr[]; +extern const u32 gMonFrontPic_MimeJr[]; extern const u32 gMonFrontPic_Happiny[]; extern const u32 gMonFrontPic_Chatot[]; extern const u32 gMonFrontPic_Spiritomb[]; @@ -809,7 +809,7 @@ extern const u32 gMonFrontPic_Golisopod[]; extern const u32 gMonFrontPic_Sandygast[]; extern const u32 gMonFrontPic_Palossand[]; extern const u32 gMonFrontPic_Pyukumuku[]; -extern const u32 gMonFrontPic_Type_null[]; +extern const u32 gMonFrontPic_TypeNull[]; extern const u32 gMonFrontPic_Silvally[]; extern const u32 gMonFrontPic_Minior[]; extern const u32 gMonFrontPic_Komala[]; @@ -819,13 +819,13 @@ extern const u32 gMonFrontPic_Mimikyu[]; extern const u32 gMonFrontPic_Bruxish[]; extern const u32 gMonFrontPic_Drampa[]; extern const u32 gMonFrontPic_Dhelmise[]; -extern const u32 gMonFrontPic_Jangmo_o[]; -extern const u32 gMonFrontPic_Hakamo_o[]; -extern const u32 gMonFrontPic_Kommo_o[]; -extern const u32 gMonFrontPic_Tapu_koko[]; -extern const u32 gMonFrontPic_Tapu_lele[]; -extern const u32 gMonFrontPic_Tapu_bulu[]; -extern const u32 gMonFrontPic_Tapu_fini[]; +extern const u32 gMonFrontPic_Jangmoo[]; +extern const u32 gMonFrontPic_Hakamoo[]; +extern const u32 gMonFrontPic_Kommoo[]; +extern const u32 gMonFrontPic_TapuKoko[]; +extern const u32 gMonFrontPic_TapuLele[]; +extern const u32 gMonFrontPic_TapuBulu[]; +extern const u32 gMonFrontPic_TapuFini[]; extern const u32 gMonFrontPic_Cosmog[]; extern const u32 gMonFrontPic_Cosmoem[]; extern const u32 gMonFrontPic_Solgaleo[]; @@ -1298,7 +1298,7 @@ extern const u32 gMonBackPic_Goldeen[]; extern const u32 gMonBackPic_Seaking[]; extern const u32 gMonBackPic_Staryu[]; extern const u32 gMonBackPic_Starmie[]; -extern const u32 gMonBackPic_Mrmime[]; +extern const u32 gMonBackPic_MrMime[]; extern const u32 gMonBackPic_Scyther[]; extern const u32 gMonBackPic_Jynx[]; extern const u32 gMonBackPic_Electabuzz[]; @@ -1616,7 +1616,7 @@ extern const u32 gMonBackPic_Skuntank[]; extern const u32 gMonBackPic_Bronzor[]; extern const u32 gMonBackPic_Bronzong[]; extern const u32 gMonBackPic_Bonsly[]; -extern const u32 gMonBackPic_Mimejr[]; +extern const u32 gMonBackPic_MimeJr[]; extern const u32 gMonBackPic_Happiny[]; extern const u32 gMonBackPic_Chatot[]; extern const u32 gMonBackPic_Spiritomb[]; @@ -1949,7 +1949,7 @@ extern const u32 gMonBackPic_Golisopod[]; extern const u32 gMonBackPic_Sandygast[]; extern const u32 gMonBackPic_Palossand[]; extern const u32 gMonBackPic_Pyukumuku[]; -extern const u32 gMonBackPic_Type_null[]; +extern const u32 gMonBackPic_TypeNull[]; extern const u32 gMonBackPic_Silvally[]; extern const u32 gMonBackPic_Minior[]; extern const u32 gMonBackPic_Komala[]; @@ -1959,13 +1959,13 @@ extern const u32 gMonBackPic_Mimikyu[]; extern const u32 gMonBackPic_Bruxish[]; extern const u32 gMonBackPic_Drampa[]; extern const u32 gMonBackPic_Dhelmise[]; -extern const u32 gMonBackPic_Jangmo_o[]; -extern const u32 gMonBackPic_Hakamo_o[]; -extern const u32 gMonBackPic_Kommo_o[]; -extern const u32 gMonBackPic_Tapu_koko[]; -extern const u32 gMonBackPic_Tapu_lele[]; -extern const u32 gMonBackPic_Tapu_bulu[]; -extern const u32 gMonBackPic_Tapu_fini[]; +extern const u32 gMonBackPic_Jangmoo[]; +extern const u32 gMonBackPic_Hakamoo[]; +extern const u32 gMonBackPic_Kommoo[]; +extern const u32 gMonBackPic_TapuKoko[]; +extern const u32 gMonBackPic_TapuLele[]; +extern const u32 gMonBackPic_TapuBulu[]; +extern const u32 gMonBackPic_TapuFini[]; extern const u32 gMonBackPic_Cosmog[]; extern const u32 gMonBackPic_Cosmoem[]; extern const u32 gMonBackPic_Solgaleo[]; @@ -2437,7 +2437,7 @@ extern const u32 gMonPalette_Goldeen[]; extern const u32 gMonPalette_Seaking[]; extern const u32 gMonPalette_Staryu[]; extern const u32 gMonPalette_Starmie[]; -extern const u32 gMonPalette_Mrmime[]; +extern const u32 gMonPalette_MrMime[]; extern const u32 gMonPalette_Scyther[]; extern const u32 gMonPalette_Jynx[]; extern const u32 gMonPalette_Electabuzz[]; @@ -2754,7 +2754,7 @@ extern const u32 gMonPalette_Skuntank[]; extern const u32 gMonPalette_Bronzor[]; extern const u32 gMonPalette_Bronzong[]; extern const u32 gMonPalette_Bonsly[]; -extern const u32 gMonPalette_Mimejr[]; +extern const u32 gMonPalette_MimeJr[]; extern const u32 gMonPalette_Happiny[]; extern const u32 gMonPalette_Chatot[]; extern const u32 gMonPalette_Spiritomb[]; @@ -3087,7 +3087,7 @@ extern const u32 gMonPalette_Golisopod[]; extern const u32 gMonPalette_Sandygast[]; extern const u32 gMonPalette_Palossand[]; extern const u32 gMonPalette_Pyukumuku[]; -extern const u32 gMonPalette_Type_null[]; +extern const u32 gMonPalette_TypeNull[]; extern const u32 gMonPalette_Silvally[]; extern const u32 gMonPalette_Minior[]; extern const u32 gMonPalette_Komala[]; @@ -3097,13 +3097,13 @@ extern const u32 gMonPalette_Mimikyu[]; extern const u32 gMonPalette_Bruxish[]; extern const u32 gMonPalette_Drampa[]; extern const u32 gMonPalette_Dhelmise[]; -extern const u32 gMonPalette_Jangmo_o[]; -extern const u32 gMonPalette_Hakamo_o[]; -extern const u32 gMonPalette_Kommo_o[]; -extern const u32 gMonPalette_Tapu_koko[]; -extern const u32 gMonPalette_Tapu_lele[]; -extern const u32 gMonPalette_Tapu_bulu[]; -extern const u32 gMonPalette_Tapu_fini[]; +extern const u32 gMonPalette_Jangmoo[]; +extern const u32 gMonPalette_Hakamoo[]; +extern const u32 gMonPalette_Kommoo[]; +extern const u32 gMonPalette_TapuKoko[]; +extern const u32 gMonPalette_TapuLele[]; +extern const u32 gMonPalette_TapuBulu[]; +extern const u32 gMonPalette_TapuFini[]; extern const u32 gMonPalette_Cosmog[]; extern const u32 gMonPalette_Cosmoem[]; extern const u32 gMonPalette_Solgaleo[]; @@ -3602,7 +3602,7 @@ extern const u32 gMonShinyPalette_Goldeen[]; extern const u32 gMonShinyPalette_Seaking[]; extern const u32 gMonShinyPalette_Staryu[]; extern const u32 gMonShinyPalette_Starmie[]; -extern const u32 gMonShinyPalette_Mrmime[]; +extern const u32 gMonShinyPalette_MrMime[]; extern const u32 gMonShinyPalette_Scyther[]; extern const u32 gMonShinyPalette_Jynx[]; extern const u32 gMonShinyPalette_Electabuzz[]; @@ -3919,7 +3919,7 @@ extern const u32 gMonShinyPalette_Skuntank[]; extern const u32 gMonShinyPalette_Bronzor[]; extern const u32 gMonShinyPalette_Bronzong[]; extern const u32 gMonShinyPalette_Bonsly[]; -extern const u32 gMonShinyPalette_Mimejr[]; +extern const u32 gMonShinyPalette_MimeJr[]; extern const u32 gMonShinyPalette_Happiny[]; extern const u32 gMonShinyPalette_Chatot[]; extern const u32 gMonShinyPalette_Spiritomb[]; @@ -4252,7 +4252,7 @@ extern const u32 gMonShinyPalette_Golisopod[]; extern const u32 gMonShinyPalette_Sandygast[]; extern const u32 gMonShinyPalette_Palossand[]; extern const u32 gMonShinyPalette_Pyukumuku[]; -extern const u32 gMonShinyPalette_Type_null[]; +extern const u32 gMonShinyPalette_TypeNull[]; extern const u32 gMonShinyPalette_Silvally[]; extern const u32 gMonShinyPalette_Minior[]; extern const u32 gMonShinyPalette_Komala[]; @@ -4262,13 +4262,13 @@ extern const u32 gMonShinyPalette_Mimikyu[]; extern const u32 gMonShinyPalette_Bruxish[]; extern const u32 gMonShinyPalette_Drampa[]; extern const u32 gMonShinyPalette_Dhelmise[]; -extern const u32 gMonShinyPalette_Jangmo_o[]; -extern const u32 gMonShinyPalette_Hakamo_o[]; -extern const u32 gMonShinyPalette_Kommo_o[]; -extern const u32 gMonShinyPalette_Tapu_koko[]; -extern const u32 gMonShinyPalette_Tapu_lele[]; -extern const u32 gMonShinyPalette_Tapu_bulu[]; -extern const u32 gMonShinyPalette_Tapu_fini[]; +extern const u32 gMonShinyPalette_Jangmoo[]; +extern const u32 gMonShinyPalette_Hakamoo[]; +extern const u32 gMonShinyPalette_Kommoo[]; +extern const u32 gMonShinyPalette_TapuKoko[]; +extern const u32 gMonShinyPalette_TapuLele[]; +extern const u32 gMonShinyPalette_TapuBulu[]; +extern const u32 gMonShinyPalette_TapuFini[]; extern const u32 gMonShinyPalette_Cosmog[]; extern const u32 gMonShinyPalette_Cosmoem[]; extern const u32 gMonShinyPalette_Solgaleo[]; @@ -4759,7 +4759,7 @@ extern const u8 gMonIcon_Goldeen[]; extern const u8 gMonIcon_Seaking[]; extern const u8 gMonIcon_Staryu[]; extern const u8 gMonIcon_Starmie[]; -extern const u8 gMonIcon_Mrmime[]; +extern const u8 gMonIcon_MrMime[]; extern const u8 gMonIcon_Scyther[]; extern const u8 gMonIcon_Jynx[]; extern const u8 gMonIcon_Electabuzz[]; @@ -5076,7 +5076,7 @@ extern const u8 gMonIcon_Skuntank[]; extern const u8 gMonIcon_Bronzor[]; extern const u8 gMonIcon_Bronzong[]; extern const u8 gMonIcon_Bonsly[]; -extern const u8 gMonIcon_Mimejr[]; +extern const u8 gMonIcon_MimeJr[]; extern const u8 gMonIcon_Happiny[]; extern const u8 gMonIcon_Chatot[]; extern const u8 gMonIcon_Spiritomb[]; @@ -5409,7 +5409,7 @@ extern const u8 gMonIcon_Golisopod[]; extern const u8 gMonIcon_Sandygast[]; extern const u8 gMonIcon_Palossand[]; extern const u8 gMonIcon_Pyukumuku[]; -extern const u8 gMonIcon_Type_null[]; +extern const u8 gMonIcon_TypeNull[]; extern const u8 gMonIcon_Silvally[]; extern const u8 gMonIcon_Minior[]; extern const u8 gMonIcon_Komala[]; @@ -5419,13 +5419,13 @@ extern const u8 gMonIcon_Mimikyu[]; extern const u8 gMonIcon_Bruxish[]; extern const u8 gMonIcon_Drampa[]; extern const u8 gMonIcon_Dhelmise[]; -extern const u8 gMonIcon_Jangmo_o[]; -extern const u8 gMonIcon_Hakamo_o[]; -extern const u8 gMonIcon_Kommo_o[]; -extern const u8 gMonIcon_Tapu_koko[]; -extern const u8 gMonIcon_Tapu_lele[]; -extern const u8 gMonIcon_Tapu_bulu[]; -extern const u8 gMonIcon_Tapu_fini[]; +extern const u8 gMonIcon_Jangmoo[]; +extern const u8 gMonIcon_Hakamoo[]; +extern const u8 gMonIcon_Kommoo[]; +extern const u8 gMonIcon_TapuKoko[]; +extern const u8 gMonIcon_TapuLele[]; +extern const u8 gMonIcon_TapuBulu[]; +extern const u8 gMonIcon_TapuFini[]; extern const u8 gMonIcon_Cosmog[]; extern const u8 gMonIcon_Cosmoem[]; extern const u8 gMonIcon_Solgaleo[]; @@ -5781,7 +5781,7 @@ extern const u8 gMonFootprint_Goldeen[]; extern const u8 gMonFootprint_Seaking[]; extern const u8 gMonFootprint_Staryu[]; extern const u8 gMonFootprint_Starmie[]; -extern const u8 gMonFootprint_Mrmime[]; +extern const u8 gMonFootprint_MrMime[]; extern const u8 gMonFootprint_Scyther[]; extern const u8 gMonFootprint_Jynx[]; extern const u8 gMonFootprint_Electabuzz[]; @@ -7529,8 +7529,8 @@ extern const u32 gConfetti_Gfx[]; extern const u32 gConfetti_Pal[]; extern const u32 gUnknown_08C093F0[]; -extern const u32 gSubstituteDollTilemap[]; -extern const u32 gSubstituteDollGfx[]; +extern const u32 gSubstituteDollBackGfx[]; +extern const u32 gSubstituteDollFrontGfx[]; extern const u32 gSubstituteDollPal[]; extern const u32 gHealthboxSinglesPlayerGfx[]; extern const u32 gHealthboxSinglesOpponentGfx[]; @@ -8456,6 +8456,11 @@ extern const u16 gPokenavMessageBox_Pal[]; extern const u32 gPokenavOptions_Gfx[]; extern const u16 gPokenavOptions_Pal[]; +// Battle Factory Screen +extern const u8 gFrontierFactorySelectMenu_Gfx[]; +extern const u8 gFrontierFactorySelectMenu_Tilemap[]; +extern const u16 gFrontierFactorySelectMenu_Pal[]; + // Object event pals extern const u16 gObjectEventPal_Brendan[]; extern const u16 gObjectEventPal_May[]; diff --git a/include/pokemon.h b/include/pokemon.h index 5a322c642..71189d6c0 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -16,6 +16,7 @@ struct PokemonSubstruct0 u32 experience; u8 ppBonuses; u8 friendship; + u16 filler; }; struct PokemonSubstruct1 @@ -243,12 +244,23 @@ struct Evolution u16 targetSpecies; }; +<<<<<<< HEAD struct FormChange { u16 method; u16 targetSpecies; u16 param1; u16 param2; }; +======= +#define NUM_UNOWN_FORMS 28 + +#define GET_UNOWN_LETTER(personality) (( \ + (((personality) & 0x03000000) >> 18) \ + | (((personality) & 0x00030000) >> 12) \ + | (((personality) & 0x00000300) >> 6) \ + | (((personality) & 0x00000003) >> 0) \ +) % NUM_UNOWN_FORMS) +>>>>>>> b2a541a33b2a5116f6780f1830f2606a5dbc065e extern u8 gPlayerPartyCount; extern struct Pokemon gPlayerParty[PARTY_SIZE]; diff --git a/include/recorded_battle.h b/include/recorded_battle.h index 252b25502..55353a6d1 100644 --- a/include/recorded_battle.h +++ b/include/recorded_battle.h @@ -3,7 +3,7 @@ extern u32 gRecordedBattleRngSeed; extern u32 gBattlePalaceMoveSelectionRngValue; -extern u8 gUnknown_0203C7B4; +extern u8 gRecordedBattleMultiplayerId; void sub_8184DA4(u8 arg0); void sub_8184E58(void); diff --git a/include/strings.h b/include/strings.h index 7018f9e0d..294ab8aa6 100644 --- a/include/strings.h +++ b/include/strings.h @@ -2988,4 +2988,31 @@ extern const u8 gText_SavingDontTurnOff2[]; extern const u8 gText_BlenderMaxSpeedRecord[]; extern const u8 gText_234Players[]; +// Battle Factory Screen +extern const u8 gText_RentalPkmn2[]; +extern const u8 gText_SelectFirstPkmn[]; +extern const u8 gText_SelectSecondPkmn[]; +extern const u8 gText_SelectThirdPkmn[]; +extern const u8 gText_TheseThreePkmnOkay[]; +extern const u8 gText_CantSelectSamePkmn[]; +extern const u8 gText_Summary[]; +extern const u8 gText_Rechoose[]; +extern const u8 gText_Deselect[]; +extern const u8 gText_Rent[]; +extern const u8 gText_Others2[]; +extern const u8 gText_Yes2[]; +extern const u8 gText_Yes3[]; +extern const u8 gText_No2[]; +extern const u8 gText_No3[]; +extern const u8 gText_QuitSwapping[]; +extern const u8 gText_AcceptThisPkmn[]; +extern const u8 gText_SelectPkmnToAccept[]; +extern const u8 gText_SelectPkmnToSwap[]; +extern const u8 gText_PkmnSwap[]; +extern const u8 gText_Swap[]; +extern const u8 gText_Summary2[]; +extern const u8 gText_PkmnForSwap[]; +extern const u8 gText_SamePkmnInPartyAlready[]; +extern const u8 gText_Cancel3[]; + #endif // GUARD_STRINGS_H diff --git a/include/tv.h b/include/tv.h index 4dc14143c..482909499 100644 --- a/include/tv.h +++ b/include/tv.h @@ -8,7 +8,7 @@ extern u8 *const gTVStringVarPtrs[3]; void ClearTVShowData(void); void sub_80EE184(void); -void sub_80EE35C(u16 foeSpecies, u16 species, u8 moveIdx, const u16 *movePtr, u16 betterMove); +void TryPutBattleSeminarOnAir(u16 foeSpecies, u16 species, u8 moveIdx, const u16 *movePtr, u16 betterMove); void TryPutFrontierTVShowOnAir(u16 winStreak, u8 facility); void DoTVShow(void); void DoTVShowInSearchOfTrainers(void); diff --git a/sound/cry_tables.inc b/sound/cry_tables.inc index 8d6d5850c..2eb578d64 100644 --- a/sound/cry_tables.inc +++ b/sound/cry_tables.inc @@ -387,570 +387,570 @@ gCryTable:: @ 869DCF4 cry Cry_Rayquaza cry Cry_Jirachi cry Cry_Deoxys - cry_not Cry_Turtwig - cry_not Cry_Grotle - cry_not Cry_Torterra - cry_not Cry_Chimchar - cry_not Cry_Monferno - cry_not Cry_Infernape - cry_not Cry_Piplup - cry_not Cry_Prinplup - cry_not Cry_Empoleon - cry_not Cry_Starly - cry_not Cry_Staravia - cry_not Cry_Staraptor - cry_not Cry_Bidoof - cry_not Cry_Bibarel - cry_not Cry_Kricketot - cry_not Cry_Kricketune - cry_not Cry_Shinx - cry_not Cry_Luxio - cry_not Cry_Luxray - cry_not Cry_Budew - cry_not Cry_Roserade - cry_not Cry_Cranidos - cry_not Cry_Rampardos - cry_not Cry_Shieldon - cry_not Cry_Bastiodon - cry_not Cry_Burmy - cry_not Cry_Wormadam - cry_not Cry_Mothim - cry_not Cry_Combee - cry_not Cry_Vespiquen - cry_not Cry_Pachirisu - cry_not Cry_Buizel - cry_not Cry_Floatzel - cry_not Cry_Cherubi - cry_not Cry_Cherrim - cry_not Cry_Shellos - cry_not Cry_Gastrodon - cry_not Cry_Ambipom - cry_not Cry_Drifloon - cry_not Cry_Drifblim - cry_not Cry_Buneary - cry_not Cry_Lopunny - cry_not Cry_Mismagius - cry_not Cry_Honchkrow - cry_not Cry_Glameow - cry_not Cry_Purugly - cry_not Cry_Chingling - cry_not Cry_Stunky - cry_not Cry_Skuntank - cry_not Cry_Bronzor - cry_not Cry_Bronzong - cry_not Cry_Bonsly - cry_not Cry_Mimejr - cry_not Cry_Happiny - cry_not Cry_Chatot - cry_not Cry_Spiritomb - cry_not Cry_Gible - cry_not Cry_Gabite - cry_not Cry_Garchomp - cry_not Cry_Munchlax - cry_not Cry_Riolu - cry_not Cry_Lucario - cry_not Cry_Hippopotas - cry_not Cry_Hippowdon - cry_not Cry_Skorupi - cry_not Cry_Drapion - cry_not Cry_Croagunk - cry_not Cry_Toxicroak - cry_not Cry_Carnivine - cry_not Cry_Finneon - cry_not Cry_Lumineon - cry_not Cry_Mantyke - cry_not Cry_Snover - cry_not Cry_Abomasnow - cry_not Cry_Weavile - cry_not Cry_Magnezone - cry_not Cry_Lickilicky - cry_not Cry_Rhyperior - cry_not Cry_Tangrowth - cry_not Cry_Electivire - cry_not Cry_Magmortar - cry_not Cry_Togekiss - cry_not Cry_Yanmega - cry_not Cry_Leafeon - cry_not Cry_Glaceon - cry_not Cry_Gliscor - cry_not Cry_Mamoswine - cry_not Cry_PorygonZ - cry_not Cry_Gallade - cry_not Cry_Probopass - cry_not Cry_Dusknoir - cry_not Cry_Froslass - cry_not Cry_Rotom - cry_not Cry_Uxie - cry_not Cry_Mesprit - cry_not Cry_Azelf - cry_not Cry_Dialga - cry_not Cry_Palkia - cry_not Cry_Heatran - cry_not Cry_Regigigas - cry_not Cry_Giratina - cry_not Cry_Cresselia - cry_not Cry_Phione - cry_not Cry_Manaphy - cry_not Cry_Darkrai - cry_not Cry_Shaymin - cry_not Cry_Arceus - cry_not Cry_Victini - cry_not Cry_Snivy - cry_not Cry_Servine - cry_not Cry_Serperior - cry_not Cry_Tepig - cry_not Cry_Pignite - cry_not Cry_Emboar - cry_not Cry_Oshawott - cry_not Cry_Dewott - cry_not Cry_Samurott - cry_not Cry_Patrat - cry_not Cry_Watchog - cry_not Cry_Lillipup - cry_not Cry_Herdier - cry_not Cry_Stoutland - cry_not Cry_Purrloin - cry_not Cry_Liepard - cry_not Cry_Pansage - cry_not Cry_Simisage - cry_not Cry_Pansear - cry_not Cry_Simisear - cry_not Cry_Panpour - cry_not Cry_Simipour - cry_not Cry_Munna - cry_not Cry_Musharna - cry_not Cry_Pidove - cry_not Cry_Tranquill - cry_not Cry_Unfezant - cry_not Cry_Blitzle - cry_not Cry_Zebstrika - cry_not Cry_Roggenrola - cry_not Cry_Boldore - cry_not Cry_Gigalith - cry_not Cry_Woobat - cry_not Cry_Swoobat - cry_not Cry_Drilbur - cry_not Cry_Excadrill - cry_not Cry_Audino - cry_not Cry_Timburr - cry_not Cry_Gurdurr - cry_not Cry_Conkeldurr - cry_not Cry_Tympole - cry_not Cry_Palpitoad - cry_not Cry_Seismitoad - cry_not Cry_Throh - cry_not Cry_Sawk - cry_not Cry_Sewaddle - cry_not Cry_Swadloon - cry_not Cry_Leavanny - cry_not Cry_Venipede - cry_not Cry_Whirlipede - cry_not Cry_Scolipede - cry_not Cry_Cottonee - cry_not Cry_Whimsicott - cry_not Cry_Petilil - cry_not Cry_Lilligant - cry_not Cry_Basculin - cry_not Cry_Sandile - cry_not Cry_Krokorok - cry_not Cry_Krookodile - cry_not Cry_Darumaka - cry_not Cry_Darmanitan - cry_not Cry_Maractus - cry_not Cry_Dwebble - cry_not Cry_Crustle - cry_not Cry_Scraggy - cry_not Cry_Scrafty - cry_not Cry_Sigilyph - cry_not Cry_Yamask - cry_not Cry_Cofagrigus - cry_not Cry_Tirtouga - cry_not Cry_Carracosta - cry_not Cry_Archen - cry_not Cry_Archeops - cry_not Cry_Trubbish - cry_not Cry_Garbodor - cry_not Cry_Zorua - cry_not Cry_Zoroark - cry_not Cry_Minccino - cry_not Cry_Cinccino - cry_not Cry_Gothita - cry_not Cry_Gothorita - cry_not Cry_Gothitelle - cry_not Cry_Solosis - cry_not Cry_Duosion - cry_not Cry_Reuniclus - cry_not Cry_Ducklett - cry_not Cry_Swanna - cry_not Cry_Vanillite - cry_not Cry_Vanillish - cry_not Cry_Vanilluxe - cry_not Cry_Deerling - cry_not Cry_Sawsbuck - cry_not Cry_Emolga - cry_not Cry_Karrablast - cry_not Cry_Escavalier - cry_not Cry_Foongus - cry_not Cry_Amoonguss - cry_not Cry_Frillish - cry_not Cry_Jellicent - cry_not Cry_Alomomola - cry_not Cry_Joltik - cry_not Cry_Galvantula - cry_not Cry_Ferroseed - cry_not Cry_Ferrothorn - cry_not Cry_Klink - cry_not Cry_Klang - cry_not Cry_Klinklang - cry_not Cry_Tynamo - cry_not Cry_Eelektrik - cry_not Cry_Eelektross - cry_not Cry_Elgyem - cry_not Cry_Beheeyem - cry_not Cry_Litwick - cry_not Cry_Lampent - cry_not Cry_Chandelure - cry_not Cry_Axew - cry_not Cry_Fraxure - cry_not Cry_Haxorus - cry_not Cry_Cubchoo - cry_not Cry_Beartic - cry_not Cry_Cryogonal - cry_not Cry_Shelmet - cry_not Cry_Accelgor - cry_not Cry_Stunfisk - cry_not Cry_Mienfoo - cry_not Cry_Mienshao - cry_not Cry_Druddigon - cry_not Cry_Golett - cry_not Cry_Golurk - cry_not Cry_Pawniard - cry_not Cry_Bisharp - cry_not Cry_Bouffalant - cry_not Cry_Rufflet - cry_not Cry_Braviary - cry_not Cry_Vullaby - cry_not Cry_Mandibuzz - cry_not Cry_Heatmor - cry_not Cry_Durant - cry_not Cry_Deino - cry_not Cry_Zweilous - cry_not Cry_Hydreigon - cry_not Cry_Larvesta - cry_not Cry_Volcarona - cry_not Cry_Cobalion - cry_not Cry_Terrakion - cry_not Cry_Virizion - cry_not Cry_Tornadus - cry_not Cry_Thundurus - cry_not Cry_Reshiram - cry_not Cry_Zekrom - cry_not Cry_Landorus - cry_not Cry_Kyurem - cry_not Cry_Keldeo - cry_not Cry_Meloetta - cry_not Cry_Genesect - cry_not Cry_Chespin - cry_not Cry_Quilladin - cry_not Cry_Chesnaught - cry_not Cry_Fennekin - cry_not Cry_Braixen - cry_not Cry_Delphox - cry_not Cry_Froakie - cry_not Cry_Frogadier - cry_not Cry_Greninja - cry_not Cry_Bunnelby - cry_not Cry_Diggersby - cry_not Cry_Fletchling - cry_not Cry_Fletchinder - cry_not Cry_Talonflame - cry_not Cry_Scatterbug - cry_not Cry_Spewpa - cry_not Cry_Vivillon - cry_not Cry_Litleo - cry_not Cry_Pyroar - cry_not Cry_Flabebe - cry_not Cry_Floette - cry_not Cry_Florges - cry_not Cry_Skiddo - cry_not Cry_Gogoat - cry_not Cry_Pancham - cry_not Cry_Pangoro - cry_not Cry_Furfrou - cry_not Cry_Espurr - cry_not Cry_Meowstic - cry_not Cry_Honedge - cry_not Cry_Doublade - cry_not Cry_Aegislash - cry_not Cry_Spritzee - cry_not Cry_Aromatisse - cry_not Cry_Swirlix - cry_not Cry_Slurpuff - cry_not Cry_Inkay - cry_not Cry_Malamar - cry_not Cry_Binacle - cry_not Cry_Barbaracle - cry_not Cry_Skrelp - cry_not Cry_Dragalge - cry_not Cry_Clauncher - cry_not Cry_Clawitzer - cry_not Cry_Helioptile - cry_not Cry_Heliolisk - cry_not Cry_Tyrunt - cry_not Cry_Tyrantrum - cry_not Cry_Amaura - cry_not Cry_Aurorus - cry_not Cry_Sylveon - cry_not Cry_Hawlucha - cry_not Cry_Dedenne - cry_not Cry_Carbink - cry_not Cry_Goomy - cry_not Cry_Sliggoo - cry_not Cry_Goodra - cry_not Cry_Klefki - cry_not Cry_Phantump - cry_not Cry_Trevenant - cry_not Cry_Pumpkaboo - cry_not Cry_Gourgeist - cry_not Cry_Bergmite - cry_not Cry_Avalugg - cry_not Cry_Noibat - cry_not Cry_Noivern - cry_not Cry_Xerneas - cry_not Cry_Yveltal - cry_not Cry_Zygarde - cry_not Cry_Diancie - cry_not Cry_Hoopa - cry_not Cry_Volcanion - cry_not Cry_Rowlet - cry_not Cry_Dartrix - cry_not Cry_Decidueye - cry_not Cry_Litten - cry_not Cry_Torracat - cry_not Cry_Incineroar - cry_not Cry_Popplio - cry_not Cry_Brionne - cry_not Cry_Primarina - cry_not Cry_Pikipek - cry_not Cry_Trumbeak - cry_not Cry_Toucannon - cry_not Cry_Yungoos - cry_not Cry_Gumshoos - cry_not Cry_Grubbin - cry_not Cry_Charjabug - cry_not Cry_Vikavolt - cry_not Cry_Crabrawler - cry_not Cry_Crabominable - cry_not Cry_Oricorio - cry_not Cry_Cutiefly - cry_not Cry_Ribombee - cry_not Cry_Rockruff - cry_not Cry_Lycanroc - cry_not Cry_Wishiwashi - cry_not Cry_Mareanie - cry_not Cry_Toxapex - cry_not Cry_Mudbray - cry_not Cry_Mudsdale - cry_not Cry_Dewpider - cry_not Cry_Araquanid - cry_not Cry_Fomantis - cry_not Cry_Lurantis - cry_not Cry_Morelull - cry_not Cry_Shiinotic - cry_not Cry_Salandit - cry_not Cry_Salazzle - cry_not Cry_Stufful - cry_not Cry_Bewear - cry_not Cry_Bounsweet - cry_not Cry_Steenee - cry_not Cry_Tsareena - cry_not Cry_Comfey - cry_not Cry_Oranguru - cry_not Cry_Passimian - cry_not Cry_Wimpod - cry_not Cry_Golisopod - cry_not Cry_Sandygast - cry_not Cry_Palossand - cry_not Cry_Pyukumuku - cry_not Cry_Type_null - cry_not Cry_Silvally - cry_not Cry_Minior - cry_not Cry_Komala - cry_not Cry_Turtonator - cry_not Cry_Togedemaru - cry_not Cry_Mimikyu - cry_not Cry_Bruxish - cry_not Cry_Drampa - cry_not Cry_Dhelmise - cry_not Cry_Jangmo_o - cry_not Cry_Hakamo_o - cry_not Cry_Kommo_o - cry_not Cry_Tapu_koko - cry_not Cry_Tapu_lele - cry_not Cry_Tapu_bulu - cry_not Cry_Tapu_fini - cry_not Cry_Cosmog - cry_not Cry_Cosmoem - cry_not Cry_Solgaleo - cry_not Cry_Lunala - cry_not Cry_Nihilego - cry_not Cry_Buzzwole - cry_not Cry_Pheromosa - cry_not Cry_Xurkitree - cry_not Cry_Celesteela - cry_not Cry_Kartana - cry_not Cry_Guzzlord - cry_not Cry_Necrozma - cry_not Cry_Magearna - cry_not Cry_Marshadow - cry_not Cry_Poipole - cry_not Cry_Naganadel - cry_not Cry_Stakataka - cry_not Cry_Blacephalon - cry_not Cry_Zeraora - cry_not Cry_Meltan - cry_not Cry_Melmetal - cry_not Cry_Grookey - cry_not Cry_Thwackey - cry_not Cry_Rillaboom - cry_not Cry_Scorbunny - cry_not Cry_Raboot - cry_not Cry_Cinderace - cry_not Cry_Sobble - cry_not Cry_Drizzile - cry_not Cry_Inteleon - cry_not Cry_Skwovet - cry_not Cry_Greedent - cry_not Cry_Rookidee - cry_not Cry_Corvisquire - cry_not Cry_Corviknight - cry_not Cry_Blipbug - cry_not Cry_Dottler - cry_not Cry_Orbeetle - cry_not Cry_Nickit - cry_not Cry_Thievul - cry_not Cry_Gossifleur - cry_not Cry_Eldegoss - cry_not Cry_Wooloo - cry_not Cry_Dubwool - cry_not Cry_Chewtle - cry_not Cry_Drednaw - cry_not Cry_Yamper - cry_not Cry_Boltund - cry_not Cry_Rolycoly - cry_not Cry_Carkol - cry_not Cry_Coalossal - cry_not Cry_Applin - cry_not Cry_Flapple - cry_not Cry_Appletun - cry_not Cry_Silicobra - cry_not Cry_Sandaconda - cry_not Cry_Cramorant - cry_not Cry_Arrokuda - cry_not Cry_Barraskewda - cry_not Cry_Toxel - cry_not Cry_Toxtricity - cry_not Cry_Sizzlipede - cry_not Cry_Centiskorch - cry_not Cry_Clobbopus - cry_not Cry_Grapploct - cry_not Cry_Sinistea - cry_not Cry_Polteageist - cry_not Cry_Hatenna - cry_not Cry_Hattrem - cry_not Cry_Hatterene - cry_not Cry_Impidimp - cry_not Cry_Morgrem - cry_not Cry_Grimmsnarl - cry_not Cry_Obstagoon - cry_not Cry_Perrserker - cry_not Cry_Cursola - cry_not Cry_Sirfetchd - cry_not Cry_MrRime - cry_not Cry_Runerigus - cry_not Cry_Milcery - cry_not Cry_Alcremie - cry_not Cry_Falinks - cry_not Cry_Pincurchin - cry_not Cry_Snom - cry_not Cry_Frosmoth - cry_not Cry_Stonjourner - cry_not Cry_Eiscue - cry_not Cry_Indeedee - cry_not Cry_Morpeko - cry_not Cry_Cufant - cry_not Cry_Copperajah - cry_not Cry_Dracozolt - cry_not Cry_Arctozolt - cry_not Cry_Dracovish - cry_not Cry_Arctovish - cry_not Cry_Duraludon - cry_not Cry_Dreepy - cry_not Cry_Drakloak - cry_not Cry_Dragapult - cry_not Cry_Zacian - cry_not Cry_Zamazenta - cry_not Cry_Eternatus - cry_not Cry_Kubfu - cry_not Cry_Urshifu - cry_not Cry_Zarude - cry_not Cry_Regieleki - cry_not Cry_Regidrago - cry_not Cry_Glastrier - cry_not Cry_Spectrier - cry_not Cry_Calyrex + cry Cry_Turtwig + cry Cry_Grotle + cry Cry_Torterra + cry Cry_Chimchar + cry Cry_Monferno + cry Cry_Infernape + cry Cry_Piplup + cry Cry_Prinplup + cry Cry_Empoleon + cry Cry_Starly + cry Cry_Staravia + cry Cry_Staraptor + cry Cry_Bidoof + cry Cry_Bibarel + cry Cry_Kricketot + cry Cry_Kricketune + cry Cry_Shinx + cry Cry_Luxio + cry Cry_Luxray + cry Cry_Budew + cry Cry_Roserade + cry Cry_Cranidos + cry Cry_Rampardos + cry Cry_Shieldon + cry Cry_Bastiodon + cry Cry_Burmy + cry Cry_Wormadam + cry Cry_Mothim + cry Cry_Combee + cry Cry_Vespiquen + cry Cry_Pachirisu + cry Cry_Buizel + cry Cry_Floatzel + cry Cry_Cherubi + cry Cry_Cherrim + cry Cry_Shellos + cry Cry_Gastrodon + cry Cry_Ambipom + cry Cry_Drifloon + cry Cry_Drifblim + cry Cry_Buneary + cry Cry_Lopunny + cry Cry_Mismagius + cry Cry_Honchkrow + cry Cry_Glameow + cry Cry_Purugly + cry Cry_Chingling + cry Cry_Stunky + cry Cry_Skuntank + cry Cry_Bronzor + cry Cry_Bronzong + cry Cry_Bonsly + cry Cry_MimeJr + cry Cry_Happiny + cry Cry_Chatot + cry Cry_Spiritomb + cry Cry_Gible + cry Cry_Gabite + cry Cry_Garchomp + cry Cry_Munchlax + cry Cry_Riolu + cry Cry_Lucario + cry Cry_Hippopotas + cry Cry_Hippowdon + cry Cry_Skorupi + cry Cry_Drapion + cry Cry_Croagunk + cry Cry_Toxicroak + cry Cry_Carnivine + cry Cry_Finneon + cry Cry_Lumineon + cry Cry_Mantyke + cry Cry_Snover + cry Cry_Abomasnow + cry Cry_Weavile + cry Cry_Magnezone + cry Cry_Lickilicky + cry Cry_Rhyperior + cry Cry_Tangrowth + cry Cry_Electivire + cry Cry_Magmortar + cry Cry_Togekiss + cry Cry_Yanmega + cry Cry_Leafeon + cry Cry_Glaceon + cry Cry_Gliscor + cry Cry_Mamoswine + cry Cry_PorygonZ + cry Cry_Gallade + cry Cry_Probopass + cry Cry_Dusknoir + cry Cry_Froslass + cry Cry_Rotom + cry Cry_Uxie + cry Cry_Mesprit + cry Cry_Azelf + cry Cry_Dialga + cry Cry_Palkia + cry Cry_Heatran + cry Cry_Regigigas + cry Cry_Giratina + cry Cry_Cresselia + cry Cry_Phione + cry Cry_Manaphy + cry Cry_Darkrai + cry Cry_Shaymin + cry Cry_Arceus + cry Cry_Victini + cry Cry_Snivy + cry Cry_Servine + cry Cry_Serperior + cry Cry_Tepig + cry Cry_Pignite + cry Cry_Emboar + cry Cry_Oshawott + cry Cry_Dewott + cry Cry_Samurott + cry Cry_Patrat + cry Cry_Watchog + cry Cry_Lillipup + cry Cry_Herdier + cry Cry_Stoutland + cry Cry_Purrloin + cry Cry_Liepard + cry Cry_Pansage + cry Cry_Simisage + cry Cry_Pansear + cry Cry_Simisear + cry Cry_Panpour + cry Cry_Simipour + cry Cry_Munna + cry Cry_Musharna + cry Cry_Pidove + cry Cry_Tranquill + cry Cry_Unfezant + cry Cry_Blitzle + cry Cry_Zebstrika + cry Cry_Roggenrola + cry Cry_Boldore + cry Cry_Gigalith + cry Cry_Woobat + cry Cry_Swoobat + cry Cry_Drilbur + cry Cry_Excadrill + cry Cry_Audino + cry Cry_Timburr + cry Cry_Gurdurr + cry Cry_Conkeldurr + cry Cry_Tympole + cry Cry_Palpitoad + cry Cry_Seismitoad + cry Cry_Throh + cry Cry_Sawk + cry Cry_Sewaddle + cry Cry_Swadloon + cry Cry_Leavanny + cry Cry_Venipede + cry Cry_Whirlipede + cry Cry_Scolipede + cry Cry_Cottonee + cry Cry_Whimsicott + cry Cry_Petilil + cry Cry_Lilligant + cry Cry_Basculin + cry Cry_Sandile + cry Cry_Krokorok + cry Cry_Krookodile + cry Cry_Darumaka + cry Cry_Darmanitan + cry Cry_Maractus + cry Cry_Dwebble + cry Cry_Crustle + cry Cry_Scraggy + cry Cry_Scrafty + cry Cry_Sigilyph + cry Cry_Yamask + cry Cry_Cofagrigus + cry Cry_Tirtouga + cry Cry_Carracosta + cry Cry_Archen + cry Cry_Archeops + cry Cry_Trubbish + cry Cry_Garbodor + cry Cry_Zorua + cry Cry_Zoroark + cry Cry_Minccino + cry Cry_Cinccino + cry Cry_Gothita + cry Cry_Gothorita + cry Cry_Gothitelle + cry Cry_Solosis + cry Cry_Duosion + cry Cry_Reuniclus + cry Cry_Ducklett + cry Cry_Swanna + cry Cry_Vanillite + cry Cry_Vanillish + cry Cry_Vanilluxe + cry Cry_Deerling + cry Cry_Sawsbuck + cry Cry_Emolga + cry Cry_Karrablast + cry Cry_Escavalier + cry Cry_Foongus + cry Cry_Amoonguss + cry Cry_Frillish + cry Cry_Jellicent + cry Cry_Alomomola + cry Cry_Joltik + cry Cry_Galvantula + cry Cry_Ferroseed + cry Cry_Ferrothorn + cry Cry_Klink + cry Cry_Klang + cry Cry_Klinklang + cry Cry_Tynamo + cry Cry_Eelektrik + cry Cry_Eelektross + cry Cry_Elgyem + cry Cry_Beheeyem + cry Cry_Litwick + cry Cry_Lampent + cry Cry_Chandelure + cry Cry_Axew + cry Cry_Fraxure + cry Cry_Haxorus + cry Cry_Cubchoo + cry Cry_Beartic + cry Cry_Cryogonal + cry Cry_Shelmet + cry Cry_Accelgor + cry Cry_Stunfisk + cry Cry_Mienfoo + cry Cry_Mienshao + cry Cry_Druddigon + cry Cry_Golett + cry Cry_Golurk + cry Cry_Pawniard + cry Cry_Bisharp + cry Cry_Bouffalant + cry Cry_Rufflet + cry Cry_Braviary + cry Cry_Vullaby + cry Cry_Mandibuzz + cry Cry_Heatmor + cry Cry_Durant + cry Cry_Deino + cry Cry_Zweilous + cry Cry_Hydreigon + cry Cry_Larvesta + cry Cry_Volcarona + cry Cry_Cobalion + cry Cry_Terrakion + cry Cry_Virizion + cry Cry_Tornadus + cry Cry_Thundurus + cry Cry_Reshiram + cry Cry_Zekrom + cry Cry_Landorus + cry Cry_Kyurem + cry Cry_Keldeo + cry Cry_Meloetta + cry Cry_Genesect + cry_uncomp Cry_Chespin + cry_uncomp Cry_Quilladin + cry_uncomp Cry_Chesnaught + cry_uncomp Cry_Fennekin + cry_uncomp Cry_Braixen + cry_uncomp Cry_Delphox + cry_uncomp Cry_Froakie + cry_uncomp Cry_Frogadier + cry_uncomp Cry_Greninja + cry_uncomp Cry_Bunnelby + cry_uncomp Cry_Diggersby + cry_uncomp Cry_Fletchling + cry_uncomp Cry_Fletchinder + cry_uncomp Cry_Talonflame + cry_uncomp Cry_Scatterbug + cry_uncomp Cry_Spewpa + cry_uncomp Cry_Vivillon + cry_uncomp Cry_Litleo + cry_uncomp Cry_Pyroar + cry_uncomp Cry_Flabebe + cry_uncomp Cry_Floette + cry_uncomp Cry_Florges + cry_uncomp Cry_Skiddo + cry_uncomp Cry_Gogoat + cry_uncomp Cry_Pancham + cry_uncomp Cry_Pangoro + cry_uncomp Cry_Furfrou + cry_uncomp Cry_Espurr + cry_uncomp Cry_Meowstic + cry_uncomp Cry_Honedge + cry_uncomp Cry_Doublade + cry_uncomp Cry_Aegislash + cry_uncomp Cry_Spritzee + cry_uncomp Cry_Aromatisse + cry_uncomp Cry_Swirlix + cry_uncomp Cry_Slurpuff + cry_uncomp Cry_Inkay + cry_uncomp Cry_Malamar + cry_uncomp Cry_Binacle + cry_uncomp Cry_Barbaracle + cry_uncomp Cry_Skrelp + cry_uncomp Cry_Dragalge + cry_uncomp Cry_Clauncher + cry_uncomp Cry_Clawitzer + cry_uncomp Cry_Helioptile + cry_uncomp Cry_Heliolisk + cry_uncomp Cry_Tyrunt + cry_uncomp Cry_Tyrantrum + cry_uncomp Cry_Amaura + cry_uncomp Cry_Aurorus + cry_uncomp Cry_Sylveon + cry_uncomp Cry_Hawlucha + cry_uncomp Cry_Dedenne + cry_uncomp Cry_Carbink + cry_uncomp Cry_Goomy + cry_uncomp Cry_Sliggoo + cry_uncomp Cry_Goodra + cry_uncomp Cry_Klefki + cry_uncomp Cry_Phantump + cry_uncomp Cry_Trevenant + cry_uncomp Cry_Pumpkaboo + cry_uncomp Cry_Gourgeist + cry_uncomp Cry_Bergmite + cry_uncomp Cry_Avalugg + cry_uncomp Cry_Noibat + cry_uncomp Cry_Noivern + cry_uncomp Cry_Xerneas + cry_uncomp Cry_Yveltal + cry_uncomp Cry_Zygarde + cry_uncomp Cry_Diancie + cry_uncomp Cry_Hoopa + cry_uncomp Cry_Volcanion + cry_uncomp Cry_Rowlet + cry_uncomp Cry_Dartrix + cry_uncomp Cry_Decidueye + cry_uncomp Cry_Litten + cry_uncomp Cry_Torracat + cry_uncomp Cry_Incineroar + cry_uncomp Cry_Popplio + cry_uncomp Cry_Brionne + cry_uncomp Cry_Primarina + cry_uncomp Cry_Pikipek + cry_uncomp Cry_Trumbeak + cry_uncomp Cry_Toucannon + cry_uncomp Cry_Yungoos + cry_uncomp Cry_Gumshoos + cry_uncomp Cry_Grubbin + cry_uncomp Cry_Charjabug + cry_uncomp Cry_Vikavolt + cry_uncomp Cry_Crabrawler + cry_uncomp Cry_Crabominable + cry_uncomp Cry_Oricorio + cry_uncomp Cry_Cutiefly + cry_uncomp Cry_Ribombee + cry_uncomp Cry_Rockruff + cry_uncomp Cry_Lycanroc + cry_uncomp Cry_Wishiwashi + cry_uncomp Cry_Mareanie + cry_uncomp Cry_Toxapex + cry_uncomp Cry_Mudbray + cry_uncomp Cry_Mudsdale + cry_uncomp Cry_Dewpider + cry_uncomp Cry_Araquanid + cry_uncomp Cry_Fomantis + cry_uncomp Cry_Lurantis + cry_uncomp Cry_Morelull + cry_uncomp Cry_Shiinotic + cry_uncomp Cry_Salandit + cry_uncomp Cry_Salazzle + cry_uncomp Cry_Stufful + cry_uncomp Cry_Bewear + cry_uncomp Cry_Bounsweet + cry_uncomp Cry_Steenee + cry_uncomp Cry_Tsareena + cry_uncomp Cry_Comfey + cry_uncomp Cry_Oranguru + cry_uncomp Cry_Passimian + cry_uncomp Cry_Wimpod + cry_uncomp Cry_Golisopod + cry_uncomp Cry_Sandygast + cry_uncomp Cry_Palossand + cry_uncomp Cry_Pyukumuku + cry_uncomp Cry_TypeNull + cry_uncomp Cry_Silvally + cry_uncomp Cry_Minior + cry_uncomp Cry_Komala + cry_uncomp Cry_Turtonator + cry_uncomp Cry_Togedemaru + cry_uncomp Cry_Mimikyu + cry_uncomp Cry_Bruxish + cry_uncomp Cry_Drampa + cry_uncomp Cry_Dhelmise + cry_uncomp Cry_Jangmoo + cry_uncomp Cry_Hakamoo + cry_uncomp Cry_Kommoo + cry_uncomp Cry_TapuKoko + cry_uncomp Cry_TapuLele + cry_uncomp Cry_TapuBulu + cry_uncomp Cry_TapuFini + cry_uncomp Cry_Cosmog + cry_uncomp Cry_Cosmoem + cry_uncomp Cry_Solgaleo + cry_uncomp Cry_Lunala + cry_uncomp Cry_Nihilego + cry_uncomp Cry_Buzzwole + cry_uncomp Cry_Pheromosa + cry_uncomp Cry_Xurkitree + cry_uncomp Cry_Celesteela + cry_uncomp Cry_Kartana + cry_uncomp Cry_Guzzlord + cry_uncomp Cry_Necrozma + cry_uncomp Cry_Magearna + cry_uncomp Cry_Marshadow + cry_uncomp Cry_Poipole + cry_uncomp Cry_Naganadel + cry_uncomp Cry_Stakataka + cry_uncomp Cry_Blacephalon + cry_uncomp Cry_Zeraora + cry_uncomp Cry_Meltan + cry_uncomp Cry_Melmetal + cry_uncomp Cry_Grookey + cry_uncomp Cry_Thwackey + cry_uncomp Cry_Rillaboom + cry_uncomp Cry_Scorbunny + cry_uncomp Cry_Raboot + cry_uncomp Cry_Cinderace + cry_uncomp Cry_Sobble + cry_uncomp Cry_Drizzile + cry_uncomp Cry_Inteleon + cry_uncomp Cry_Skwovet + cry_uncomp Cry_Greedent + cry_uncomp Cry_Rookidee + cry_uncomp Cry_Corvisquire + cry_uncomp Cry_Corviknight + cry_uncomp Cry_Blipbug + cry_uncomp Cry_Dottler + cry_uncomp Cry_Orbeetle + cry_uncomp Cry_Nickit + cry_uncomp Cry_Thievul + cry_uncomp Cry_Gossifleur + cry_uncomp Cry_Eldegoss + cry_uncomp Cry_Wooloo + cry_uncomp Cry_Dubwool + cry_uncomp Cry_Chewtle + cry_uncomp Cry_Drednaw + cry_uncomp Cry_Yamper + cry_uncomp Cry_Boltund + cry_uncomp Cry_Rolycoly + cry_uncomp Cry_Carkol + cry_uncomp Cry_Coalossal + cry_uncomp Cry_Applin + cry_uncomp Cry_Flapple + cry_uncomp Cry_Appletun + cry_uncomp Cry_Silicobra + cry_uncomp Cry_Sandaconda + cry_uncomp Cry_Cramorant + cry_uncomp Cry_Arrokuda + cry_uncomp Cry_Barraskewda + cry_uncomp Cry_Toxel + cry_uncomp Cry_Toxtricity + cry_uncomp Cry_Sizzlipede + cry_uncomp Cry_Centiskorch + cry_uncomp Cry_Clobbopus + cry_uncomp Cry_Grapploct + cry_uncomp Cry_Sinistea + cry_uncomp Cry_Polteageist + cry_uncomp Cry_Hatenna + cry_uncomp Cry_Hattrem + cry_uncomp Cry_Hatterene + cry_uncomp Cry_Impidimp + cry_uncomp Cry_Morgrem + cry_uncomp Cry_Grimmsnarl + cry_uncomp Cry_Obstagoon + cry_uncomp Cry_Perrserker + cry_uncomp Cry_Cursola + cry_uncomp Cry_Sirfetchd + cry_uncomp Cry_MrRime + cry_uncomp Cry_Runerigus + cry_uncomp Cry_Milcery + cry_uncomp Cry_Alcremie + cry_uncomp Cry_Falinks + cry_uncomp Cry_Pincurchin + cry_uncomp Cry_Snom + cry_uncomp Cry_Frosmoth + cry_uncomp Cry_Stonjourner + cry_uncomp Cry_Eiscue + cry_uncomp Cry_Indeedee + cry_uncomp Cry_Morpeko + cry_uncomp Cry_Cufant + cry_uncomp Cry_Copperajah + cry_uncomp Cry_Dracozolt + cry_uncomp Cry_Arctozolt + cry_uncomp Cry_Dracovish + cry_uncomp Cry_Arctovish + cry_uncomp Cry_Duraludon + cry_uncomp Cry_Dreepy + cry_uncomp Cry_Drakloak + cry_uncomp Cry_Dragapult + cry_uncomp Cry_Zacian + cry_uncomp Cry_Zamazenta + cry_uncomp Cry_Eternatus + cry_uncomp Cry_Kubfu + cry_uncomp Cry_Urshifu + cry_uncomp Cry_Zarude + cry_uncomp Cry_Regieleki + cry_uncomp Cry_Regidrago + cry_uncomp Cry_Glastrier + cry_uncomp Cry_Spectrier + cry_uncomp Cry_Calyrex @ Megas - cry_not Cry_Venusaur_Mega - cry_not Cry_Charizard_Mega_X - cry_not Cry_Charizard_Mega_Y - cry_not Cry_Blastoise_Mega - cry_not Cry_Beedrill_Mega - cry_not Cry_Pidgeot_Mega - cry_not Cry_Alakazam_Mega - cry_not Cry_Slowbro_Mega - cry_not Cry_Gengar_Mega - cry_not Cry_Kangaskhan_Mega - cry_not Cry_Pinsir_Mega - cry_not Cry_Gyarados_Mega - cry_not Cry_Aerodactyl_Mega - cry_not Cry_Mewtwo_Mega_X - cry_not Cry_Mewtwo_Mega_Y - cry_not Cry_Ampharos_Mega - cry_not Cry_Steelix_Mega - cry_not Cry_Scizor_Mega - cry_not Cry_Heracross_Mega - cry_not Cry_Houndoom_Mega - cry_not Cry_Tyranitar_Mega - cry_not Cry_Sceptile_Mega - cry_not Cry_Blaziken_Mega - cry_not Cry_Swampert_Mega - cry_not Cry_Gardevoir_Mega - cry_not Cry_Sableye_Mega - cry_not Cry_Mawile_Mega - cry_not Cry_Aggron_Mega - cry_not Cry_Medicham_Mega - cry_not Cry_Manectric_Mega - cry_not Cry_Sharpedo_Mega - cry_not Cry_Camerupt_Mega - cry_not Cry_Altaria_Mega - cry_not Cry_Banette_Mega - cry_not Cry_Absol_Mega - cry_not Cry_Glalie_Mega - cry_not Cry_Salamence_Mega - cry_not Cry_Metagross_Mega - cry_not Cry_Latias_Mega - cry_not Cry_Latios_Mega - cry_not Cry_Lopunny_Mega - cry_not Cry_Garchomp_Mega - cry_not Cry_Lucario_Mega - cry_not Cry_Abomasnow_Mega - cry_not Cry_Gallade_Mega - cry_not Cry_Audino_Mega - cry_not Cry_Diancie_Mega + cry_uncomp Cry_VenusaurMega + cry_uncomp Cry_CharizardMegaX + cry_uncomp Cry_CharizardMegaY + cry_uncomp Cry_BlastoiseMega + cry_uncomp Cry_BeedrillMega + cry_uncomp Cry_PidgeotMega + cry_uncomp Cry_AlakazamMega + cry_uncomp Cry_SlowbroMega + cry_uncomp Cry_GengarMega + cry_uncomp Cry_KangaskhanMega + cry_uncomp Cry_PinsirMega + cry_uncomp Cry_GyaradosMega + cry_uncomp Cry_AerodactylMega + cry_uncomp Cry_MewtwoMegaX + cry_uncomp Cry_MewtwoMegaY + cry_uncomp Cry_AmpharosMega + cry_uncomp Cry_SteelixMega + cry_uncomp Cry_ScizorMega + cry_uncomp Cry_HeracrossMega + cry_uncomp Cry_HoundoomMega + cry_uncomp Cry_TyranitarMega + cry_uncomp Cry_SceptileMega + cry_uncomp Cry_BlazikenMega + cry_uncomp Cry_SwampertMega + cry_uncomp Cry_GardevoirMega + cry_uncomp Cry_SableyeMega + cry_uncomp Cry_MawileMega + cry_uncomp Cry_AggronMega + cry_uncomp Cry_MedichamMega + cry_uncomp Cry_ManectricMega + cry_uncomp Cry_SharpedoMega + cry_uncomp Cry_CameruptMega + cry_uncomp Cry_AltariaMega + cry_uncomp Cry_BanetteMega + cry_uncomp Cry_AbsolMega + cry_uncomp Cry_GlalieMega + cry_uncomp Cry_SalamenceMega + cry_uncomp Cry_MetagrossMega + cry_uncomp Cry_LatiasMega + cry_uncomp Cry_LatiosMega + cry_uncomp Cry_LopunnyMega + cry_uncomp Cry_GarchompMega + cry_uncomp Cry_LucarioMega + cry_uncomp Cry_AbomasnowMega + cry_uncomp Cry_GalladeMega + cry_uncomp Cry_AudinoMega + cry_uncomp Cry_DiancieMega @ Special Mega + Primals - cry_not Cry_Rayquaza_Mega - cry_not Cry_Kyogre_Primal - cry_not Cry_Groudon_Primal + cry_uncomp Cry_RayquazaMega + cry_uncomp Cry_KyogrePrimal + cry_uncomp Cry_GroudonPrimal @ Alolan Forms cry Cry_Rattata cry Cry_Raticate @@ -974,7 +974,7 @@ gCryTable:: @ 869DCF4 cry Cry_Meowth cry Cry_Ponyta cry Cry_Rapidash - cry_not Cry_Slowpoke_Galarian + cry_uncomp Cry_SlowpokeGalarian cry Cry_Slowbro cry Cry_Farfetchd cry Cry_Weezing @@ -986,10 +986,10 @@ gCryTable:: @ 869DCF4 cry Cry_Corsola cry Cry_Zigzagoon cry Cry_Linoone - cry_not Cry_Darumaka - cry_not Cry_Darmanitan - cry_not Cry_Yamask - cry_not Cry_Stunfisk + cry Cry_Darumaka + cry Cry_Darmanitan + cry Cry_Yamask + cry Cry_Stunfisk @ Misc Forms @ Cosplay Pikachu cry Cry_Pikachu @ 869DE14 @@ -1046,232 +1046,232 @@ gCryTable:: @ 869DCF4 cry Cry_Deoxys cry Cry_Deoxys @ Burmy - cry_not Cry_Burmy - cry_not Cry_Burmy + cry Cry_Burmy + cry Cry_Burmy @ Wormadam - cry_not Cry_Wormadam - cry_not Cry_Wormadam + cry Cry_Wormadam + cry Cry_Wormadam @ Cherrim - cry_not Cry_Cherrim + cry Cry_Cherrim @ Shellos - cry_not Cry_Shellos + cry Cry_Shellos @ Gastrodon - cry_not Cry_Gastrodon + cry Cry_Gastrodon @ Rotom - cry_not Cry_Rotom - cry_not Cry_Rotom - cry_not Cry_Rotom - cry_not Cry_Rotom - cry_not Cry_Rotom + cry Cry_Rotom + cry Cry_Rotom + cry Cry_Rotom + cry Cry_Rotom + cry Cry_Rotom @ Giratina - cry_not Cry_Giratina + cry Cry_Giratina @ Shaymin - cry_not Cry_Shaymin_Sky + cry Cry_ShayminSky @ Arceus - cry_not Cry_Arceus - cry_not Cry_Arceus - cry_not Cry_Arceus - cry_not Cry_Arceus - cry_not Cry_Arceus - cry_not Cry_Arceus - cry_not Cry_Arceus - cry_not Cry_Arceus - cry_not Cry_Arceus - cry_not Cry_Arceus - cry_not Cry_Arceus - cry_not Cry_Arceus - cry_not Cry_Arceus - cry_not Cry_Arceus - cry_not Cry_Arceus - cry_not Cry_Arceus - cry_not Cry_Arceus + cry Cry_Arceus + cry Cry_Arceus + cry Cry_Arceus + cry Cry_Arceus + cry Cry_Arceus + cry Cry_Arceus + cry Cry_Arceus + cry Cry_Arceus + cry Cry_Arceus + cry Cry_Arceus + cry Cry_Arceus + cry Cry_Arceus + cry Cry_Arceus + cry Cry_Arceus + cry Cry_Arceus + cry Cry_Arceus + cry Cry_Arceus @ Basculin - cry_not Cry_Basculin + cry Cry_Basculin @ Darmanitan - cry_not Cry_Darmanitan - cry_not Cry_Darmanitan + cry Cry_Darmanitan + cry Cry_Darmanitan @ Deerling - cry_not Cry_Deerling - cry_not Cry_Deerling - cry_not Cry_Deerling + cry Cry_Deerling + cry Cry_Deerling + cry Cry_Deerling @ Sawsbuck - cry_not Cry_Sawsbuck - cry_not Cry_Sawsbuck - cry_not Cry_Sawsbuck + cry Cry_Sawsbuck + cry Cry_Sawsbuck + cry Cry_Sawsbuck @ Therian Forms - cry_not Cry_Tornadus_Therian - cry_not Cry_Thundurus_Therian - cry_not Cry_Landorus_Therian + cry Cry_TornadusTherian + cry Cry_ThundurusTherian + cry Cry_LandorusTherian @ Kyurem - cry_not Cry_Kyurem_White - cry_not Cry_Kyurem_Black + cry Cry_KyuremWhite + cry Cry_KyuremBlack @ Keldeo - cry_not Cry_Keldeo + cry Cry_Keldeo @ Meloetta - cry_not Cry_Meloetta + cry Cry_Meloetta @ Genesect - cry_not Cry_Genesect - cry_not Cry_Genesect - cry_not Cry_Genesect - cry_not Cry_Genesect + cry Cry_Genesect + cry Cry_Genesect + cry Cry_Genesect + cry Cry_Genesect @ Greninja - cry_not Cry_Greninja - cry_not Cry_Greninja + cry_uncomp Cry_Greninja + cry_uncomp Cry_Greninja @ Vivillon - cry_not Cry_Vivillon - cry_not Cry_Vivillon - cry_not Cry_Vivillon - cry_not Cry_Vivillon - cry_not Cry_Vivillon - cry_not Cry_Vivillon - cry_not Cry_Vivillon - cry_not Cry_Vivillon - cry_not Cry_Vivillon - cry_not Cry_Vivillon - cry_not Cry_Vivillon - cry_not Cry_Vivillon - cry_not Cry_Vivillon - cry_not Cry_Vivillon - cry_not Cry_Vivillon - cry_not Cry_Vivillon - cry_not Cry_Vivillon - cry_not Cry_Vivillon - cry_not Cry_Vivillon + cry_uncomp Cry_Vivillon + cry_uncomp Cry_Vivillon + cry_uncomp Cry_Vivillon + cry_uncomp Cry_Vivillon + cry_uncomp Cry_Vivillon + cry_uncomp Cry_Vivillon + cry_uncomp Cry_Vivillon + cry_uncomp Cry_Vivillon + cry_uncomp Cry_Vivillon + cry_uncomp Cry_Vivillon + cry_uncomp Cry_Vivillon + cry_uncomp Cry_Vivillon + cry_uncomp Cry_Vivillon + cry_uncomp Cry_Vivillon + cry_uncomp Cry_Vivillon + cry_uncomp Cry_Vivillon + cry_uncomp Cry_Vivillon + cry_uncomp Cry_Vivillon + cry_uncomp Cry_Vivillon @ Flabébé - cry_not Cry_Flabebe - cry_not Cry_Flabebe - cry_not Cry_Flabebe - cry_not Cry_Flabebe + cry_uncomp Cry_Flabebe + cry_uncomp Cry_Flabebe + cry_uncomp Cry_Flabebe + cry_uncomp Cry_Flabebe @ Floette - cry_not Cry_Floette - cry_not Cry_Floette - cry_not Cry_Floette - cry_not Cry_Floette - cry_not Cry_Floette_Eternal_Flower + cry_uncomp Cry_Floette + cry_uncomp Cry_Floette + cry_uncomp Cry_Floette + cry_uncomp Cry_Floette + cry_uncomp Cry_FloetteEternalFlower @ Florges - cry_not Cry_Florges - cry_not Cry_Florges - cry_not Cry_Florges - cry_not Cry_Florges + cry_uncomp Cry_Florges + cry_uncomp Cry_Florges + cry_uncomp Cry_Florges + cry_uncomp Cry_Florges @ Furfrou - cry_not Cry_Furfrou - cry_not Cry_Furfrou - cry_not Cry_Furfrou - cry_not Cry_Furfrou - cry_not Cry_Furfrou - cry_not Cry_Furfrou - cry_not Cry_Furfrou - cry_not Cry_Furfrou - cry_not Cry_Furfrou + cry_uncomp Cry_Furfrou + cry_uncomp Cry_Furfrou + cry_uncomp Cry_Furfrou + cry_uncomp Cry_Furfrou + cry_uncomp Cry_Furfrou + cry_uncomp Cry_Furfrou + cry_uncomp Cry_Furfrou + cry_uncomp Cry_Furfrou + cry_uncomp Cry_Furfrou @ Meowstic - cry_not Cry_Meowstic + cry_uncomp Cry_Meowstic @ Aegislash - cry_not Cry_Aegislash + cry_uncomp Cry_Aegislash @ Pumpkaboo - cry_not Cry_Pumpkaboo - cry_not Cry_Pumpkaboo - cry_not Cry_Pumpkaboo_Super + cry_uncomp Cry_Pumpkaboo + cry_uncomp Cry_Pumpkaboo + cry_uncomp Cry_PumpkabooSuper @ Gourgeist - cry_not Cry_Gourgeist - cry_not Cry_Gourgeist - cry_not Cry_Gourgeist_Super + cry_uncomp Cry_Gourgeist + cry_uncomp Cry_Gourgeist + cry_uncomp Cry_GourgeistSuper @ Xerneas - cry_not Cry_Xerneas + cry_uncomp Cry_Xerneas @ Zygarde - cry_not Cry_Zygarde_10 - cry_not Cry_Zygarde_10 - cry_not Cry_Zygarde - cry_not Cry_Zygarde_Complete + cry_uncomp Cry_Zygarde10 + cry_uncomp Cry_Zygarde10 + cry_uncomp Cry_Zygarde + cry_uncomp Cry_ZygardeComplete @ Hoopa - cry_not Cry_Hoopa_Unbound + cry_uncomp Cry_HoopaUnbound @ Oricorio - cry_not Cry_Oricorio_Pom_Pom - cry_not Cry_Oricorio_Pa_u - cry_not Cry_Oricorio_Sensu + cry_uncomp Cry_OricorioPomPom + cry_uncomp Cry_OricorioPau + cry_uncomp Cry_OricorioSensu @ Rockruff - cry_not Cry_Rockruff + cry_uncomp Cry_Rockruff @ Lycanroc - cry_not Cry_Lycanroc_Midnight - cry_not Cry_Lycanroc_Dusk + cry_uncomp Cry_LycanrocMidnight + cry_uncomp Cry_LycanrocDusk @ Wishiwashi - cry_not Cry_Wishiwashi_School + cry_uncomp Cry_WishiwashiSchool @ Silvally - cry_not Cry_Silvally - cry_not Cry_Silvally - cry_not Cry_Silvally - cry_not Cry_Silvally - cry_not Cry_Silvally - cry_not Cry_Silvally - cry_not Cry_Silvally - cry_not Cry_Silvally - cry_not Cry_Silvally - cry_not Cry_Silvally - cry_not Cry_Silvally - cry_not Cry_Silvally - cry_not Cry_Silvally - cry_not Cry_Silvally - cry_not Cry_Silvally - cry_not Cry_Silvally - cry_not Cry_Silvally + cry_uncomp Cry_Silvally + cry_uncomp Cry_Silvally + cry_uncomp Cry_Silvally + cry_uncomp Cry_Silvally + cry_uncomp Cry_Silvally + cry_uncomp Cry_Silvally + cry_uncomp Cry_Silvally + cry_uncomp Cry_Silvally + cry_uncomp Cry_Silvally + cry_uncomp Cry_Silvally + cry_uncomp Cry_Silvally + cry_uncomp Cry_Silvally + cry_uncomp Cry_Silvally + cry_uncomp Cry_Silvally + cry_uncomp Cry_Silvally + cry_uncomp Cry_Silvally + cry_uncomp Cry_Silvally @ Minior - cry_not Cry_Minior - cry_not Cry_Minior - cry_not Cry_Minior - cry_not Cry_Minior - cry_not Cry_Minior - cry_not Cry_Minior - cry_not Cry_Minior - cry_not Cry_Minior - cry_not Cry_Minior - cry_not Cry_Minior - cry_not Cry_Minior - cry_not Cry_Minior - cry_not Cry_Minior + cry_uncomp Cry_Minior + cry_uncomp Cry_Minior + cry_uncomp Cry_Minior + cry_uncomp Cry_Minior + cry_uncomp Cry_Minior + cry_uncomp Cry_Minior + cry_uncomp Cry_Minior + cry_uncomp Cry_Minior + cry_uncomp Cry_Minior + cry_uncomp Cry_Minior + cry_uncomp Cry_Minior + cry_uncomp Cry_Minior + cry_uncomp Cry_Minior @ Mimikyu - cry_not Cry_Mimikyu + cry_uncomp Cry_Mimikyu @ Necrozma - cry_not Cry_Necrozma_Dusk_Mane - cry_not Cry_Necrozma_Dawn_Wings - cry_not Cry_Necrozma_Ultra + cry_uncomp Cry_NecrozmaDuskMane + cry_uncomp Cry_NecrozmaDawnWings + cry_uncomp Cry_NecrozmaUltra @ Magearna - cry_not Cry_Magearna + cry_uncomp Cry_Magearna @ Cramorant - cry_not Cry_Cramorant - cry_not Cry_Cramorant + cry_uncomp Cry_Cramorant + cry_uncomp Cry_Cramorant @ Toxtricity - cry_not Cry_Toxtricity_Low_Key + cry_uncomp Cry_ToxtricityLowKey @ Sinistea - cry_not Cry_Sinistea + cry_uncomp Cry_Sinistea @ Polteageist - cry_not Cry_Polteageist + cry_uncomp Cry_Polteageist @ Alcremie - cry_not Cry_Alcremie - cry_not Cry_Alcremie - cry_not Cry_Alcremie - cry_not Cry_Alcremie - cry_not Cry_Alcremie - cry_not Cry_Alcremie - cry_not Cry_Alcremie - cry_not Cry_Alcremie + cry_uncomp Cry_Alcremie + cry_uncomp Cry_Alcremie + cry_uncomp Cry_Alcremie + cry_uncomp Cry_Alcremie + cry_uncomp Cry_Alcremie + cry_uncomp Cry_Alcremie + cry_uncomp Cry_Alcremie + cry_uncomp Cry_Alcremie @ Eiscue - cry_not Cry_Eiscue_Noice_Face + cry_uncomp Cry_EiscueNoiceFace @ Indeedee - cry_not Cry_Indeedee_Female + cry_uncomp Cry_IndeedeeFemale @ Morpeko - cry_not Cry_Morpeko_Hangry + cry_uncomp Cry_MorpekoHangry @ Zacian - cry_not Cry_Zacian_Crowned_Sword + cry_uncomp Cry_ZacianCrownedSword @ Zamazenta - cry_not Cry_Zamazenta_Crowned_Shield + cry_uncomp Cry_ZamazentaCrownedShield @ Eternatus - cry_not Cry_Eternatus_Eternamax + cry_uncomp Cry_EternatusEternamax @ Urshifu - cry_not Cry_Urshifu_Rapid_Strike_Style + cry_uncomp Cry_UrshifuRapidStrikeStyle @ Zarude - cry_not Cry_Zarude + cry_uncomp Cry_Zarude @ Calyrex - cry_not Cry_Calyrex_Ice_Rider - cry_not Cry_Calyrex_Shadow_Rider + cry_uncomp Cry_CalyrexIceRider + cry_uncomp Cry_CalyrexShadowRider .align 2 gCryTable2:: @ 869EF24 @@ -1661,570 +1661,570 @@ gCryTable2:: @ 869EF24 cry2 Cry_Rayquaza cry2 Cry_Jirachi cry2 Cry_Deoxys - cry2_not Cry_Turtwig - cry2_not Cry_Grotle - cry2_not Cry_Torterra - cry2_not Cry_Chimchar - cry2_not Cry_Monferno - cry2_not Cry_Infernape - cry2_not Cry_Piplup - cry2_not Cry_Prinplup - cry2_not Cry_Empoleon - cry2_not Cry_Starly - cry2_not Cry_Staravia - cry2_not Cry_Staraptor - cry2_not Cry_Bidoof - cry2_not Cry_Bibarel - cry2_not Cry_Kricketot - cry2_not Cry_Kricketune - cry2_not Cry_Shinx - cry2_not Cry_Luxio - cry2_not Cry_Luxray - cry2_not Cry_Budew - cry2_not Cry_Roserade - cry2_not Cry_Cranidos - cry2_not Cry_Rampardos - cry2_not Cry_Shieldon - cry2_not Cry_Bastiodon - cry2_not Cry_Burmy - cry2_not Cry_Wormadam - cry2_not Cry_Mothim - cry2_not Cry_Combee - cry2_not Cry_Vespiquen - cry2_not Cry_Pachirisu - cry2_not Cry_Buizel - cry2_not Cry_Floatzel - cry2_not Cry_Cherubi - cry2_not Cry_Cherrim - cry2_not Cry_Shellos - cry2_not Cry_Gastrodon - cry2_not Cry_Ambipom - cry2_not Cry_Drifloon - cry2_not Cry_Drifblim - cry2_not Cry_Buneary - cry2_not Cry_Lopunny - cry2_not Cry_Mismagius - cry2_not Cry_Honchkrow - cry2_not Cry_Glameow - cry2_not Cry_Purugly - cry2_not Cry_Chingling - cry2_not Cry_Stunky - cry2_not Cry_Skuntank - cry2_not Cry_Bronzor - cry2_not Cry_Bronzong - cry2_not Cry_Bonsly - cry2_not Cry_Mimejr - cry2_not Cry_Happiny - cry2_not Cry_Chatot - cry2_not Cry_Spiritomb - cry2_not Cry_Gible - cry2_not Cry_Gabite - cry2_not Cry_Garchomp - cry2_not Cry_Munchlax - cry2_not Cry_Riolu - cry2_not Cry_Lucario - cry2_not Cry_Hippopotas - cry2_not Cry_Hippowdon - cry2_not Cry_Skorupi - cry2_not Cry_Drapion - cry2_not Cry_Croagunk - cry2_not Cry_Toxicroak - cry2_not Cry_Carnivine - cry2_not Cry_Finneon - cry2_not Cry_Lumineon - cry2_not Cry_Mantyke - cry2_not Cry_Snover - cry2_not Cry_Abomasnow - cry2_not Cry_Weavile - cry2_not Cry_Magnezone - cry2_not Cry_Lickilicky - cry2_not Cry_Rhyperior - cry2_not Cry_Tangrowth - cry2_not Cry_Electivire - cry2_not Cry_Magmortar - cry2_not Cry_Togekiss - cry2_not Cry_Yanmega - cry2_not Cry_Leafeon - cry2_not Cry_Glaceon - cry2_not Cry_Gliscor - cry2_not Cry_Mamoswine - cry2_not Cry_PorygonZ - cry2_not Cry_Gallade - cry2_not Cry_Probopass - cry2_not Cry_Dusknoir - cry2_not Cry_Froslass - cry2_not Cry_Rotom - cry2_not Cry_Uxie - cry2_not Cry_Mesprit - cry2_not Cry_Azelf - cry2_not Cry_Dialga - cry2_not Cry_Palkia - cry2_not Cry_Heatran - cry2_not Cry_Regigigas - cry2_not Cry_Giratina - cry2_not Cry_Cresselia - cry2_not Cry_Phione - cry2_not Cry_Manaphy - cry2_not Cry_Darkrai - cry2_not Cry_Shaymin - cry2_not Cry_Arceus - cry2_not Cry_Victini - cry2_not Cry_Snivy - cry2_not Cry_Servine - cry2_not Cry_Serperior - cry2_not Cry_Tepig - cry2_not Cry_Pignite - cry2_not Cry_Emboar - cry2_not Cry_Oshawott - cry2_not Cry_Dewott - cry2_not Cry_Samurott - cry2_not Cry_Patrat - cry2_not Cry_Watchog - cry2_not Cry_Lillipup - cry2_not Cry_Herdier - cry2_not Cry_Stoutland - cry2_not Cry_Purrloin - cry2_not Cry_Liepard - cry2_not Cry_Pansage - cry2_not Cry_Simisage - cry2_not Cry_Pansear - cry2_not Cry_Simisear - cry2_not Cry_Panpour - cry2_not Cry_Simipour - cry2_not Cry_Munna - cry2_not Cry_Musharna - cry2_not Cry_Pidove - cry2_not Cry_Tranquill - cry2_not Cry_Unfezant - cry2_not Cry_Blitzle - cry2_not Cry_Zebstrika - cry2_not Cry_Roggenrola - cry2_not Cry_Boldore - cry2_not Cry_Gigalith - cry2_not Cry_Woobat - cry2_not Cry_Swoobat - cry2_not Cry_Drilbur - cry2_not Cry_Excadrill - cry2_not Cry_Audino - cry2_not Cry_Timburr - cry2_not Cry_Gurdurr - cry2_not Cry_Conkeldurr - cry2_not Cry_Tympole - cry2_not Cry_Palpitoad - cry2_not Cry_Seismitoad - cry2_not Cry_Throh - cry2_not Cry_Sawk - cry2_not Cry_Sewaddle - cry2_not Cry_Swadloon - cry2_not Cry_Leavanny - cry2_not Cry_Venipede - cry2_not Cry_Whirlipede - cry2_not Cry_Scolipede - cry2_not Cry_Cottonee - cry2_not Cry_Whimsicott - cry2_not Cry_Petilil - cry2_not Cry_Lilligant - cry2_not Cry_Basculin - cry2_not Cry_Sandile - cry2_not Cry_Krokorok - cry2_not Cry_Krookodile - cry2_not Cry_Darumaka - cry2_not Cry_Darmanitan - cry2_not Cry_Maractus - cry2_not Cry_Dwebble - cry2_not Cry_Crustle - cry2_not Cry_Scraggy - cry2_not Cry_Scrafty - cry2_not Cry_Sigilyph - cry2_not Cry_Yamask - cry2_not Cry_Cofagrigus - cry2_not Cry_Tirtouga - cry2_not Cry_Carracosta - cry2_not Cry_Archen - cry2_not Cry_Archeops - cry2_not Cry_Trubbish - cry2_not Cry_Garbodor - cry2_not Cry_Zorua - cry2_not Cry_Zoroark - cry2_not Cry_Minccino - cry2_not Cry_Cinccino - cry2_not Cry_Gothita - cry2_not Cry_Gothorita - cry2_not Cry_Gothitelle - cry2_not Cry_Solosis - cry2_not Cry_Duosion - cry2_not Cry_Reuniclus - cry2_not Cry_Ducklett - cry2_not Cry_Swanna - cry2_not Cry_Vanillite - cry2_not Cry_Vanillish - cry2_not Cry_Vanilluxe - cry2_not Cry_Deerling - cry2_not Cry_Sawsbuck - cry2_not Cry_Emolga - cry2_not Cry_Karrablast - cry2_not Cry_Escavalier - cry2_not Cry_Foongus - cry2_not Cry_Amoonguss - cry2_not Cry_Frillish - cry2_not Cry_Jellicent - cry2_not Cry_Alomomola - cry2_not Cry_Joltik - cry2_not Cry_Galvantula - cry2_not Cry_Ferroseed - cry2_not Cry_Ferrothorn - cry2_not Cry_Klink - cry2_not Cry_Klang - cry2_not Cry_Klinklang - cry2_not Cry_Tynamo - cry2_not Cry_Eelektrik - cry2_not Cry_Eelektross - cry2_not Cry_Elgyem - cry2_not Cry_Beheeyem - cry2_not Cry_Litwick - cry2_not Cry_Lampent - cry2_not Cry_Chandelure - cry2_not Cry_Axew - cry2_not Cry_Fraxure - cry2_not Cry_Haxorus - cry2_not Cry_Cubchoo - cry2_not Cry_Beartic - cry2_not Cry_Cryogonal - cry2_not Cry_Shelmet - cry2_not Cry_Accelgor - cry2_not Cry_Stunfisk - cry2_not Cry_Mienfoo - cry2_not Cry_Mienshao - cry2_not Cry_Druddigon - cry2_not Cry_Golett - cry2_not Cry_Golurk - cry2_not Cry_Pawniard - cry2_not Cry_Bisharp - cry2_not Cry_Bouffalant - cry2_not Cry_Rufflet - cry2_not Cry_Braviary - cry2_not Cry_Vullaby - cry2_not Cry_Mandibuzz - cry2_not Cry_Heatmor - cry2_not Cry_Durant - cry2_not Cry_Deino - cry2_not Cry_Zweilous - cry2_not Cry_Hydreigon - cry2_not Cry_Larvesta - cry2_not Cry_Volcarona - cry2_not Cry_Cobalion - cry2_not Cry_Terrakion - cry2_not Cry_Virizion - cry2_not Cry_Tornadus - cry2_not Cry_Thundurus - cry2_not Cry_Reshiram - cry2_not Cry_Zekrom - cry2_not Cry_Landorus - cry2_not Cry_Kyurem - cry2_not Cry_Keldeo - cry2_not Cry_Meloetta - cry2_not Cry_Genesect - cry2_not Cry_Chespin - cry2_not Cry_Quilladin - cry2_not Cry_Chesnaught - cry2_not Cry_Fennekin - cry2_not Cry_Braixen - cry2_not Cry_Delphox - cry2_not Cry_Froakie - cry2_not Cry_Frogadier - cry2_not Cry_Greninja - cry2_not Cry_Bunnelby - cry2_not Cry_Diggersby - cry2_not Cry_Fletchling - cry2_not Cry_Fletchinder - cry2_not Cry_Talonflame - cry2_not Cry_Scatterbug - cry2_not Cry_Spewpa - cry2_not Cry_Vivillon - cry2_not Cry_Litleo - cry2_not Cry_Pyroar - cry2_not Cry_Flabebe - cry2_not Cry_Floette - cry2_not Cry_Florges - cry2_not Cry_Skiddo - cry2_not Cry_Gogoat - cry2_not Cry_Pancham - cry2_not Cry_Pangoro - cry2_not Cry_Furfrou - cry2_not Cry_Espurr - cry2_not Cry_Meowstic - cry2_not Cry_Honedge - cry2_not Cry_Doublade - cry2_not Cry_Aegislash - cry2_not Cry_Spritzee - cry2_not Cry_Aromatisse - cry2_not Cry_Swirlix - cry2_not Cry_Slurpuff - cry2_not Cry_Inkay - cry2_not Cry_Malamar - cry2_not Cry_Binacle - cry2_not Cry_Barbaracle - cry2_not Cry_Skrelp - cry2_not Cry_Dragalge - cry2_not Cry_Clauncher - cry2_not Cry_Clawitzer - cry2_not Cry_Helioptile - cry2_not Cry_Heliolisk - cry2_not Cry_Tyrunt - cry2_not Cry_Tyrantrum - cry2_not Cry_Amaura - cry2_not Cry_Aurorus - cry2_not Cry_Sylveon - cry2_not Cry_Hawlucha - cry2_not Cry_Dedenne - cry2_not Cry_Carbink - cry2_not Cry_Goomy - cry2_not Cry_Sliggoo - cry2_not Cry_Goodra - cry2_not Cry_Klefki - cry2_not Cry_Phantump - cry2_not Cry_Trevenant - cry2_not Cry_Pumpkaboo - cry2_not Cry_Gourgeist - cry2_not Cry_Bergmite - cry2_not Cry_Avalugg - cry2_not Cry_Noibat - cry2_not Cry_Noivern - cry2_not Cry_Xerneas - cry2_not Cry_Yveltal - cry2_not Cry_Zygarde - cry2_not Cry_Diancie - cry2_not Cry_Hoopa - cry2_not Cry_Volcanion - cry2_not Cry_Rowlet - cry2_not Cry_Dartrix - cry2_not Cry_Decidueye - cry2_not Cry_Litten - cry2_not Cry_Torracat - cry2_not Cry_Incineroar - cry2_not Cry_Popplio - cry2_not Cry_Brionne - cry2_not Cry_Primarina - cry2_not Cry_Pikipek - cry2_not Cry_Trumbeak - cry2_not Cry_Toucannon - cry2_not Cry_Yungoos - cry2_not Cry_Gumshoos - cry2_not Cry_Grubbin - cry2_not Cry_Charjabug - cry2_not Cry_Vikavolt - cry2_not Cry_Crabrawler - cry2_not Cry_Crabominable - cry2_not Cry_Oricorio - cry2_not Cry_Cutiefly - cry2_not Cry_Ribombee - cry2_not Cry_Rockruff - cry2_not Cry_Lycanroc - cry2_not Cry_Wishiwashi - cry2_not Cry_Mareanie - cry2_not Cry_Toxapex - cry2_not Cry_Mudbray - cry2_not Cry_Mudsdale - cry2_not Cry_Dewpider - cry2_not Cry_Araquanid - cry2_not Cry_Fomantis - cry2_not Cry_Lurantis - cry2_not Cry_Morelull - cry2_not Cry_Shiinotic - cry2_not Cry_Salandit - cry2_not Cry_Salazzle - cry2_not Cry_Stufful - cry2_not Cry_Bewear - cry2_not Cry_Bounsweet - cry2_not Cry_Steenee - cry2_not Cry_Tsareena - cry2_not Cry_Comfey - cry2_not Cry_Oranguru - cry2_not Cry_Passimian - cry2_not Cry_Wimpod - cry2_not Cry_Golisopod - cry2_not Cry_Sandygast - cry2_not Cry_Palossand - cry2_not Cry_Pyukumuku - cry2_not Cry_Type_null - cry2_not Cry_Silvally - cry2_not Cry_Minior - cry2_not Cry_Komala - cry2_not Cry_Turtonator - cry2_not Cry_Togedemaru - cry2_not Cry_Mimikyu - cry2_not Cry_Bruxish - cry2_not Cry_Drampa - cry2_not Cry_Dhelmise - cry2_not Cry_Jangmo_o - cry2_not Cry_Hakamo_o - cry2_not Cry_Kommo_o - cry2_not Cry_Tapu_koko - cry2_not Cry_Tapu_lele - cry2_not Cry_Tapu_bulu - cry2_not Cry_Tapu_fini - cry2_not Cry_Cosmog - cry2_not Cry_Cosmoem - cry2_not Cry_Solgaleo - cry2_not Cry_Lunala - cry2_not Cry_Nihilego - cry2_not Cry_Buzzwole - cry2_not Cry_Pheromosa - cry2_not Cry_Xurkitree - cry2_not Cry_Celesteela - cry2_not Cry_Kartana - cry2_not Cry_Guzzlord - cry2_not Cry_Necrozma - cry2_not Cry_Magearna - cry2_not Cry_Marshadow - cry2_not Cry_Poipole - cry2_not Cry_Naganadel - cry2_not Cry_Stakataka - cry2_not Cry_Blacephalon - cry2_not Cry_Zeraora - cry2_not Cry_Meltan - cry2_not Cry_Melmetal - cry2_not Cry_Grookey - cry2_not Cry_Thwackey - cry2_not Cry_Rillaboom - cry2_not Cry_Scorbunny - cry2_not Cry_Raboot - cry2_not Cry_Cinderace - cry2_not Cry_Sobble - cry2_not Cry_Drizzile - cry2_not Cry_Inteleon - cry2_not Cry_Skwovet - cry2_not Cry_Greedent - cry2_not Cry_Rookidee - cry2_not Cry_Corvisquire - cry2_not Cry_Corviknight - cry2_not Cry_Blipbug - cry2_not Cry_Dottler - cry2_not Cry_Orbeetle - cry2_not Cry_Nickit - cry2_not Cry_Thievul - cry2_not Cry_Gossifleur - cry2_not Cry_Eldegoss - cry2_not Cry_Wooloo - cry2_not Cry_Dubwool - cry2_not Cry_Chewtle - cry2_not Cry_Drednaw - cry2_not Cry_Yamper - cry2_not Cry_Boltund - cry2_not Cry_Rolycoly - cry2_not Cry_Carkol - cry2_not Cry_Coalossal - cry2_not Cry_Applin - cry2_not Cry_Flapple - cry2_not Cry_Appletun - cry2_not Cry_Silicobra - cry2_not Cry_Sandaconda - cry2_not Cry_Cramorant - cry2_not Cry_Arrokuda - cry2_not Cry_Barraskewda - cry2_not Cry_Toxel - cry2_not Cry_Toxtricity - cry2_not Cry_Sizzlipede - cry2_not Cry_Centiskorch - cry2_not Cry_Clobbopus - cry2_not Cry_Grapploct - cry2_not Cry_Sinistea - cry2_not Cry_Polteageist - cry2_not Cry_Hatenna - cry2_not Cry_Hattrem - cry2_not Cry_Hatterene - cry2_not Cry_Impidimp - cry2_not Cry_Morgrem - cry2_not Cry_Grimmsnarl - cry2_not Cry_Obstagoon - cry2_not Cry_Perrserker - cry2_not Cry_Cursola - cry2_not Cry_Sirfetchd - cry2_not Cry_MrRime - cry2_not Cry_Runerigus - cry2_not Cry_Milcery - cry2_not Cry_Alcremie - cry2_not Cry_Falinks - cry2_not Cry_Pincurchin - cry2_not Cry_Snom - cry2_not Cry_Frosmoth - cry2_not Cry_Stonjourner - cry2_not Cry_Eiscue - cry2_not Cry_Indeedee - cry2_not Cry_Morpeko - cry2_not Cry_Cufant - cry2_not Cry_Copperajah - cry2_not Cry_Dracozolt - cry2_not Cry_Arctozolt - cry2_not Cry_Dracovish - cry2_not Cry_Arctovish - cry2_not Cry_Duraludon - cry2_not Cry_Dreepy - cry2_not Cry_Drakloak - cry2_not Cry_Dragapult - cry2_not Cry_Zacian - cry2_not Cry_Zamazenta - cry2_not Cry_Eternatus - cry2_not Cry_Kubfu - cry2_not Cry_Urshifu - cry2_not Cry_Zarude - cry2_not Cry_Regieleki - cry2_not Cry_Regidrago - cry2_not Cry_Glastrier - cry2_not Cry_Spectrier - cry2_not Cry_Calyrex + cry2 Cry_Turtwig + cry2 Cry_Grotle + cry2 Cry_Torterra + cry2 Cry_Chimchar + cry2 Cry_Monferno + cry2 Cry_Infernape + cry2 Cry_Piplup + cry2 Cry_Prinplup + cry2 Cry_Empoleon + cry2 Cry_Starly + cry2 Cry_Staravia + cry2 Cry_Staraptor + cry2 Cry_Bidoof + cry2 Cry_Bibarel + cry2 Cry_Kricketot + cry2 Cry_Kricketune + cry2 Cry_Shinx + cry2 Cry_Luxio + cry2 Cry_Luxray + cry2 Cry_Budew + cry2 Cry_Roserade + cry2 Cry_Cranidos + cry2 Cry_Rampardos + cry2 Cry_Shieldon + cry2 Cry_Bastiodon + cry2 Cry_Burmy + cry2 Cry_Wormadam + cry2 Cry_Mothim + cry2 Cry_Combee + cry2 Cry_Vespiquen + cry2 Cry_Pachirisu + cry2 Cry_Buizel + cry2 Cry_Floatzel + cry2 Cry_Cherubi + cry2 Cry_Cherrim + cry2 Cry_Shellos + cry2 Cry_Gastrodon + cry2 Cry_Ambipom + cry2 Cry_Drifloon + cry2 Cry_Drifblim + cry2 Cry_Buneary + cry2 Cry_Lopunny + cry2 Cry_Mismagius + cry2 Cry_Honchkrow + cry2 Cry_Glameow + cry2 Cry_Purugly + cry2 Cry_Chingling + cry2 Cry_Stunky + cry2 Cry_Skuntank + cry2 Cry_Bronzor + cry2 Cry_Bronzong + cry2 Cry_Bonsly + cry2 Cry_MimeJr + cry2 Cry_Happiny + cry2 Cry_Chatot + cry2 Cry_Spiritomb + cry2 Cry_Gible + cry2 Cry_Gabite + cry2 Cry_Garchomp + cry2 Cry_Munchlax + cry2 Cry_Riolu + cry2 Cry_Lucario + cry2 Cry_Hippopotas + cry2 Cry_Hippowdon + cry2 Cry_Skorupi + cry2 Cry_Drapion + cry2 Cry_Croagunk + cry2 Cry_Toxicroak + cry2 Cry_Carnivine + cry2 Cry_Finneon + cry2 Cry_Lumineon + cry2 Cry_Mantyke + cry2 Cry_Snover + cry2 Cry_Abomasnow + cry2 Cry_Weavile + cry2 Cry_Magnezone + cry2 Cry_Lickilicky + cry2 Cry_Rhyperior + cry2 Cry_Tangrowth + cry2 Cry_Electivire + cry2 Cry_Magmortar + cry2 Cry_Togekiss + cry2 Cry_Yanmega + cry2 Cry_Leafeon + cry2 Cry_Glaceon + cry2 Cry_Gliscor + cry2 Cry_Mamoswine + cry2 Cry_PorygonZ + cry2 Cry_Gallade + cry2 Cry_Probopass + cry2 Cry_Dusknoir + cry2 Cry_Froslass + cry2 Cry_Rotom + cry2 Cry_Uxie + cry2 Cry_Mesprit + cry2 Cry_Azelf + cry2 Cry_Dialga + cry2 Cry_Palkia + cry2 Cry_Heatran + cry2 Cry_Regigigas + cry2 Cry_Giratina + cry2 Cry_Cresselia + cry2 Cry_Phione + cry2 Cry_Manaphy + cry2 Cry_Darkrai + cry2 Cry_Shaymin + cry2 Cry_Arceus + cry2 Cry_Victini + cry2 Cry_Snivy + cry2 Cry_Servine + cry2 Cry_Serperior + cry2 Cry_Tepig + cry2 Cry_Pignite + cry2 Cry_Emboar + cry2 Cry_Oshawott + cry2 Cry_Dewott + cry2 Cry_Samurott + cry2 Cry_Patrat + cry2 Cry_Watchog + cry2 Cry_Lillipup + cry2 Cry_Herdier + cry2 Cry_Stoutland + cry2 Cry_Purrloin + cry2 Cry_Liepard + cry2 Cry_Pansage + cry2 Cry_Simisage + cry2 Cry_Pansear + cry2 Cry_Simisear + cry2 Cry_Panpour + cry2 Cry_Simipour + cry2 Cry_Munna + cry2 Cry_Musharna + cry2 Cry_Pidove + cry2 Cry_Tranquill + cry2 Cry_Unfezant + cry2 Cry_Blitzle + cry2 Cry_Zebstrika + cry2 Cry_Roggenrola + cry2 Cry_Boldore + cry2 Cry_Gigalith + cry2 Cry_Woobat + cry2 Cry_Swoobat + cry2 Cry_Drilbur + cry2 Cry_Excadrill + cry2 Cry_Audino + cry2 Cry_Timburr + cry2 Cry_Gurdurr + cry2 Cry_Conkeldurr + cry2 Cry_Tympole + cry2 Cry_Palpitoad + cry2 Cry_Seismitoad + cry2 Cry_Throh + cry2 Cry_Sawk + cry2 Cry_Sewaddle + cry2 Cry_Swadloon + cry2 Cry_Leavanny + cry2 Cry_Venipede + cry2 Cry_Whirlipede + cry2 Cry_Scolipede + cry2 Cry_Cottonee + cry2 Cry_Whimsicott + cry2 Cry_Petilil + cry2 Cry_Lilligant + cry2 Cry_Basculin + cry2 Cry_Sandile + cry2 Cry_Krokorok + cry2 Cry_Krookodile + cry2 Cry_Darumaka + cry2 Cry_Darmanitan + cry2 Cry_Maractus + cry2 Cry_Dwebble + cry2 Cry_Crustle + cry2 Cry_Scraggy + cry2 Cry_Scrafty + cry2 Cry_Sigilyph + cry2 Cry_Yamask + cry2 Cry_Cofagrigus + cry2 Cry_Tirtouga + cry2 Cry_Carracosta + cry2 Cry_Archen + cry2 Cry_Archeops + cry2 Cry_Trubbish + cry2 Cry_Garbodor + cry2 Cry_Zorua + cry2 Cry_Zoroark + cry2 Cry_Minccino + cry2 Cry_Cinccino + cry2 Cry_Gothita + cry2 Cry_Gothorita + cry2 Cry_Gothitelle + cry2 Cry_Solosis + cry2 Cry_Duosion + cry2 Cry_Reuniclus + cry2 Cry_Ducklett + cry2 Cry_Swanna + cry2 Cry_Vanillite + cry2 Cry_Vanillish + cry2 Cry_Vanilluxe + cry2 Cry_Deerling + cry2 Cry_Sawsbuck + cry2 Cry_Emolga + cry2 Cry_Karrablast + cry2 Cry_Escavalier + cry2 Cry_Foongus + cry2 Cry_Amoonguss + cry2 Cry_Frillish + cry2 Cry_Jellicent + cry2 Cry_Alomomola + cry2 Cry_Joltik + cry2 Cry_Galvantula + cry2 Cry_Ferroseed + cry2 Cry_Ferrothorn + cry2 Cry_Klink + cry2 Cry_Klang + cry2 Cry_Klinklang + cry2 Cry_Tynamo + cry2 Cry_Eelektrik + cry2 Cry_Eelektross + cry2 Cry_Elgyem + cry2 Cry_Beheeyem + cry2 Cry_Litwick + cry2 Cry_Lampent + cry2 Cry_Chandelure + cry2 Cry_Axew + cry2 Cry_Fraxure + cry2 Cry_Haxorus + cry2 Cry_Cubchoo + cry2 Cry_Beartic + cry2 Cry_Cryogonal + cry2 Cry_Shelmet + cry2 Cry_Accelgor + cry2 Cry_Stunfisk + cry2 Cry_Mienfoo + cry2 Cry_Mienshao + cry2 Cry_Druddigon + cry2 Cry_Golett + cry2 Cry_Golurk + cry2 Cry_Pawniard + cry2 Cry_Bisharp + cry2 Cry_Bouffalant + cry2 Cry_Rufflet + cry2 Cry_Braviary + cry2 Cry_Vullaby + cry2 Cry_Mandibuzz + cry2 Cry_Heatmor + cry2 Cry_Durant + cry2 Cry_Deino + cry2 Cry_Zweilous + cry2 Cry_Hydreigon + cry2 Cry_Larvesta + cry2 Cry_Volcarona + cry2 Cry_Cobalion + cry2 Cry_Terrakion + cry2 Cry_Virizion + cry2 Cry_Tornadus + cry2 Cry_Thundurus + cry2 Cry_Reshiram + cry2 Cry_Zekrom + cry2 Cry_Landorus + cry2 Cry_Kyurem + cry2 Cry_Keldeo + cry2 Cry_Meloetta + cry2 Cry_Genesect + cry2_uncomp Cry_Chespin + cry2_uncomp Cry_Quilladin + cry2_uncomp Cry_Chesnaught + cry2_uncomp Cry_Fennekin + cry2_uncomp Cry_Braixen + cry2_uncomp Cry_Delphox + cry2_uncomp Cry_Froakie + cry2_uncomp Cry_Frogadier + cry2_uncomp Cry_Greninja + cry2_uncomp Cry_Bunnelby + cry2_uncomp Cry_Diggersby + cry2_uncomp Cry_Fletchling + cry2_uncomp Cry_Fletchinder + cry2_uncomp Cry_Talonflame + cry2_uncomp Cry_Scatterbug + cry2_uncomp Cry_Spewpa + cry2_uncomp Cry_Vivillon + cry2_uncomp Cry_Litleo + cry2_uncomp Cry_Pyroar + cry2_uncomp Cry_Flabebe + cry2_uncomp Cry_Floette + cry2_uncomp Cry_Florges + cry2_uncomp Cry_Skiddo + cry2_uncomp Cry_Gogoat + cry2_uncomp Cry_Pancham + cry2_uncomp Cry_Pangoro + cry2_uncomp Cry_Furfrou + cry2_uncomp Cry_Espurr + cry2_uncomp Cry_Meowstic + cry2_uncomp Cry_Honedge + cry2_uncomp Cry_Doublade + cry2_uncomp Cry_Aegislash + cry2_uncomp Cry_Spritzee + cry2_uncomp Cry_Aromatisse + cry2_uncomp Cry_Swirlix + cry2_uncomp Cry_Slurpuff + cry2_uncomp Cry_Inkay + cry2_uncomp Cry_Malamar + cry2_uncomp Cry_Binacle + cry2_uncomp Cry_Barbaracle + cry2_uncomp Cry_Skrelp + cry2_uncomp Cry_Dragalge + cry2_uncomp Cry_Clauncher + cry2_uncomp Cry_Clawitzer + cry2_uncomp Cry_Helioptile + cry2_uncomp Cry_Heliolisk + cry2_uncomp Cry_Tyrunt + cry2_uncomp Cry_Tyrantrum + cry2_uncomp Cry_Amaura + cry2_uncomp Cry_Aurorus + cry2_uncomp Cry_Sylveon + cry2_uncomp Cry_Hawlucha + cry2_uncomp Cry_Dedenne + cry2_uncomp Cry_Carbink + cry2_uncomp Cry_Goomy + cry2_uncomp Cry_Sliggoo + cry2_uncomp Cry_Goodra + cry2_uncomp Cry_Klefki + cry2_uncomp Cry_Phantump + cry2_uncomp Cry_Trevenant + cry2_uncomp Cry_Pumpkaboo + cry2_uncomp Cry_Gourgeist + cry2_uncomp Cry_Bergmite + cry2_uncomp Cry_Avalugg + cry2_uncomp Cry_Noibat + cry2_uncomp Cry_Noivern + cry2_uncomp Cry_Xerneas + cry2_uncomp Cry_Yveltal + cry2_uncomp Cry_Zygarde + cry2_uncomp Cry_Diancie + cry2_uncomp Cry_Hoopa + cry2_uncomp Cry_Volcanion + cry2_uncomp Cry_Rowlet + cry2_uncomp Cry_Dartrix + cry2_uncomp Cry_Decidueye + cry2_uncomp Cry_Litten + cry2_uncomp Cry_Torracat + cry2_uncomp Cry_Incineroar + cry2_uncomp Cry_Popplio + cry2_uncomp Cry_Brionne + cry2_uncomp Cry_Primarina + cry2_uncomp Cry_Pikipek + cry2_uncomp Cry_Trumbeak + cry2_uncomp Cry_Toucannon + cry2_uncomp Cry_Yungoos + cry2_uncomp Cry_Gumshoos + cry2_uncomp Cry_Grubbin + cry2_uncomp Cry_Charjabug + cry2_uncomp Cry_Vikavolt + cry2_uncomp Cry_Crabrawler + cry2_uncomp Cry_Crabominable + cry2_uncomp Cry_Oricorio + cry2_uncomp Cry_Cutiefly + cry2_uncomp Cry_Ribombee + cry2_uncomp Cry_Rockruff + cry2_uncomp Cry_Lycanroc + cry2_uncomp Cry_Wishiwashi + cry2_uncomp Cry_Mareanie + cry2_uncomp Cry_Toxapex + cry2_uncomp Cry_Mudbray + cry2_uncomp Cry_Mudsdale + cry2_uncomp Cry_Dewpider + cry2_uncomp Cry_Araquanid + cry2_uncomp Cry_Fomantis + cry2_uncomp Cry_Lurantis + cry2_uncomp Cry_Morelull + cry2_uncomp Cry_Shiinotic + cry2_uncomp Cry_Salandit + cry2_uncomp Cry_Salazzle + cry2_uncomp Cry_Stufful + cry2_uncomp Cry_Bewear + cry2_uncomp Cry_Bounsweet + cry2_uncomp Cry_Steenee + cry2_uncomp Cry_Tsareena + cry2_uncomp Cry_Comfey + cry2_uncomp Cry_Oranguru + cry2_uncomp Cry_Passimian + cry2_uncomp Cry_Wimpod + cry2_uncomp Cry_Golisopod + cry2_uncomp Cry_Sandygast + cry2_uncomp Cry_Palossand + cry2_uncomp Cry_Pyukumuku + cry2_uncomp Cry_TypeNull + cry2_uncomp Cry_Silvally + cry2_uncomp Cry_Minior + cry2_uncomp Cry_Komala + cry2_uncomp Cry_Turtonator + cry2_uncomp Cry_Togedemaru + cry2_uncomp Cry_Mimikyu + cry2_uncomp Cry_Bruxish + cry2_uncomp Cry_Drampa + cry2_uncomp Cry_Dhelmise + cry2_uncomp Cry_Jangmoo + cry2_uncomp Cry_Hakamoo + cry2_uncomp Cry_Kommoo + cry2_uncomp Cry_TapuKoko + cry2_uncomp Cry_TapuLele + cry2_uncomp Cry_TapuBulu + cry2_uncomp Cry_TapuFini + cry2_uncomp Cry_Cosmog + cry2_uncomp Cry_Cosmoem + cry2_uncomp Cry_Solgaleo + cry2_uncomp Cry_Lunala + cry2_uncomp Cry_Nihilego + cry2_uncomp Cry_Buzzwole + cry2_uncomp Cry_Pheromosa + cry2_uncomp Cry_Xurkitree + cry2_uncomp Cry_Celesteela + cry2_uncomp Cry_Kartana + cry2_uncomp Cry_Guzzlord + cry2_uncomp Cry_Necrozma + cry2_uncomp Cry_Magearna + cry2_uncomp Cry_Marshadow + cry2_uncomp Cry_Poipole + cry2_uncomp Cry_Naganadel + cry2_uncomp Cry_Stakataka + cry2_uncomp Cry_Blacephalon + cry2_uncomp Cry_Zeraora + cry2_uncomp Cry_Meltan + cry2_uncomp Cry_Melmetal + cry2_uncomp Cry_Grookey + cry2_uncomp Cry_Thwackey + cry2_uncomp Cry_Rillaboom + cry2_uncomp Cry_Scorbunny + cry2_uncomp Cry_Raboot + cry2_uncomp Cry_Cinderace + cry2_uncomp Cry_Sobble + cry2_uncomp Cry_Drizzile + cry2_uncomp Cry_Inteleon + cry2_uncomp Cry_Skwovet + cry2_uncomp Cry_Greedent + cry2_uncomp Cry_Rookidee + cry2_uncomp Cry_Corvisquire + cry2_uncomp Cry_Corviknight + cry2_uncomp Cry_Blipbug + cry2_uncomp Cry_Dottler + cry2_uncomp Cry_Orbeetle + cry2_uncomp Cry_Nickit + cry2_uncomp Cry_Thievul + cry2_uncomp Cry_Gossifleur + cry2_uncomp Cry_Eldegoss + cry2_uncomp Cry_Wooloo + cry2_uncomp Cry_Dubwool + cry2_uncomp Cry_Chewtle + cry2_uncomp Cry_Drednaw + cry2_uncomp Cry_Yamper + cry2_uncomp Cry_Boltund + cry2_uncomp Cry_Rolycoly + cry2_uncomp Cry_Carkol + cry2_uncomp Cry_Coalossal + cry2_uncomp Cry_Applin + cry2_uncomp Cry_Flapple + cry2_uncomp Cry_Appletun + cry2_uncomp Cry_Silicobra + cry2_uncomp Cry_Sandaconda + cry2_uncomp Cry_Cramorant + cry2_uncomp Cry_Arrokuda + cry2_uncomp Cry_Barraskewda + cry2_uncomp Cry_Toxel + cry2_uncomp Cry_Toxtricity + cry2_uncomp Cry_Sizzlipede + cry2_uncomp Cry_Centiskorch + cry2_uncomp Cry_Clobbopus + cry2_uncomp Cry_Grapploct + cry2_uncomp Cry_Sinistea + cry2_uncomp Cry_Polteageist + cry2_uncomp Cry_Hatenna + cry2_uncomp Cry_Hattrem + cry2_uncomp Cry_Hatterene + cry2_uncomp Cry_Impidimp + cry2_uncomp Cry_Morgrem + cry2_uncomp Cry_Grimmsnarl + cry2_uncomp Cry_Obstagoon + cry2_uncomp Cry_Perrserker + cry2_uncomp Cry_Cursola + cry2_uncomp Cry_Sirfetchd + cry2_uncomp Cry_MrRime + cry2_uncomp Cry_Runerigus + cry2_uncomp Cry_Milcery + cry2_uncomp Cry_Alcremie + cry2_uncomp Cry_Falinks + cry2_uncomp Cry_Pincurchin + cry2_uncomp Cry_Snom + cry2_uncomp Cry_Frosmoth + cry2_uncomp Cry_Stonjourner + cry2_uncomp Cry_Eiscue + cry2_uncomp Cry_Indeedee + cry2_uncomp Cry_Morpeko + cry2_uncomp Cry_Cufant + cry2_uncomp Cry_Copperajah + cry2_uncomp Cry_Dracozolt + cry2_uncomp Cry_Arctozolt + cry2_uncomp Cry_Dracovish + cry2_uncomp Cry_Arctovish + cry2_uncomp Cry_Duraludon + cry2_uncomp Cry_Dreepy + cry2_uncomp Cry_Drakloak + cry2_uncomp Cry_Dragapult + cry2_uncomp Cry_Zacian + cry2_uncomp Cry_Zamazenta + cry2_uncomp Cry_Eternatus + cry2_uncomp Cry_Kubfu + cry2_uncomp Cry_Urshifu + cry2_uncomp Cry_Zarude + cry2_uncomp Cry_Regieleki + cry2_uncomp Cry_Regidrago + cry2_uncomp Cry_Glastrier + cry2_uncomp Cry_Spectrier + cry2_uncomp Cry_Calyrex @ Megas - cry2_not Cry_Venusaur_Mega - cry2_not Cry_Charizard_Mega_X - cry2_not Cry_Charizard_Mega_Y - cry2_not Cry_Blastoise_Mega - cry2_not Cry_Beedrill_Mega - cry2_not Cry_Pidgeot_Mega - cry2_not Cry_Alakazam_Mega - cry2_not Cry_Slowbro_Mega - cry2_not Cry_Gengar_Mega - cry2_not Cry_Kangaskhan_Mega - cry2_not Cry_Pinsir_Mega - cry2_not Cry_Gyarados_Mega - cry2_not Cry_Aerodactyl_Mega - cry2_not Cry_Mewtwo_Mega_X - cry2_not Cry_Mewtwo_Mega_Y - cry2_not Cry_Ampharos_Mega - cry2_not Cry_Steelix_Mega - cry2_not Cry_Scizor_Mega - cry2_not Cry_Heracross_Mega - cry2_not Cry_Houndoom_Mega - cry2_not Cry_Tyranitar_Mega - cry2_not Cry_Sceptile_Mega - cry2_not Cry_Blaziken_Mega - cry2_not Cry_Swampert_Mega - cry2_not Cry_Gardevoir_Mega - cry2_not Cry_Sableye_Mega - cry2_not Cry_Mawile_Mega - cry2_not Cry_Aggron_Mega - cry2_not Cry_Medicham_Mega - cry2_not Cry_Manectric_Mega - cry2_not Cry_Sharpedo_Mega - cry2_not Cry_Camerupt_Mega - cry2_not Cry_Altaria_Mega - cry2_not Cry_Banette_Mega - cry2_not Cry_Absol_Mega - cry2_not Cry_Glalie_Mega - cry2_not Cry_Salamence_Mega - cry2_not Cry_Metagross_Mega - cry2_not Cry_Latias_Mega - cry2_not Cry_Latios_Mega - cry2_not Cry_Lopunny_Mega - cry2_not Cry_Garchomp_Mega - cry2_not Cry_Lucario_Mega - cry2_not Cry_Abomasnow_Mega - cry2_not Cry_Gallade_Mega - cry2_not Cry_Audino_Mega - cry2_not Cry_Diancie_Mega + cry2_uncomp Cry_VenusaurMega + cry2_uncomp Cry_CharizardMegaX + cry2_uncomp Cry_CharizardMegaY + cry2_uncomp Cry_BlastoiseMega + cry2_uncomp Cry_BeedrillMega + cry2_uncomp Cry_PidgeotMega + cry2_uncomp Cry_AlakazamMega + cry2_uncomp Cry_SlowbroMega + cry2_uncomp Cry_GengarMega + cry2_uncomp Cry_KangaskhanMega + cry2_uncomp Cry_PinsirMega + cry2_uncomp Cry_GyaradosMega + cry2_uncomp Cry_AerodactylMega + cry2_uncomp Cry_MewtwoMegaX + cry2_uncomp Cry_MewtwoMegaY + cry2_uncomp Cry_AmpharosMega + cry2_uncomp Cry_SteelixMega + cry2_uncomp Cry_ScizorMega + cry2_uncomp Cry_HeracrossMega + cry2_uncomp Cry_HoundoomMega + cry2_uncomp Cry_TyranitarMega + cry2_uncomp Cry_SceptileMega + cry2_uncomp Cry_BlazikenMega + cry2_uncomp Cry_SwampertMega + cry2_uncomp Cry_GardevoirMega + cry2_uncomp Cry_SableyeMega + cry2_uncomp Cry_MawileMega + cry2_uncomp Cry_AggronMega + cry2_uncomp Cry_MedichamMega + cry2_uncomp Cry_ManectricMega + cry2_uncomp Cry_SharpedoMega + cry2_uncomp Cry_CameruptMega + cry2_uncomp Cry_AltariaMega + cry2_uncomp Cry_BanetteMega + cry2_uncomp Cry_AbsolMega + cry2_uncomp Cry_GlalieMega + cry2_uncomp Cry_SalamenceMega + cry2_uncomp Cry_MetagrossMega + cry2_uncomp Cry_LatiasMega + cry2_uncomp Cry_LatiosMega + cry2_uncomp Cry_LopunnyMega + cry2_uncomp Cry_GarchompMega + cry2_uncomp Cry_LucarioMega + cry2_uncomp Cry_AbomasnowMega + cry2_uncomp Cry_GalladeMega + cry2_uncomp Cry_AudinoMega + cry2_uncomp Cry_DiancieMega @ Special Mega + Primals - cry2_not Cry_Rayquaza_Mega - cry2_not Cry_Kyogre_Primal - cry2_not Cry_Groudon_Primal + cry2_uncomp Cry_RayquazaMega + cry2_uncomp Cry_KyogrePrimal + cry2_uncomp Cry_GroudonPrimal @ Alolan Forms cry2 Cry_Rattata cry2 Cry_Raticate @@ -2248,7 +2248,7 @@ gCryTable2:: @ 869EF24 cry2 Cry_Meowth cry2 Cry_Ponyta cry2 Cry_Rapidash - cry2_not Cry_Slowpoke_Galarian + cry2_uncomp Cry_SlowpokeGalarian cry2 Cry_Slowbro cry2 Cry_Farfetchd cry2 Cry_Weezing @@ -2260,10 +2260,10 @@ gCryTable2:: @ 869EF24 cry2 Cry_Corsola cry2 Cry_Zigzagoon cry2 Cry_Linoone - cry2_not Cry_Darumaka - cry2_not Cry_Darmanitan - cry2_not Cry_Yamask - cry2_not Cry_Stunfisk + cry2 Cry_Darumaka + cry2 Cry_Darmanitan + cry2 Cry_Yamask + cry2 Cry_Stunfisk @ Misc Forms @ Cosplay Pikachu cry2 Cry_Pikachu @ 869DE14 @@ -2320,229 +2320,229 @@ gCryTable2:: @ 869EF24 cry2 Cry_Deoxys cry2 Cry_Deoxys @ Burmy - cry2_not Cry_Burmy - cry2_not Cry_Burmy + cry2 Cry_Burmy + cry2 Cry_Burmy @ Wormadam - cry2_not Cry_Wormadam - cry2_not Cry_Wormadam + cry2 Cry_Wormadam + cry2 Cry_Wormadam @ Cherrim - cry2_not Cry_Cherrim + cry2 Cry_Cherrim @ Shellos - cry2_not Cry_Shellos + cry2 Cry_Shellos @ Gastrodon - cry2_not Cry_Gastrodon + cry2 Cry_Gastrodon @ Rotom - cry2_not Cry_Rotom - cry2_not Cry_Rotom - cry2_not Cry_Rotom - cry2_not Cry_Rotom - cry2_not Cry_Rotom + cry2 Cry_Rotom + cry2 Cry_Rotom + cry2 Cry_Rotom + cry2 Cry_Rotom + cry2 Cry_Rotom @ Giratina - cry2_not Cry_Giratina + cry2 Cry_Giratina @ Shaymin - cry2_not Cry_Shaymin_Sky + cry2 Cry_ShayminSky @ Arceus - cry2_not Cry_Arceus - cry2_not Cry_Arceus - cry2_not Cry_Arceus - cry2_not Cry_Arceus - cry2_not Cry_Arceus - cry2_not Cry_Arceus - cry2_not Cry_Arceus - cry2_not Cry_Arceus - cry2_not Cry_Arceus - cry2_not Cry_Arceus - cry2_not Cry_Arceus - cry2_not Cry_Arceus - cry2_not Cry_Arceus - cry2_not Cry_Arceus - cry2_not Cry_Arceus - cry2_not Cry_Arceus - cry2_not Cry_Arceus + cry2 Cry_Arceus + cry2 Cry_Arceus + cry2 Cry_Arceus + cry2 Cry_Arceus + cry2 Cry_Arceus + cry2 Cry_Arceus + cry2 Cry_Arceus + cry2 Cry_Arceus + cry2 Cry_Arceus + cry2 Cry_Arceus + cry2 Cry_Arceus + cry2 Cry_Arceus + cry2 Cry_Arceus + cry2 Cry_Arceus + cry2 Cry_Arceus + cry2 Cry_Arceus + cry2 Cry_Arceus @ Basculin - cry2_not Cry_Basculin + cry2 Cry_Basculin @ Darmanitan - cry2_not Cry_Darmanitan - cry2_not Cry_Darmanitan + cry2 Cry_Darmanitan + cry2 Cry_Darmanitan @ Deerling - cry2_not Cry_Deerling - cry2_not Cry_Deerling - cry2_not Cry_Deerling + cry2 Cry_Deerling + cry2 Cry_Deerling + cry2 Cry_Deerling @ Sawsbuck - cry2_not Cry_Sawsbuck - cry2_not Cry_Sawsbuck - cry2_not Cry_Sawsbuck + cry2 Cry_Sawsbuck + cry2 Cry_Sawsbuck + cry2 Cry_Sawsbuck @ Therian Forms - cry2_not Cry_Tornadus_Therian - cry2_not Cry_Thundurus_Therian - cry2_not Cry_Landorus_Therian + cry2 Cry_TornadusTherian + cry2 Cry_ThundurusTherian + cry2 Cry_LandorusTherian @ Kyurem - cry2_not Cry_Kyurem_White - cry2_not Cry_Kyurem_Black + cry2 Cry_KyuremWhite + cry2 Cry_KyuremBlack @ Keldeo - cry2_not Cry_Keldeo + cry2 Cry_Keldeo @ Meloetta - cry2_not Cry_Meloetta + cry2 Cry_Meloetta @ Genesect - cry2_not Cry_Genesect - cry2_not Cry_Genesect - cry2_not Cry_Genesect - cry2_not Cry_Genesect + cry2 Cry_Genesect + cry2 Cry_Genesect + cry2 Cry_Genesect + cry2 Cry_Genesect @ Greninja - cry2_not Cry_Greninja - cry2_not Cry_Greninja + cry2_uncomp Cry_Greninja + cry2_uncomp Cry_Greninja @ Vivillon - cry2_not Cry_Vivillon - cry2_not Cry_Vivillon - cry2_not Cry_Vivillon - cry2_not Cry_Vivillon - cry2_not Cry_Vivillon - cry2_not Cry_Vivillon - cry2_not Cry_Vivillon - cry2_not Cry_Vivillon - cry2_not Cry_Vivillon - cry2_not Cry_Vivillon - cry2_not Cry_Vivillon - cry2_not Cry_Vivillon - cry2_not Cry_Vivillon - cry2_not Cry_Vivillon - cry2_not Cry_Vivillon - cry2_not Cry_Vivillon - cry2_not Cry_Vivillon - cry2_not Cry_Vivillon - cry2_not Cry_Vivillon + cry2_uncomp Cry_Vivillon + cry2_uncomp Cry_Vivillon + cry2_uncomp Cry_Vivillon + cry2_uncomp Cry_Vivillon + cry2_uncomp Cry_Vivillon + cry2_uncomp Cry_Vivillon + cry2_uncomp Cry_Vivillon + cry2_uncomp Cry_Vivillon + cry2_uncomp Cry_Vivillon + cry2_uncomp Cry_Vivillon + cry2_uncomp Cry_Vivillon + cry2_uncomp Cry_Vivillon + cry2_uncomp Cry_Vivillon + cry2_uncomp Cry_Vivillon + cry2_uncomp Cry_Vivillon + cry2_uncomp Cry_Vivillon + cry2_uncomp Cry_Vivillon + cry2_uncomp Cry_Vivillon + cry2_uncomp Cry_Vivillon @ Flabébé - cry2_not Cry_Flabebe - cry2_not Cry_Flabebe - cry2_not Cry_Flabebe - cry2_not Cry_Flabebe + cry2_uncomp Cry_Flabebe + cry2_uncomp Cry_Flabebe + cry2_uncomp Cry_Flabebe + cry2_uncomp Cry_Flabebe @ Floette - cry2_not Cry_Floette - cry2_not Cry_Floette - cry2_not Cry_Floette - cry2_not Cry_Floette - cry2_not Cry_Floette_Eternal_Flower + cry2_uncomp Cry_Floette + cry2_uncomp Cry_Floette + cry2_uncomp Cry_Floette + cry2_uncomp Cry_Floette + cry2_uncomp Cry_FloetteEternalFlower @ Florges - cry2_not Cry_Florges - cry2_not Cry_Florges - cry2_not Cry_Florges - cry2_not Cry_Florges + cry2_uncomp Cry_Florges + cry2_uncomp Cry_Florges + cry2_uncomp Cry_Florges + cry2_uncomp Cry_Florges @ Furfrou - cry2_not Cry_Furfrou - cry2_not Cry_Furfrou - cry2_not Cry_Furfrou - cry2_not Cry_Furfrou - cry2_not Cry_Furfrou - cry2_not Cry_Furfrou - cry2_not Cry_Furfrou - cry2_not Cry_Furfrou - cry2_not Cry_Furfrou + cry2_uncomp Cry_Furfrou + cry2_uncomp Cry_Furfrou + cry2_uncomp Cry_Furfrou + cry2_uncomp Cry_Furfrou + cry2_uncomp Cry_Furfrou + cry2_uncomp Cry_Furfrou + cry2_uncomp Cry_Furfrou + cry2_uncomp Cry_Furfrou + cry2_uncomp Cry_Furfrou @ Meowstic - cry2_not Cry_Meowstic + cry2_uncomp Cry_Meowstic @ Aegislash - cry2_not Cry_Aegislash + cry2_uncomp Cry_Aegislash @ Pumpkaboo - cry2_not Cry_Pumpkaboo - cry2_not Cry_Pumpkaboo - cry2_not Cry_Pumpkaboo_Super + cry2_uncomp Cry_Pumpkaboo + cry2_uncomp Cry_Pumpkaboo + cry2_uncomp Cry_PumpkabooSuper @ Gourgeist - cry2_not Cry_Gourgeist - cry2_not Cry_Gourgeist - cry2_not Cry_Gourgeist_Super + cry2_uncomp Cry_Gourgeist + cry2_uncomp Cry_Gourgeist + cry2_uncomp Cry_GourgeistSuper @ Xerneas - cry2_not Cry_Xerneas + cry2_uncomp Cry_Xerneas @ Zygarde - cry2_not Cry_Zygarde_10 - cry2_not Cry_Zygarde_10 - cry2_not Cry_Zygarde - cry2_not Cry_Zygarde_Complete + cry2_uncomp Cry_Zygarde10 + cry2_uncomp Cry_Zygarde10 + cry2_uncomp Cry_Zygarde + cry2_uncomp Cry_ZygardeComplete @ Hoopa - cry2_not Cry_Hoopa_Unbound + cry2_uncomp Cry_HoopaUnbound @ Oricorio - cry2_not Cry_Oricorio_Pom_Pom - cry2_not Cry_Oricorio_Pa_u - cry2_not Cry_Oricorio_Sensu + cry2_uncomp Cry_OricorioPomPom + cry2_uncomp Cry_OricorioPau + cry2_uncomp Cry_OricorioSensu @ Rockruff - cry2_not Cry_Rockruff + cry2_uncomp Cry_Rockruff @ Lycanroc - cry2_not Cry_Lycanroc_Midnight - cry2_not Cry_Lycanroc_Dusk + cry2_uncomp Cry_LycanrocMidnight + cry2_uncomp Cry_LycanrocDusk @ Wishiwashi - cry2_not Cry_Wishiwashi_School + cry2_uncomp Cry_WishiwashiSchool @ Silvally - cry2_not Cry_Silvally - cry2_not Cry_Silvally - cry2_not Cry_Silvally - cry2_not Cry_Silvally - cry2_not Cry_Silvally - cry2_not Cry_Silvally - cry2_not Cry_Silvally - cry2_not Cry_Silvally - cry2_not Cry_Silvally - cry2_not Cry_Silvally - cry2_not Cry_Silvally - cry2_not Cry_Silvally - cry2_not Cry_Silvally - cry2_not Cry_Silvally - cry2_not Cry_Silvally - cry2_not Cry_Silvally - cry2_not Cry_Silvally + cry2_uncomp Cry_Silvally + cry2_uncomp Cry_Silvally + cry2_uncomp Cry_Silvally + cry2_uncomp Cry_Silvally + cry2_uncomp Cry_Silvally + cry2_uncomp Cry_Silvally + cry2_uncomp Cry_Silvally + cry2_uncomp Cry_Silvally + cry2_uncomp Cry_Silvally + cry2_uncomp Cry_Silvally + cry2_uncomp Cry_Silvally + cry2_uncomp Cry_Silvally + cry2_uncomp Cry_Silvally + cry2_uncomp Cry_Silvally + cry2_uncomp Cry_Silvally + cry2_uncomp Cry_Silvally + cry2_uncomp Cry_Silvally @ Minior - cry2_not Cry_Minior - cry2_not Cry_Minior - cry2_not Cry_Minior - cry2_not Cry_Minior - cry2_not Cry_Minior - cry2_not Cry_Minior - cry2_not Cry_Minior - cry2_not Cry_Minior - cry2_not Cry_Minior - cry2_not Cry_Minior - cry2_not Cry_Minior - cry2_not Cry_Minior - cry2_not Cry_Minior + cry2_uncomp Cry_Minior + cry2_uncomp Cry_Minior + cry2_uncomp Cry_Minior + cry2_uncomp Cry_Minior + cry2_uncomp Cry_Minior + cry2_uncomp Cry_Minior + cry2_uncomp Cry_Minior + cry2_uncomp Cry_Minior + cry2_uncomp Cry_Minior + cry2_uncomp Cry_Minior + cry2_uncomp Cry_Minior + cry2_uncomp Cry_Minior + cry2_uncomp Cry_Minior @ Mimikyu - cry2_not Cry_Mimikyu + cry2_uncomp Cry_Mimikyu @ Necrozma - cry2_not Cry_Necrozma_Dusk_Mane - cry2_not Cry_Necrozma_Dawn_Wings - cry2_not Cry_Necrozma_Ultra + cry2_uncomp Cry_NecrozmaDuskMane + cry2_uncomp Cry_NecrozmaDawnWings + cry2_uncomp Cry_NecrozmaUltra @ Magearna - cry2_not Cry_Magearna + cry2_uncomp Cry_Magearna @ Cramorant - cry2_not Cry_Cramorant - cry2_not Cry_Cramorant + cry2_uncomp Cry_Cramorant + cry2_uncomp Cry_Cramorant @ Toxtricity - cry2_not Cry_Toxtricity_Low_Key + cry2_uncomp Cry_ToxtricityLowKey @ Sinistea - cry2_not Cry_Sinistea + cry2_uncomp Cry_Sinistea @ Polteageist - cry2_not Cry_Polteageist + cry2_uncomp Cry_Polteageist @ Alcremie - cry2_not Cry_Alcremie - cry2_not Cry_Alcremie - cry2_not Cry_Alcremie - cry2_not Cry_Alcremie - cry2_not Cry_Alcremie - cry2_not Cry_Alcremie - cry2_not Cry_Alcremie - cry2_not Cry_Alcremie + cry2_uncomp Cry_Alcremie + cry2_uncomp Cry_Alcremie + cry2_uncomp Cry_Alcremie + cry2_uncomp Cry_Alcremie + cry2_uncomp Cry_Alcremie + cry2_uncomp Cry_Alcremie + cry2_uncomp Cry_Alcremie + cry2_uncomp Cry_Alcremie @ Eiscue - cry2_not Cry_Eiscue_Noice_Face + cry2_uncomp Cry_EiscueNoiceFace @ Indeedee - cry2_not Cry_Indeedee_Female + cry2_uncomp Cry_IndeedeeFemale @ Morpeko - cry2_not Cry_Morpeko_Hangry + cry2_uncomp Cry_MorpekoHangry @ Zacian - cry2_not Cry_Zacian_Crowned_Sword + cry2_uncomp Cry_ZacianCrownedSword @ Zamazenta - cry2_not Cry_Zamazenta_Crowned_Shield + cry2_uncomp Cry_ZamazentaCrownedShield @ Eternatus - cry2_not Cry_Eternatus_Eternamax + cry2_uncomp Cry_EternatusEternamax @ Urshifu - cry2_not Cry_Urshifu_Rapid_Strike_Style + cry2_uncomp Cry_UrshifuRapidStrikeStyle @ Zarude - cry2_not Cry_Zarude + cry2_uncomp Cry_Zarude @ Calyrex - cry2_not Cry_Calyrex_Ice_Rider - cry2_not Cry_Calyrex_Shadow_Rider + cry2_uncomp Cry_CalyrexIceRider + cry2_uncomp Cry_CalyrexShadowRider diff --git a/sound/direct_sound_data.inc b/sound/direct_sound_data.inc index 9fb88f6cf..ec4d9744a 100644 --- a/sound/direct_sound_data.inc +++ b/sound/direct_sound_data.inc @@ -388,3923 +388,3923 @@ DirectSoundWaveData_8745A7C:: .align 2 Cry_Bulbasaur:: - .incbin "sound/direct_sound_samples/cries/cry_bulbasaur.bin" + .incbin "sound/direct_sound_samples/cries/bulbasaur.bin" .align 2 Cry_Ivysaur:: - .incbin "sound/direct_sound_samples/cries/cry_ivysaur.bin" + .incbin "sound/direct_sound_samples/cries/ivysaur.bin" .align 2 Cry_Venusaur:: - .incbin "sound/direct_sound_samples/cries/cry_venusaur.bin" + .incbin "sound/direct_sound_samples/cries/venusaur.bin" .align 2 Cry_Charmander:: - .incbin "sound/direct_sound_samples/cries/cry_charmander.bin" + .incbin "sound/direct_sound_samples/cries/charmander.bin" .align 2 Cry_Charmeleon:: - .incbin "sound/direct_sound_samples/cries/cry_charmeleon.bin" + .incbin "sound/direct_sound_samples/cries/charmeleon.bin" .align 2 Cry_Charizard:: - .incbin "sound/direct_sound_samples/cries/cry_charizard.bin" + .incbin "sound/direct_sound_samples/cries/charizard.bin" .align 2 Cry_Squirtle:: - .incbin "sound/direct_sound_samples/cries/cry_squirtle.bin" + .incbin "sound/direct_sound_samples/cries/squirtle.bin" .align 2 Cry_Wartortle:: - .incbin "sound/direct_sound_samples/cries/cry_wartortle.bin" + .incbin "sound/direct_sound_samples/cries/wartortle.bin" .align 2 Cry_Blastoise:: - .incbin "sound/direct_sound_samples/cries/cry_blastoise.bin" + .incbin "sound/direct_sound_samples/cries/blastoise.bin" .align 2 Cry_Caterpie:: - .incbin "sound/direct_sound_samples/cries/cry_caterpie.bin" + .incbin "sound/direct_sound_samples/cries/caterpie.bin" .align 2 Cry_Metapod:: - .incbin "sound/direct_sound_samples/cries/cry_metapod.bin" + .incbin "sound/direct_sound_samples/cries/metapod.bin" .align 2 Cry_Butterfree:: - .incbin "sound/direct_sound_samples/cries/cry_butterfree.bin" + .incbin "sound/direct_sound_samples/cries/butterfree.bin" .align 2 Cry_Weedle:: - .incbin "sound/direct_sound_samples/cries/cry_weedle.bin" + .incbin "sound/direct_sound_samples/cries/weedle.bin" .align 2 Cry_Kakuna:: - .incbin "sound/direct_sound_samples/cries/cry_kakuna.bin" + .incbin "sound/direct_sound_samples/cries/kakuna.bin" .align 2 Cry_Beedrill:: - .incbin "sound/direct_sound_samples/cries/cry_beedrill.bin" + .incbin "sound/direct_sound_samples/cries/beedrill.bin" .align 2 Cry_Pidgey:: - .incbin "sound/direct_sound_samples/cries/cry_pidgey.bin" + .incbin "sound/direct_sound_samples/cries/pidgey.bin" .align 2 Cry_Pidgeotto:: - .incbin "sound/direct_sound_samples/cries/cry_pidgeotto.bin" + .incbin "sound/direct_sound_samples/cries/pidgeotto.bin" .align 2 Cry_Pidgeot:: - .incbin "sound/direct_sound_samples/cries/cry_pidgeot.bin" + .incbin "sound/direct_sound_samples/cries/pidgeot.bin" .align 2 Cry_Rattata:: - .incbin "sound/direct_sound_samples/cries/cry_rattata.bin" + .incbin "sound/direct_sound_samples/cries/rattata.bin" .align 2 Cry_Raticate:: - .incbin "sound/direct_sound_samples/cries/cry_raticate.bin" + .incbin "sound/direct_sound_samples/cries/raticate.bin" .align 2 Cry_Spearow:: - .incbin "sound/direct_sound_samples/cries/cry_spearow.bin" + .incbin "sound/direct_sound_samples/cries/spearow.bin" .align 2 Cry_Fearow:: - .incbin "sound/direct_sound_samples/cries/cry_fearow.bin" + .incbin "sound/direct_sound_samples/cries/fearow.bin" .align 2 Cry_Ekans:: - .incbin "sound/direct_sound_samples/cries/cry_ekans.bin" + .incbin "sound/direct_sound_samples/cries/ekans.bin" .align 2 Cry_Arbok:: - .incbin "sound/direct_sound_samples/cries/cry_arbok.bin" + .incbin "sound/direct_sound_samples/cries/arbok.bin" .align 2 Cry_Pikachu:: - .incbin "sound/direct_sound_samples/cries/cry_pikachu.bin" + .incbin "sound/direct_sound_samples/cries/pikachu.bin" .align 2 Cry_Raichu:: - .incbin "sound/direct_sound_samples/cries/cry_raichu.bin" + .incbin "sound/direct_sound_samples/cries/raichu.bin" .align 2 Cry_Sandshrew:: - .incbin "sound/direct_sound_samples/cries/cry_sandshrew.bin" + .incbin "sound/direct_sound_samples/cries/sandshrew.bin" .align 2 Cry_Sandslash:: - .incbin "sound/direct_sound_samples/cries/cry_sandslash.bin" + .incbin "sound/direct_sound_samples/cries/sandslash.bin" .align 2 Cry_NidoranF:: - .incbin "sound/direct_sound_samples/cries/cry_nidoran_f.bin" + .incbin "sound/direct_sound_samples/cries/nidoran_f.bin" .align 2 Cry_Nidorina:: - .incbin "sound/direct_sound_samples/cries/cry_nidorina.bin" + .incbin "sound/direct_sound_samples/cries/nidorina.bin" .align 2 Cry_Nidoqueen:: - .incbin "sound/direct_sound_samples/cries/cry_nidoqueen.bin" + .incbin "sound/direct_sound_samples/cries/nidoqueen.bin" .align 2 Cry_NidoranM:: - .incbin "sound/direct_sound_samples/cries/cry_nidoran_m.bin" + .incbin "sound/direct_sound_samples/cries/nidoran_m.bin" .align 2 Cry_Nidorino:: - .incbin "sound/direct_sound_samples/cries/cry_nidorino.bin" + .incbin "sound/direct_sound_samples/cries/nidorino.bin" .align 2 Cry_Nidoking:: - .incbin "sound/direct_sound_samples/cries/cry_nidoking.bin" + .incbin "sound/direct_sound_samples/cries/nidoking.bin" .align 2 Cry_Clefairy:: - .incbin "sound/direct_sound_samples/cries/cry_clefairy.bin" + .incbin "sound/direct_sound_samples/cries/clefairy.bin" .align 2 Cry_Clefable:: - .incbin "sound/direct_sound_samples/cries/cry_clefable.bin" + .incbin "sound/direct_sound_samples/cries/clefable.bin" .align 2 Cry_Vulpix:: - .incbin "sound/direct_sound_samples/cries/cry_vulpix.bin" + .incbin "sound/direct_sound_samples/cries/vulpix.bin" .align 2 Cry_Ninetales:: - .incbin "sound/direct_sound_samples/cries/cry_ninetales.bin" + .incbin "sound/direct_sound_samples/cries/ninetales.bin" .align 2 Cry_Jigglypuff:: - .incbin "sound/direct_sound_samples/cries/cry_jigglypuff.bin" + .incbin "sound/direct_sound_samples/cries/jigglypuff.bin" .align 2 Cry_Wigglytuff:: - .incbin "sound/direct_sound_samples/cries/cry_wigglytuff.bin" + .incbin "sound/direct_sound_samples/cries/wigglytuff.bin" .align 2 Cry_Zubat:: - .incbin "sound/direct_sound_samples/cries/cry_zubat.bin" + .incbin "sound/direct_sound_samples/cries/zubat.bin" .align 2 Cry_Golbat:: - .incbin "sound/direct_sound_samples/cries/cry_golbat.bin" + .incbin "sound/direct_sound_samples/cries/golbat.bin" .align 2 Cry_Oddish:: - .incbin "sound/direct_sound_samples/cries/cry_oddish.bin" + .incbin "sound/direct_sound_samples/cries/oddish.bin" .align 2 Cry_Gloom:: - .incbin "sound/direct_sound_samples/cries/cry_gloom.bin" + .incbin "sound/direct_sound_samples/cries/gloom.bin" .align 2 Cry_Vileplume:: - .incbin "sound/direct_sound_samples/cries/cry_vileplume.bin" + .incbin "sound/direct_sound_samples/cries/vileplume.bin" .align 2 Cry_Paras:: - .incbin "sound/direct_sound_samples/cries/cry_paras.bin" + .incbin "sound/direct_sound_samples/cries/paras.bin" .align 2 Cry_Parasect:: - .incbin "sound/direct_sound_samples/cries/cry_parasect.bin" + .incbin "sound/direct_sound_samples/cries/parasect.bin" .align 2 Cry_Venonat:: - .incbin "sound/direct_sound_samples/cries/cry_venonat.bin" + .incbin "sound/direct_sound_samples/cries/venonat.bin" .align 2 Cry_Venomoth:: - .incbin "sound/direct_sound_samples/cries/cry_venomoth.bin" + .incbin "sound/direct_sound_samples/cries/venomoth.bin" .align 2 Cry_Diglett:: - .incbin "sound/direct_sound_samples/cries/cry_diglett.bin" + .incbin "sound/direct_sound_samples/cries/diglett.bin" .align 2 Cry_Dugtrio:: - .incbin "sound/direct_sound_samples/cries/cry_dugtrio.bin" + .incbin "sound/direct_sound_samples/cries/dugtrio.bin" .align 2 Cry_Meowth:: - .incbin "sound/direct_sound_samples/cries/cry_meowth.bin" + .incbin "sound/direct_sound_samples/cries/meowth.bin" .align 2 Cry_Persian:: - .incbin "sound/direct_sound_samples/cries/cry_persian.bin" + .incbin "sound/direct_sound_samples/cries/persian.bin" .align 2 Cry_Psyduck:: - .incbin "sound/direct_sound_samples/cries/cry_psyduck.bin" + .incbin "sound/direct_sound_samples/cries/psyduck.bin" .align 2 Cry_Golduck:: - .incbin "sound/direct_sound_samples/cries/cry_golduck.bin" + .incbin "sound/direct_sound_samples/cries/golduck.bin" .align 2 Cry_Mankey:: - .incbin "sound/direct_sound_samples/cries/cry_mankey.bin" + .incbin "sound/direct_sound_samples/cries/mankey.bin" .align 2 Cry_Primeape:: - .incbin "sound/direct_sound_samples/cries/cry_primeape.bin" + .incbin "sound/direct_sound_samples/cries/primeape.bin" .align 2 Cry_Growlithe:: - .incbin "sound/direct_sound_samples/cries/cry_growlithe.bin" + .incbin "sound/direct_sound_samples/cries/growlithe.bin" .align 2 Cry_Arcanine:: - .incbin "sound/direct_sound_samples/cries/cry_arcanine.bin" + .incbin "sound/direct_sound_samples/cries/arcanine.bin" .align 2 Cry_Poliwag:: - .incbin "sound/direct_sound_samples/cries/cry_poliwag.bin" + .incbin "sound/direct_sound_samples/cries/poliwag.bin" .align 2 Cry_Poliwhirl:: - .incbin "sound/direct_sound_samples/cries/cry_poliwhirl.bin" + .incbin "sound/direct_sound_samples/cries/poliwhirl.bin" .align 2 Cry_Poliwrath:: - .incbin "sound/direct_sound_samples/cries/cry_poliwrath.bin" + .incbin "sound/direct_sound_samples/cries/poliwrath.bin" .align 2 Cry_Abra:: - .incbin "sound/direct_sound_samples/cries/cry_abra.bin" + .incbin "sound/direct_sound_samples/cries/abra.bin" .align 2 Cry_Kadabra:: - .incbin "sound/direct_sound_samples/cries/cry_kadabra.bin" + .incbin "sound/direct_sound_samples/cries/kadabra.bin" .align 2 Cry_Alakazam:: - .incbin "sound/direct_sound_samples/cries/cry_alakazam.bin" + .incbin "sound/direct_sound_samples/cries/alakazam.bin" .align 2 Cry_Machop:: - .incbin "sound/direct_sound_samples/cries/cry_machop.bin" + .incbin "sound/direct_sound_samples/cries/machop.bin" .align 2 Cry_Machoke:: - .incbin "sound/direct_sound_samples/cries/cry_machoke.bin" + .incbin "sound/direct_sound_samples/cries/machoke.bin" .align 2 Cry_Machamp:: - .incbin "sound/direct_sound_samples/cries/cry_machamp.bin" + .incbin "sound/direct_sound_samples/cries/machamp.bin" .align 2 Cry_Bellsprout:: - .incbin "sound/direct_sound_samples/cries/cry_bellsprout.bin" + .incbin "sound/direct_sound_samples/cries/bellsprout.bin" .align 2 Cry_Weepinbell:: - .incbin "sound/direct_sound_samples/cries/cry_weepinbell.bin" + .incbin "sound/direct_sound_samples/cries/weepinbell.bin" .align 2 Cry_Victreebel:: - .incbin "sound/direct_sound_samples/cries/cry_victreebel.bin" + .incbin "sound/direct_sound_samples/cries/victreebel.bin" .align 2 Cry_Tentacool:: - .incbin "sound/direct_sound_samples/cries/cry_tentacool.bin" + .incbin "sound/direct_sound_samples/cries/tentacool.bin" .align 2 Cry_Tentacruel:: - .incbin "sound/direct_sound_samples/cries/cry_tentacruel.bin" + .incbin "sound/direct_sound_samples/cries/tentacruel.bin" .align 2 Cry_Geodude:: - .incbin "sound/direct_sound_samples/cries/cry_geodude.bin" + .incbin "sound/direct_sound_samples/cries/geodude.bin" .align 2 Cry_Graveler:: - .incbin "sound/direct_sound_samples/cries/cry_graveler.bin" + .incbin "sound/direct_sound_samples/cries/graveler.bin" .align 2 Cry_Golem:: - .incbin "sound/direct_sound_samples/cries/cry_golem.bin" + .incbin "sound/direct_sound_samples/cries/golem.bin" .align 2 Cry_Ponyta:: - .incbin "sound/direct_sound_samples/cries/cry_ponyta.bin" + .incbin "sound/direct_sound_samples/cries/ponyta.bin" .align 2 Cry_Rapidash:: - .incbin "sound/direct_sound_samples/cries/cry_rapidash.bin" + .incbin "sound/direct_sound_samples/cries/rapidash.bin" .align 2 Cry_Slowpoke:: - .incbin "sound/direct_sound_samples/cries/cry_slowpoke.bin" + .incbin "sound/direct_sound_samples/cries/slowpoke.bin" .align 2 Cry_Slowbro:: - .incbin "sound/direct_sound_samples/cries/cry_slowbro.bin" + .incbin "sound/direct_sound_samples/cries/slowbro.bin" .align 2 Cry_Magnemite:: - .incbin "sound/direct_sound_samples/cries/cry_magnemite.bin" + .incbin "sound/direct_sound_samples/cries/magnemite.bin" .align 2 Cry_Magneton:: - .incbin "sound/direct_sound_samples/cries/cry_magneton.bin" + .incbin "sound/direct_sound_samples/cries/magneton.bin" .align 2 Cry_Farfetchd:: - .incbin "sound/direct_sound_samples/cries/cry_farfetchd.bin" + .incbin "sound/direct_sound_samples/cries/farfetchd.bin" .align 2 Cry_Doduo:: - .incbin "sound/direct_sound_samples/cries/cry_doduo.bin" + .incbin "sound/direct_sound_samples/cries/doduo.bin" .align 2 Cry_Dodrio:: - .incbin "sound/direct_sound_samples/cries/cry_dodrio.bin" + .incbin "sound/direct_sound_samples/cries/dodrio.bin" .align 2 Cry_Seel:: - .incbin "sound/direct_sound_samples/cries/cry_seel.bin" + .incbin "sound/direct_sound_samples/cries/seel.bin" .align 2 Cry_Dewgong:: - .incbin "sound/direct_sound_samples/cries/cry_dewgong.bin" + .incbin "sound/direct_sound_samples/cries/dewgong.bin" .align 2 Cry_Grimer:: - .incbin "sound/direct_sound_samples/cries/cry_grimer.bin" + .incbin "sound/direct_sound_samples/cries/grimer.bin" .align 2 Cry_Muk:: - .incbin "sound/direct_sound_samples/cries/cry_muk.bin" + .incbin "sound/direct_sound_samples/cries/muk.bin" .align 2 Cry_Shellder:: - .incbin "sound/direct_sound_samples/cries/cry_shellder.bin" + .incbin "sound/direct_sound_samples/cries/shellder.bin" .align 2 Cry_Cloyster:: - .incbin "sound/direct_sound_samples/cries/cry_cloyster.bin" + .incbin "sound/direct_sound_samples/cries/cloyster.bin" .align 2 Cry_Gastly:: - .incbin "sound/direct_sound_samples/cries/cry_gastly.bin" + .incbin "sound/direct_sound_samples/cries/gastly.bin" .align 2 Cry_Haunter:: - .incbin "sound/direct_sound_samples/cries/cry_haunter.bin" + .incbin "sound/direct_sound_samples/cries/haunter.bin" .align 2 Cry_Gengar:: - .incbin "sound/direct_sound_samples/cries/cry_gengar.bin" + .incbin "sound/direct_sound_samples/cries/gengar.bin" .align 2 Cry_Onix:: - .incbin "sound/direct_sound_samples/cries/cry_onix.bin" + .incbin "sound/direct_sound_samples/cries/onix.bin" .align 2 Cry_Drowzee:: - .incbin "sound/direct_sound_samples/cries/cry_drowzee.bin" + .incbin "sound/direct_sound_samples/cries/drowzee.bin" .align 2 Cry_Hypno:: - .incbin "sound/direct_sound_samples/cries/cry_hypno.bin" + .incbin "sound/direct_sound_samples/cries/hypno.bin" .align 2 Cry_Krabby:: - .incbin "sound/direct_sound_samples/cries/cry_krabby.bin" + .incbin "sound/direct_sound_samples/cries/krabby.bin" .align 2 Cry_Kingler:: - .incbin "sound/direct_sound_samples/cries/cry_kingler.bin" + .incbin "sound/direct_sound_samples/cries/kingler.bin" .align 2 Cry_Voltorb:: - .incbin "sound/direct_sound_samples/cries/cry_voltorb.bin" + .incbin "sound/direct_sound_samples/cries/voltorb.bin" .align 2 Cry_Electrode:: - .incbin "sound/direct_sound_samples/cries/cry_electrode.bin" + .incbin "sound/direct_sound_samples/cries/electrode.bin" .align 2 Cry_Exeggcute:: - .incbin "sound/direct_sound_samples/cries/cry_exeggcute.bin" + .incbin "sound/direct_sound_samples/cries/exeggcute.bin" .align 2 Cry_Exeggutor:: - .incbin "sound/direct_sound_samples/cries/cry_exeggutor.bin" + .incbin "sound/direct_sound_samples/cries/exeggutor.bin" .align 2 Cry_Cubone:: - .incbin "sound/direct_sound_samples/cries/cry_cubone.bin" + .incbin "sound/direct_sound_samples/cries/cubone.bin" .align 2 Cry_Marowak:: - .incbin "sound/direct_sound_samples/cries/cry_marowak.bin" + .incbin "sound/direct_sound_samples/cries/marowak.bin" .align 2 Cry_Hitmonlee:: - .incbin "sound/direct_sound_samples/cries/cry_hitmonlee.bin" + .incbin "sound/direct_sound_samples/cries/hitmonlee.bin" .align 2 Cry_Hitmonchan:: - .incbin "sound/direct_sound_samples/cries/cry_hitmonchan.bin" + .incbin "sound/direct_sound_samples/cries/hitmonchan.bin" .align 2 Cry_Lickitung:: - .incbin "sound/direct_sound_samples/cries/cry_lickitung.bin" + .incbin "sound/direct_sound_samples/cries/lickitung.bin" .align 2 Cry_Koffing:: - .incbin "sound/direct_sound_samples/cries/cry_koffing.bin" + .incbin "sound/direct_sound_samples/cries/koffing.bin" .align 2 Cry_Weezing:: - .incbin "sound/direct_sound_samples/cries/cry_weezing.bin" + .incbin "sound/direct_sound_samples/cries/weezing.bin" .align 2 Cry_Rhyhorn:: - .incbin "sound/direct_sound_samples/cries/cry_rhyhorn.bin" + .incbin "sound/direct_sound_samples/cries/rhyhorn.bin" .align 2 Cry_Rhydon:: - .incbin "sound/direct_sound_samples/cries/cry_rhydon.bin" + .incbin "sound/direct_sound_samples/cries/rhydon.bin" .align 2 Cry_Chansey:: - .incbin "sound/direct_sound_samples/cries/cry_chansey.bin" + .incbin "sound/direct_sound_samples/cries/chansey.bin" .align 2 Cry_Tangela:: - .incbin "sound/direct_sound_samples/cries/cry_tangela.bin" + .incbin "sound/direct_sound_samples/cries/tangela.bin" .align 2 Cry_Kangaskhan:: - .incbin "sound/direct_sound_samples/cries/cry_kangaskhan.bin" + .incbin "sound/direct_sound_samples/cries/kangaskhan.bin" .align 2 Cry_Horsea:: - .incbin "sound/direct_sound_samples/cries/cry_horsea.bin" + .incbin "sound/direct_sound_samples/cries/horsea.bin" .align 2 Cry_Seadra:: - .incbin "sound/direct_sound_samples/cries/cry_seadra.bin" + .incbin "sound/direct_sound_samples/cries/seadra.bin" .align 2 Cry_Goldeen:: - .incbin "sound/direct_sound_samples/cries/cry_goldeen.bin" + .incbin "sound/direct_sound_samples/cries/goldeen.bin" .align 2 Cry_Seaking:: - .incbin "sound/direct_sound_samples/cries/cry_seaking.bin" + .incbin "sound/direct_sound_samples/cries/seaking.bin" .align 2 Cry_Staryu:: - .incbin "sound/direct_sound_samples/cries/cry_staryu.bin" + .incbin "sound/direct_sound_samples/cries/staryu.bin" .align 2 Cry_Starmie:: - .incbin "sound/direct_sound_samples/cries/cry_starmie.bin" + .incbin "sound/direct_sound_samples/cries/starmie.bin" .align 2 Cry_MrMime:: - .incbin "sound/direct_sound_samples/cries/cry_mr_mime.bin" + .incbin "sound/direct_sound_samples/cries/mr_mime.bin" .align 2 Cry_Scyther:: - .incbin "sound/direct_sound_samples/cries/cry_scyther.bin" + .incbin "sound/direct_sound_samples/cries/scyther.bin" .align 2 Cry_Jynx:: - .incbin "sound/direct_sound_samples/cries/cry_jynx.bin" + .incbin "sound/direct_sound_samples/cries/jynx.bin" .align 2 Cry_Electabuzz:: - .incbin "sound/direct_sound_samples/cries/cry_electabuzz.bin" + .incbin "sound/direct_sound_samples/cries/electabuzz.bin" .align 2 Cry_Magmar:: - .incbin "sound/direct_sound_samples/cries/cry_magmar.bin" + .incbin "sound/direct_sound_samples/cries/magmar.bin" .align 2 Cry_Pinsir:: - .incbin "sound/direct_sound_samples/cries/cry_pinsir.bin" + .incbin "sound/direct_sound_samples/cries/pinsir.bin" .align 2 Cry_Tauros:: - .incbin "sound/direct_sound_samples/cries/cry_tauros.bin" + .incbin "sound/direct_sound_samples/cries/tauros.bin" .align 2 Cry_Magikarp:: - .incbin "sound/direct_sound_samples/cries/cry_magikarp.bin" + .incbin "sound/direct_sound_samples/cries/magikarp.bin" .align 2 Cry_Gyarados:: - .incbin "sound/direct_sound_samples/cries/cry_gyarados.bin" + .incbin "sound/direct_sound_samples/cries/gyarados.bin" .align 2 Cry_Lapras:: - .incbin "sound/direct_sound_samples/cries/cry_lapras.bin" + .incbin "sound/direct_sound_samples/cries/lapras.bin" .align 2 Cry_Ditto:: - .incbin "sound/direct_sound_samples/cries/cry_ditto.bin" + .incbin "sound/direct_sound_samples/cries/ditto.bin" .align 2 Cry_Eevee:: - .incbin "sound/direct_sound_samples/cries/cry_eevee.bin" + .incbin "sound/direct_sound_samples/cries/eevee.bin" .align 2 Cry_Vaporeon:: - .incbin "sound/direct_sound_samples/cries/cry_vaporeon.bin" + .incbin "sound/direct_sound_samples/cries/vaporeon.bin" .align 2 Cry_Jolteon:: - .incbin "sound/direct_sound_samples/cries/cry_jolteon.bin" + .incbin "sound/direct_sound_samples/cries/jolteon.bin" .align 2 Cry_Flareon:: - .incbin "sound/direct_sound_samples/cries/cry_flareon.bin" + .incbin "sound/direct_sound_samples/cries/flareon.bin" .align 2 Cry_Porygon:: - .incbin "sound/direct_sound_samples/cries/cry_porygon.bin" + .incbin "sound/direct_sound_samples/cries/porygon.bin" .align 2 Cry_Omanyte:: - .incbin "sound/direct_sound_samples/cries/cry_omanyte.bin" + .incbin "sound/direct_sound_samples/cries/omanyte.bin" .align 2 Cry_Omastar:: - .incbin "sound/direct_sound_samples/cries/cry_omastar.bin" + .incbin "sound/direct_sound_samples/cries/omastar.bin" .align 2 Cry_Kabuto:: - .incbin "sound/direct_sound_samples/cries/cry_kabuto.bin" + .incbin "sound/direct_sound_samples/cries/kabuto.bin" .align 2 Cry_Kabutops:: - .incbin "sound/direct_sound_samples/cries/cry_kabutops.bin" + .incbin "sound/direct_sound_samples/cries/kabutops.bin" .align 2 Cry_Aerodactyl:: - .incbin "sound/direct_sound_samples/cries/cry_aerodactyl.bin" + .incbin "sound/direct_sound_samples/cries/aerodactyl.bin" .align 2 Cry_Snorlax:: - .incbin "sound/direct_sound_samples/cries/cry_snorlax.bin" + .incbin "sound/direct_sound_samples/cries/snorlax.bin" .align 2 Cry_Articuno:: - .incbin "sound/direct_sound_samples/cries/cry_articuno.bin" + .incbin "sound/direct_sound_samples/cries/articuno.bin" .align 2 Cry_Zapdos:: - .incbin "sound/direct_sound_samples/cries/cry_zapdos.bin" + .incbin "sound/direct_sound_samples/cries/zapdos.bin" .align 2 Cry_Moltres:: - .incbin "sound/direct_sound_samples/cries/cry_moltres.bin" + .incbin "sound/direct_sound_samples/cries/moltres.bin" .align 2 Cry_Dratini:: - .incbin "sound/direct_sound_samples/cries/cry_dratini.bin" + .incbin "sound/direct_sound_samples/cries/dratini.bin" .align 2 Cry_Dragonair:: - .incbin "sound/direct_sound_samples/cries/cry_dragonair.bin" + .incbin "sound/direct_sound_samples/cries/dragonair.bin" .align 2 Cry_Dragonite:: - .incbin "sound/direct_sound_samples/cries/cry_dragonite.bin" + .incbin "sound/direct_sound_samples/cries/dragonite.bin" .align 2 Cry_Mewtwo:: - .incbin "sound/direct_sound_samples/cries/cry_mewtwo.bin" + .incbin "sound/direct_sound_samples/cries/mewtwo.bin" .align 2 Cry_Mew:: - .incbin "sound/direct_sound_samples/cries/cry_mew.bin" + .incbin "sound/direct_sound_samples/cries/mew.bin" .align 2 Cry_Chikorita:: - .incbin "sound/direct_sound_samples/cries/cry_chikorita.bin" + .incbin "sound/direct_sound_samples/cries/chikorita.bin" .align 2 Cry_Bayleef:: - .incbin "sound/direct_sound_samples/cries/cry_bayleef.bin" + .incbin "sound/direct_sound_samples/cries/bayleef.bin" .align 2 Cry_Meganium:: - .incbin "sound/direct_sound_samples/cries/cry_meganium.bin" + .incbin "sound/direct_sound_samples/cries/meganium.bin" .align 2 Cry_Cyndaquil:: - .incbin "sound/direct_sound_samples/cries/cry_cyndaquil.bin" + .incbin "sound/direct_sound_samples/cries/cyndaquil.bin" .align 2 Cry_Quilava:: - .incbin "sound/direct_sound_samples/cries/cry_quilava.bin" + .incbin "sound/direct_sound_samples/cries/quilava.bin" .align 2 Cry_Typhlosion:: - .incbin "sound/direct_sound_samples/cries/cry_typhlosion.bin" + .incbin "sound/direct_sound_samples/cries/typhlosion.bin" .align 2 Cry_Totodile:: - .incbin "sound/direct_sound_samples/cries/cry_totodile.bin" + .incbin "sound/direct_sound_samples/cries/totodile.bin" .align 2 Cry_Croconaw:: - .incbin "sound/direct_sound_samples/cries/cry_croconaw.bin" + .incbin "sound/direct_sound_samples/cries/croconaw.bin" .align 2 Cry_Feraligatr:: - .incbin "sound/direct_sound_samples/cries/cry_feraligatr.bin" + .incbin "sound/direct_sound_samples/cries/feraligatr.bin" .align 2 Cry_Sentret:: - .incbin "sound/direct_sound_samples/cries/cry_sentret.bin" + .incbin "sound/direct_sound_samples/cries/sentret.bin" .align 2 Cry_Furret:: - .incbin "sound/direct_sound_samples/cries/cry_furret.bin" + .incbin "sound/direct_sound_samples/cries/furret.bin" .align 2 Cry_Hoothoot:: - .incbin "sound/direct_sound_samples/cries/cry_hoothoot.bin" + .incbin "sound/direct_sound_samples/cries/hoothoot.bin" .align 2 Cry_Noctowl:: - .incbin "sound/direct_sound_samples/cries/cry_noctowl.bin" + .incbin "sound/direct_sound_samples/cries/noctowl.bin" .align 2 Cry_Ledyba:: - .incbin "sound/direct_sound_samples/cries/cry_ledyba.bin" + .incbin "sound/direct_sound_samples/cries/ledyba.bin" .align 2 Cry_Ledian:: - .incbin "sound/direct_sound_samples/cries/cry_ledian.bin" + .incbin "sound/direct_sound_samples/cries/ledian.bin" .align 2 Cry_Spinarak:: - .incbin "sound/direct_sound_samples/cries/cry_spinarak.bin" + .incbin "sound/direct_sound_samples/cries/spinarak.bin" .align 2 Cry_Ariados:: - .incbin "sound/direct_sound_samples/cries/cry_ariados.bin" + .incbin "sound/direct_sound_samples/cries/ariados.bin" .align 2 Cry_Crobat:: - .incbin "sound/direct_sound_samples/cries/cry_crobat.bin" + .incbin "sound/direct_sound_samples/cries/crobat.bin" .align 2 Cry_Chinchou:: - .incbin "sound/direct_sound_samples/cries/cry_chinchou.bin" + .incbin "sound/direct_sound_samples/cries/chinchou.bin" .align 2 Cry_Lanturn:: - .incbin "sound/direct_sound_samples/cries/cry_lanturn.bin" + .incbin "sound/direct_sound_samples/cries/lanturn.bin" .align 2 Cry_Pichu:: - .incbin "sound/direct_sound_samples/cries/cry_pichu.bin" + .incbin "sound/direct_sound_samples/cries/pichu.bin" .align 2 Cry_Cleffa:: - .incbin "sound/direct_sound_samples/cries/cry_cleffa.bin" + .incbin "sound/direct_sound_samples/cries/cleffa.bin" .align 2 Cry_Igglybuff:: - .incbin "sound/direct_sound_samples/cries/cry_igglybuff.bin" + .incbin "sound/direct_sound_samples/cries/igglybuff.bin" .align 2 Cry_Togepi:: - .incbin "sound/direct_sound_samples/cries/cry_togepi.bin" + .incbin "sound/direct_sound_samples/cries/togepi.bin" .align 2 Cry_Togetic:: - .incbin "sound/direct_sound_samples/cries/cry_togetic.bin" + .incbin "sound/direct_sound_samples/cries/togetic.bin" .align 2 Cry_Natu:: - .incbin "sound/direct_sound_samples/cries/cry_natu.bin" + .incbin "sound/direct_sound_samples/cries/natu.bin" .align 2 Cry_Xatu:: - .incbin "sound/direct_sound_samples/cries/cry_xatu.bin" + .incbin "sound/direct_sound_samples/cries/xatu.bin" .align 2 Cry_Mareep:: - .incbin "sound/direct_sound_samples/cries/cry_mareep.bin" + .incbin "sound/direct_sound_samples/cries/mareep.bin" .align 2 Cry_Flaaffy:: - .incbin "sound/direct_sound_samples/cries/cry_flaaffy.bin" + .incbin "sound/direct_sound_samples/cries/flaaffy.bin" .align 2 Cry_Ampharos:: - .incbin "sound/direct_sound_samples/cries/cry_ampharos.bin" + .incbin "sound/direct_sound_samples/cries/ampharos.bin" .align 2 Cry_Bellossom:: - .incbin "sound/direct_sound_samples/cries/cry_bellossom.bin" + .incbin "sound/direct_sound_samples/cries/bellossom.bin" .align 2 Cry_Marill:: - .incbin "sound/direct_sound_samples/cries/cry_marill.bin" + .incbin "sound/direct_sound_samples/cries/marill.bin" .align 2 Cry_Azumarill:: - .incbin "sound/direct_sound_samples/cries/cry_azumarill.bin" + .incbin "sound/direct_sound_samples/cries/azumarill.bin" .align 2 Cry_Sudowoodo:: - .incbin "sound/direct_sound_samples/cries/cry_sudowoodo.bin" + .incbin "sound/direct_sound_samples/cries/sudowoodo.bin" .align 2 Cry_Politoed:: - .incbin "sound/direct_sound_samples/cries/cry_politoed.bin" + .incbin "sound/direct_sound_samples/cries/politoed.bin" .align 2 Cry_Hoppip:: - .incbin "sound/direct_sound_samples/cries/cry_hoppip.bin" + .incbin "sound/direct_sound_samples/cries/hoppip.bin" .align 2 Cry_Skiploom:: - .incbin "sound/direct_sound_samples/cries/cry_skiploom.bin" + .incbin "sound/direct_sound_samples/cries/skiploom.bin" .align 2 Cry_Jumpluff:: - .incbin "sound/direct_sound_samples/cries/cry_jumpluff.bin" + .incbin "sound/direct_sound_samples/cries/jumpluff.bin" .align 2 Cry_Aipom:: - .incbin "sound/direct_sound_samples/cries/cry_aipom.bin" + .incbin "sound/direct_sound_samples/cries/aipom.bin" .align 2 Cry_Sunkern:: - .incbin "sound/direct_sound_samples/cries/cry_sunkern.bin" + .incbin "sound/direct_sound_samples/cries/sunkern.bin" .align 2 Cry_Sunflora:: - .incbin "sound/direct_sound_samples/cries/cry_sunflora.bin" + .incbin "sound/direct_sound_samples/cries/sunflora.bin" .align 2 Cry_Yanma:: - .incbin "sound/direct_sound_samples/cries/cry_yanma.bin" + .incbin "sound/direct_sound_samples/cries/yanma.bin" .align 2 Cry_Wooper:: - .incbin "sound/direct_sound_samples/cries/cry_wooper.bin" + .incbin "sound/direct_sound_samples/cries/wooper.bin" .align 2 Cry_Quagsire:: - .incbin "sound/direct_sound_samples/cries/cry_quagsire.bin" + .incbin "sound/direct_sound_samples/cries/quagsire.bin" .align 2 Cry_Espeon:: - .incbin "sound/direct_sound_samples/cries/cry_espeon.bin" + .incbin "sound/direct_sound_samples/cries/espeon.bin" .align 2 Cry_Umbreon:: - .incbin "sound/direct_sound_samples/cries/cry_umbreon.bin" + .incbin "sound/direct_sound_samples/cries/umbreon.bin" .align 2 Cry_Murkrow:: - .incbin "sound/direct_sound_samples/cries/cry_murkrow.bin" + .incbin "sound/direct_sound_samples/cries/murkrow.bin" .align 2 Cry_Slowking:: - .incbin "sound/direct_sound_samples/cries/cry_slowking.bin" + .incbin "sound/direct_sound_samples/cries/slowking.bin" .align 2 Cry_Misdreavus:: - .incbin "sound/direct_sound_samples/cries/cry_misdreavus.bin" + .incbin "sound/direct_sound_samples/cries/misdreavus.bin" .align 2 Cry_Unown:: - .incbin "sound/direct_sound_samples/cries/cry_unown.bin" + .incbin "sound/direct_sound_samples/cries/unown.bin" .align 2 Cry_Wobbuffet:: - .incbin "sound/direct_sound_samples/cries/cry_wobbuffet.bin" + .incbin "sound/direct_sound_samples/cries/wobbuffet.bin" .align 2 Cry_Girafarig:: - .incbin "sound/direct_sound_samples/cries/cry_girafarig.bin" + .incbin "sound/direct_sound_samples/cries/girafarig.bin" .align 2 Cry_Pineco:: - .incbin "sound/direct_sound_samples/cries/cry_pineco.bin" + .incbin "sound/direct_sound_samples/cries/pineco.bin" .align 2 Cry_Forretress:: - .incbin "sound/direct_sound_samples/cries/cry_forretress.bin" + .incbin "sound/direct_sound_samples/cries/forretress.bin" .align 2 Cry_Dunsparce:: - .incbin "sound/direct_sound_samples/cries/cry_dunsparce.bin" + .incbin "sound/direct_sound_samples/cries/dunsparce.bin" .align 2 Cry_Gligar:: - .incbin "sound/direct_sound_samples/cries/cry_gligar.bin" + .incbin "sound/direct_sound_samples/cries/gligar.bin" .align 2 Cry_Steelix:: - .incbin "sound/direct_sound_samples/cries/cry_steelix.bin" + .incbin "sound/direct_sound_samples/cries/steelix.bin" .align 2 Cry_Snubbull:: - .incbin "sound/direct_sound_samples/cries/cry_snubbull.bin" + .incbin "sound/direct_sound_samples/cries/snubbull.bin" .align 2 Cry_Granbull:: - .incbin "sound/direct_sound_samples/cries/cry_granbull.bin" + .incbin "sound/direct_sound_samples/cries/granbull.bin" .align 2 Cry_Qwilfish:: - .incbin "sound/direct_sound_samples/cries/cry_qwilfish.bin" + .incbin "sound/direct_sound_samples/cries/qwilfish.bin" .align 2 Cry_Scizor:: - .incbin "sound/direct_sound_samples/cries/cry_scizor.bin" + .incbin "sound/direct_sound_samples/cries/scizor.bin" .align 2 Cry_Shuckle:: - .incbin "sound/direct_sound_samples/cries/cry_shuckle.bin" + .incbin "sound/direct_sound_samples/cries/shuckle.bin" .align 2 Cry_Heracross:: - .incbin "sound/direct_sound_samples/cries/cry_heracross.bin" + .incbin "sound/direct_sound_samples/cries/heracross.bin" .align 2 Cry_Sneasel:: - .incbin "sound/direct_sound_samples/cries/cry_sneasel.bin" + .incbin "sound/direct_sound_samples/cries/sneasel.bin" .align 2 Cry_Teddiursa:: - .incbin "sound/direct_sound_samples/cries/cry_teddiursa.bin" + .incbin "sound/direct_sound_samples/cries/teddiursa.bin" .align 2 Cry_Ursaring:: - .incbin "sound/direct_sound_samples/cries/cry_ursaring.bin" + .incbin "sound/direct_sound_samples/cries/ursaring.bin" .align 2 Cry_Slugma:: - .incbin "sound/direct_sound_samples/cries/cry_slugma.bin" + .incbin "sound/direct_sound_samples/cries/slugma.bin" .align 2 Cry_Magcargo:: - .incbin "sound/direct_sound_samples/cries/cry_magcargo.bin" + .incbin "sound/direct_sound_samples/cries/magcargo.bin" .align 2 Cry_Swinub:: - .incbin "sound/direct_sound_samples/cries/cry_swinub.bin" + .incbin "sound/direct_sound_samples/cries/swinub.bin" .align 2 Cry_Piloswine:: - .incbin "sound/direct_sound_samples/cries/cry_piloswine.bin" + .incbin "sound/direct_sound_samples/cries/piloswine.bin" .align 2 Cry_Corsola:: - .incbin "sound/direct_sound_samples/cries/cry_corsola.bin" + .incbin "sound/direct_sound_samples/cries/corsola.bin" .align 2 Cry_Remoraid:: - .incbin "sound/direct_sound_samples/cries/cry_remoraid.bin" + .incbin "sound/direct_sound_samples/cries/remoraid.bin" .align 2 Cry_Octillery:: - .incbin "sound/direct_sound_samples/cries/cry_octillery.bin" + .incbin "sound/direct_sound_samples/cries/octillery.bin" .align 2 Cry_Delibird:: - .incbin "sound/direct_sound_samples/cries/cry_delibird.bin" + .incbin "sound/direct_sound_samples/cries/delibird.bin" .align 2 Cry_Mantine:: - .incbin "sound/direct_sound_samples/cries/cry_mantine.bin" + .incbin "sound/direct_sound_samples/cries/mantine.bin" .align 2 Cry_Skarmory:: - .incbin "sound/direct_sound_samples/cries/cry_skarmory.bin" + .incbin "sound/direct_sound_samples/cries/skarmory.bin" .align 2 Cry_Houndour:: - .incbin "sound/direct_sound_samples/cries/cry_houndour.bin" + .incbin "sound/direct_sound_samples/cries/houndour.bin" .align 2 Cry_Houndoom:: - .incbin "sound/direct_sound_samples/cries/cry_houndoom.bin" + .incbin "sound/direct_sound_samples/cries/houndoom.bin" .align 2 Cry_Kingdra:: - .incbin "sound/direct_sound_samples/cries/cry_kingdra.bin" + .incbin "sound/direct_sound_samples/cries/kingdra.bin" .align 2 Cry_Phanpy:: - .incbin "sound/direct_sound_samples/cries/cry_phanpy.bin" + .incbin "sound/direct_sound_samples/cries/phanpy.bin" .align 2 Cry_Donphan:: - .incbin "sound/direct_sound_samples/cries/cry_donphan.bin" + .incbin "sound/direct_sound_samples/cries/donphan.bin" .align 2 Cry_Porygon2:: - .incbin "sound/direct_sound_samples/cries/cry_porygon2.bin" + .incbin "sound/direct_sound_samples/cries/porygon2.bin" .align 2 Cry_Stantler:: - .incbin "sound/direct_sound_samples/cries/cry_stantler.bin" + .incbin "sound/direct_sound_samples/cries/stantler.bin" .align 2 Cry_Smeargle:: - .incbin "sound/direct_sound_samples/cries/cry_smeargle.bin" + .incbin "sound/direct_sound_samples/cries/smeargle.bin" .align 2 Cry_Tyrogue:: - .incbin "sound/direct_sound_samples/cries/cry_tyrogue.bin" + .incbin "sound/direct_sound_samples/cries/tyrogue.bin" .align 2 Cry_Hitmontop:: - .incbin "sound/direct_sound_samples/cries/cry_hitmontop.bin" + .incbin "sound/direct_sound_samples/cries/hitmontop.bin" .align 2 Cry_Smoochum:: - .incbin "sound/direct_sound_samples/cries/cry_smoochum.bin" + .incbin "sound/direct_sound_samples/cries/smoochum.bin" .align 2 Cry_Elekid:: - .incbin "sound/direct_sound_samples/cries/cry_elekid.bin" + .incbin "sound/direct_sound_samples/cries/elekid.bin" .align 2 Cry_Magby:: - .incbin "sound/direct_sound_samples/cries/cry_magby.bin" + .incbin "sound/direct_sound_samples/cries/magby.bin" .align 2 Cry_Miltank:: - .incbin "sound/direct_sound_samples/cries/cry_miltank.bin" + .incbin "sound/direct_sound_samples/cries/miltank.bin" .align 2 Cry_Blissey:: - .incbin "sound/direct_sound_samples/cries/cry_blissey.bin" + .incbin "sound/direct_sound_samples/cries/blissey.bin" .align 2 Cry_Raikou:: - .incbin "sound/direct_sound_samples/cries/cry_raikou.bin" + .incbin "sound/direct_sound_samples/cries/raikou.bin" .align 2 Cry_Entei:: - .incbin "sound/direct_sound_samples/cries/cry_entei.bin" + .incbin "sound/direct_sound_samples/cries/entei.bin" .align 2 Cry_Suicune:: - .incbin "sound/direct_sound_samples/cries/cry_suicune.bin" + .incbin "sound/direct_sound_samples/cries/suicune.bin" .align 2 Cry_Larvitar:: - .incbin "sound/direct_sound_samples/cries/cry_larvitar.bin" + .incbin "sound/direct_sound_samples/cries/larvitar.bin" .align 2 Cry_Pupitar:: - .incbin "sound/direct_sound_samples/cries/cry_pupitar.bin" + .incbin "sound/direct_sound_samples/cries/pupitar.bin" .align 2 Cry_Tyranitar:: - .incbin "sound/direct_sound_samples/cries/cry_tyranitar.bin" + .incbin "sound/direct_sound_samples/cries/tyranitar.bin" .align 2 Cry_Lugia:: - .incbin "sound/direct_sound_samples/cries/cry_lugia.bin" + .incbin "sound/direct_sound_samples/cries/lugia.bin" .align 2 Cry_HoOh:: - .incbin "sound/direct_sound_samples/cries/cry_ho_oh.bin" + .incbin "sound/direct_sound_samples/cries/ho_oh.bin" .align 2 Cry_Celebi:: - .incbin "sound/direct_sound_samples/cries/cry_celebi.bin" + .incbin "sound/direct_sound_samples/cries/celebi.bin" .align 2 Cry_Treecko:: - .incbin "sound/direct_sound_samples/cries/cry_treecko.bin" + .incbin "sound/direct_sound_samples/cries/treecko.bin" .align 2 Cry_Grovyle:: - .incbin "sound/direct_sound_samples/cries/cry_grovyle.bin" + .incbin "sound/direct_sound_samples/cries/grovyle.bin" .align 2 Cry_Sceptile:: - .incbin "sound/direct_sound_samples/cries/cry_sceptile.bin" + .incbin "sound/direct_sound_samples/cries/sceptile.bin" .align 2 Cry_Torchic:: - .incbin "sound/direct_sound_samples/cries/cry_torchic.bin" + .incbin "sound/direct_sound_samples/cries/torchic.bin" .align 2 Cry_Combusken:: - .incbin "sound/direct_sound_samples/cries/cry_combusken.bin" + .incbin "sound/direct_sound_samples/cries/combusken.bin" .align 2 Cry_Blaziken:: - .incbin "sound/direct_sound_samples/cries/cry_blaziken.bin" + .incbin "sound/direct_sound_samples/cries/blaziken.bin" .align 2 Cry_Mudkip:: - .incbin "sound/direct_sound_samples/cries/cry_mudkip.bin" + .incbin "sound/direct_sound_samples/cries/mudkip.bin" .align 2 Cry_Marshtomp:: - .incbin "sound/direct_sound_samples/cries/cry_marshtomp.bin" + .incbin "sound/direct_sound_samples/cries/marshtomp.bin" .align 2 Cry_Swampert:: - .incbin "sound/direct_sound_samples/cries/cry_swampert.bin" + .incbin "sound/direct_sound_samples/cries/swampert.bin" .align 2 Cry_Poochyena:: - .incbin "sound/direct_sound_samples/cries/cry_poochyena.bin" + .incbin "sound/direct_sound_samples/cries/poochyena.bin" .align 2 Cry_Mightyena:: - .incbin "sound/direct_sound_samples/cries/cry_mightyena.bin" + .incbin "sound/direct_sound_samples/cries/mightyena.bin" .align 2 Cry_Zigzagoon:: - .incbin "sound/direct_sound_samples/cries/cry_zigzagoon.bin" + .incbin "sound/direct_sound_samples/cries/zigzagoon.bin" .align 2 Cry_Linoone:: - .incbin "sound/direct_sound_samples/cries/cry_linoone.bin" + .incbin "sound/direct_sound_samples/cries/linoone.bin" .align 2 Cry_Wurmple:: - .incbin "sound/direct_sound_samples/cries/cry_wurmple.bin" + .incbin "sound/direct_sound_samples/cries/wurmple.bin" .align 2 Cry_Silcoon:: - .incbin "sound/direct_sound_samples/cries/cry_silcoon.bin" + .incbin "sound/direct_sound_samples/cries/silcoon.bin" .align 2 Cry_Beautifly:: - .incbin "sound/direct_sound_samples/cries/cry_beautifly.bin" + .incbin "sound/direct_sound_samples/cries/beautifly.bin" .align 2 Cry_Cascoon:: - .incbin "sound/direct_sound_samples/cries/cry_cascoon.bin" + .incbin "sound/direct_sound_samples/cries/cascoon.bin" .align 2 Cry_Dustox:: - .incbin "sound/direct_sound_samples/cries/cry_dustox.bin" + .incbin "sound/direct_sound_samples/cries/dustox.bin" .align 2 Cry_Lotad:: - .incbin "sound/direct_sound_samples/cries/cry_lotad.bin" + .incbin "sound/direct_sound_samples/cries/lotad.bin" .align 2 Cry_Lombre:: - .incbin "sound/direct_sound_samples/cries/cry_lombre.bin" + .incbin "sound/direct_sound_samples/cries/lombre.bin" .align 2 Cry_Ludicolo:: - .incbin "sound/direct_sound_samples/cries/cry_ludicolo.bin" + .incbin "sound/direct_sound_samples/cries/ludicolo.bin" .align 2 Cry_Seedot:: - .incbin "sound/direct_sound_samples/cries/cry_seedot.bin" + .incbin "sound/direct_sound_samples/cries/seedot.bin" .align 2 Cry_Nuzleaf:: - .incbin "sound/direct_sound_samples/cries/cry_nuzleaf.bin" + .incbin "sound/direct_sound_samples/cries/nuzleaf.bin" .align 2 Cry_Shiftry:: - .incbin "sound/direct_sound_samples/cries/cry_shiftry.bin" + .incbin "sound/direct_sound_samples/cries/shiftry.bin" .align 2 Cry_Taillow:: - .incbin "sound/direct_sound_samples/cries/cry_taillow.bin" + .incbin "sound/direct_sound_samples/cries/taillow.bin" .align 2 Cry_Swellow:: - .incbin "sound/direct_sound_samples/cries/cry_swellow.bin" + .incbin "sound/direct_sound_samples/cries/swellow.bin" .align 2 Cry_Wingull:: - .incbin "sound/direct_sound_samples/cries/cry_wingull.bin" + .incbin "sound/direct_sound_samples/cries/wingull.bin" .align 2 Cry_Pelipper:: - .incbin "sound/direct_sound_samples/cries/cry_pelipper.bin" + .incbin "sound/direct_sound_samples/cries/pelipper.bin" .align 2 Cry_Ralts:: - .incbin "sound/direct_sound_samples/cries/cry_ralts.bin" + .incbin "sound/direct_sound_samples/cries/ralts.bin" .align 2 Cry_Kirlia:: - .incbin "sound/direct_sound_samples/cries/cry_kirlia.bin" + .incbin "sound/direct_sound_samples/cries/kirlia.bin" .align 2 Cry_Gardevoir:: - .incbin "sound/direct_sound_samples/cries/cry_gardevoir.bin" + .incbin "sound/direct_sound_samples/cries/gardevoir.bin" .align 2 Cry_Surskit:: - .incbin "sound/direct_sound_samples/cries/cry_surskit.bin" + .incbin "sound/direct_sound_samples/cries/surskit.bin" .align 2 Cry_Masquerain:: - .incbin "sound/direct_sound_samples/cries/cry_masquerain.bin" + .incbin "sound/direct_sound_samples/cries/masquerain.bin" .align 2 Cry_Shroomish:: - .incbin "sound/direct_sound_samples/cries/cry_shroomish.bin" + .incbin "sound/direct_sound_samples/cries/shroomish.bin" .align 2 Cry_Breloom:: - .incbin "sound/direct_sound_samples/cries/cry_breloom.bin" + .incbin "sound/direct_sound_samples/cries/breloom.bin" .align 2 Cry_Slakoth:: - .incbin "sound/direct_sound_samples/cries/cry_slakoth.bin" + .incbin "sound/direct_sound_samples/cries/slakoth.bin" .align 2 Cry_Vigoroth:: - .incbin "sound/direct_sound_samples/cries/cry_vigoroth.bin" + .incbin "sound/direct_sound_samples/cries/vigoroth.bin" .align 2 Cry_Slaking:: - .incbin "sound/direct_sound_samples/cries/cry_slaking.bin" + .incbin "sound/direct_sound_samples/cries/slaking.bin" .align 2 Cry_Nincada:: - .incbin "sound/direct_sound_samples/cries/cry_nincada.bin" + .incbin "sound/direct_sound_samples/cries/nincada.bin" .align 2 Cry_Ninjask:: - .incbin "sound/direct_sound_samples/cries/cry_ninjask.bin" + .incbin "sound/direct_sound_samples/cries/ninjask.bin" .align 2 Cry_Shedinja:: - .incbin "sound/direct_sound_samples/cries/cry_shedinja.bin" + .incbin "sound/direct_sound_samples/cries/shedinja.bin" .align 2 Cry_Whismur:: - .incbin "sound/direct_sound_samples/cries/cry_whismur.bin" + .incbin "sound/direct_sound_samples/cries/whismur.bin" .align 2 Cry_Loudred:: - .incbin "sound/direct_sound_samples/cries/cry_loudred.bin" + .incbin "sound/direct_sound_samples/cries/loudred.bin" .align 2 Cry_Exploud:: - .incbin "sound/direct_sound_samples/cries/cry_exploud.bin" + .incbin "sound/direct_sound_samples/cries/exploud.bin" .align 2 Cry_Makuhita:: - .incbin "sound/direct_sound_samples/cries/cry_makuhita.bin" + .incbin "sound/direct_sound_samples/cries/makuhita.bin" .align 2 Cry_Hariyama:: - .incbin "sound/direct_sound_samples/cries/cry_hariyama.bin" + .incbin "sound/direct_sound_samples/cries/hariyama.bin" .align 2 Cry_Azurill:: - .incbin "sound/direct_sound_samples/cries/cry_azurill.bin" + .incbin "sound/direct_sound_samples/cries/azurill.bin" .align 2 Cry_Nosepass:: - .incbin "sound/direct_sound_samples/cries/cry_nosepass.bin" + .incbin "sound/direct_sound_samples/cries/nosepass.bin" .align 2 Cry_Skitty:: - .incbin "sound/direct_sound_samples/cries/cry_skitty.bin" + .incbin "sound/direct_sound_samples/cries/skitty.bin" .align 2 Cry_Delcatty:: - .incbin "sound/direct_sound_samples/cries/cry_delcatty.bin" + .incbin "sound/direct_sound_samples/cries/delcatty.bin" .align 2 Cry_Sableye:: - .incbin "sound/direct_sound_samples/cries/cry_sableye.bin" + .incbin "sound/direct_sound_samples/cries/sableye.bin" .align 2 Cry_Mawile:: - .incbin "sound/direct_sound_samples/cries/cry_mawile.bin" + .incbin "sound/direct_sound_samples/cries/mawile.bin" .align 2 Cry_Aron:: - .incbin "sound/direct_sound_samples/cries/cry_aron.bin" + .incbin "sound/direct_sound_samples/cries/aron.bin" .align 2 Cry_Lairon:: - .incbin "sound/direct_sound_samples/cries/cry_lairon.bin" + .incbin "sound/direct_sound_samples/cries/lairon.bin" .align 2 Cry_Aggron:: - .incbin "sound/direct_sound_samples/cries/cry_aggron.bin" + .incbin "sound/direct_sound_samples/cries/aggron.bin" .align 2 Cry_Meditite:: - .incbin "sound/direct_sound_samples/cries/cry_meditite.bin" + .incbin "sound/direct_sound_samples/cries/meditite.bin" .align 2 Cry_Medicham:: - .incbin "sound/direct_sound_samples/cries/cry_medicham.bin" + .incbin "sound/direct_sound_samples/cries/medicham.bin" .align 2 Cry_Electrike:: - .incbin "sound/direct_sound_samples/cries/cry_electrike.bin" + .incbin "sound/direct_sound_samples/cries/electrike.bin" .align 2 Cry_Manectric:: - .incbin "sound/direct_sound_samples/cries/cry_manectric.bin" + .incbin "sound/direct_sound_samples/cries/manectric.bin" .align 2 Cry_Plusle:: - .incbin "sound/direct_sound_samples/cries/cry_plusle.bin" + .incbin "sound/direct_sound_samples/cries/plusle.bin" .align 2 Cry_Minun:: - .incbin "sound/direct_sound_samples/cries/cry_minun.bin" + .incbin "sound/direct_sound_samples/cries/minun.bin" .align 2 Cry_Volbeat:: - .incbin "sound/direct_sound_samples/cries/cry_volbeat.bin" + .incbin "sound/direct_sound_samples/cries/volbeat.bin" .align 2 Cry_Illumise:: - .incbin "sound/direct_sound_samples/cries/cry_illumise.bin" + .incbin "sound/direct_sound_samples/cries/illumise.bin" .align 2 Cry_Roselia:: - .incbin "sound/direct_sound_samples/cries/cry_roselia.bin" + .incbin "sound/direct_sound_samples/cries/roselia.bin" .align 2 Cry_Gulpin:: - .incbin "sound/direct_sound_samples/cries/cry_gulpin.bin" + .incbin "sound/direct_sound_samples/cries/gulpin.bin" .align 2 Cry_Swalot:: - .incbin "sound/direct_sound_samples/cries/cry_swalot.bin" + .incbin "sound/direct_sound_samples/cries/swalot.bin" .align 2 Cry_Carvanha:: - .incbin "sound/direct_sound_samples/cries/cry_carvanha.bin" + .incbin "sound/direct_sound_samples/cries/carvanha.bin" .align 2 Cry_Sharpedo:: - .incbin "sound/direct_sound_samples/cries/cry_sharpedo.bin" + .incbin "sound/direct_sound_samples/cries/sharpedo.bin" .align 2 Cry_Wailmer:: - .incbin "sound/direct_sound_samples/cries/cry_wailmer.bin" + .incbin "sound/direct_sound_samples/cries/wailmer.bin" .align 2 Cry_Wailord:: - .incbin "sound/direct_sound_samples/cries/cry_wailord.bin" + .incbin "sound/direct_sound_samples/cries/wailord.bin" .align 2 Cry_Numel:: - .incbin "sound/direct_sound_samples/cries/cry_numel.bin" + .incbin "sound/direct_sound_samples/cries/numel.bin" .align 2 Cry_Camerupt:: - .incbin "sound/direct_sound_samples/cries/cry_camerupt.bin" + .incbin "sound/direct_sound_samples/cries/camerupt.bin" .align 2 Cry_Torkoal:: - .incbin "sound/direct_sound_samples/cries/cry_torkoal.bin" + .incbin "sound/direct_sound_samples/cries/torkoal.bin" .align 2 Cry_Spoink:: - .incbin "sound/direct_sound_samples/cries/cry_spoink.bin" + .incbin "sound/direct_sound_samples/cries/spoink.bin" .align 2 Cry_Grumpig:: - .incbin "sound/direct_sound_samples/cries/cry_grumpig.bin" + .incbin "sound/direct_sound_samples/cries/grumpig.bin" .align 2 Cry_Spinda:: - .incbin "sound/direct_sound_samples/cries/cry_spinda.bin" + .incbin "sound/direct_sound_samples/cries/spinda.bin" .align 2 Cry_Trapinch:: - .incbin "sound/direct_sound_samples/cries/cry_trapinch.bin" + .incbin "sound/direct_sound_samples/cries/trapinch.bin" .align 2 Cry_Vibrava:: - .incbin "sound/direct_sound_samples/cries/cry_vibrava.bin" + .incbin "sound/direct_sound_samples/cries/vibrava.bin" .align 2 Cry_Flygon:: - .incbin "sound/direct_sound_samples/cries/cry_flygon.bin" + .incbin "sound/direct_sound_samples/cries/flygon.bin" .align 2 Cry_Cacnea:: - .incbin "sound/direct_sound_samples/cries/cry_cacnea.bin" + .incbin "sound/direct_sound_samples/cries/cacnea.bin" .align 2 Cry_Cacturne:: - .incbin "sound/direct_sound_samples/cries/cry_cacturne.bin" + .incbin "sound/direct_sound_samples/cries/cacturne.bin" .align 2 Cry_Swablu:: - .incbin "sound/direct_sound_samples/cries/cry_swablu.bin" + .incbin "sound/direct_sound_samples/cries/swablu.bin" .align 2 Cry_Altaria:: - .incbin "sound/direct_sound_samples/cries/cry_altaria.bin" + .incbin "sound/direct_sound_samples/cries/altaria.bin" .align 2 Cry_Zangoose:: - .incbin "sound/direct_sound_samples/cries/cry_zangoose.bin" + .incbin "sound/direct_sound_samples/cries/zangoose.bin" .align 2 Cry_Seviper:: - .incbin "sound/direct_sound_samples/cries/cry_seviper.bin" + .incbin "sound/direct_sound_samples/cries/seviper.bin" .align 2 Cry_Lunatone:: - .incbin "sound/direct_sound_samples/cries/cry_lunatone.bin" + .incbin "sound/direct_sound_samples/cries/lunatone.bin" .align 2 Cry_Solrock:: - .incbin "sound/direct_sound_samples/cries/cry_solrock.bin" + .incbin "sound/direct_sound_samples/cries/solrock.bin" .align 2 Cry_Barboach:: - .incbin "sound/direct_sound_samples/cries/cry_barboach.bin" + .incbin "sound/direct_sound_samples/cries/barboach.bin" .align 2 Cry_Whiscash:: - .incbin "sound/direct_sound_samples/cries/cry_whiscash.bin" + .incbin "sound/direct_sound_samples/cries/whiscash.bin" .align 2 Cry_Corphish:: - .incbin "sound/direct_sound_samples/cries/cry_corphish.bin" + .incbin "sound/direct_sound_samples/cries/corphish.bin" .align 2 Cry_Crawdaunt:: - .incbin "sound/direct_sound_samples/cries/cry_crawdaunt.bin" + .incbin "sound/direct_sound_samples/cries/crawdaunt.bin" .align 2 Cry_Baltoy:: - .incbin "sound/direct_sound_samples/cries/cry_baltoy.bin" + .incbin "sound/direct_sound_samples/cries/baltoy.bin" .align 2 Cry_Claydol:: - .incbin "sound/direct_sound_samples/cries/cry_claydol.bin" + .incbin "sound/direct_sound_samples/cries/claydol.bin" .align 2 Cry_Lileep:: - .incbin "sound/direct_sound_samples/cries/cry_lileep.bin" + .incbin "sound/direct_sound_samples/cries/lileep.bin" .align 2 Cry_Cradily:: - .incbin "sound/direct_sound_samples/cries/cry_cradily.bin" + .incbin "sound/direct_sound_samples/cries/cradily.bin" .align 2 Cry_Anorith:: - .incbin "sound/direct_sound_samples/cries/cry_anorith.bin" + .incbin "sound/direct_sound_samples/cries/anorith.bin" .align 2 Cry_Armaldo:: - .incbin "sound/direct_sound_samples/cries/cry_armaldo.bin" + .incbin "sound/direct_sound_samples/cries/armaldo.bin" .align 2 Cry_Feebas:: - .incbin "sound/direct_sound_samples/cries/cry_feebas.bin" + .incbin "sound/direct_sound_samples/cries/feebas.bin" .align 2 Cry_Milotic:: - .incbin "sound/direct_sound_samples/cries/cry_milotic.bin" + .incbin "sound/direct_sound_samples/cries/milotic.bin" .align 2 Cry_Castform:: - .incbin "sound/direct_sound_samples/cries/cry_castform.bin" + .incbin "sound/direct_sound_samples/cries/castform.bin" .align 2 Cry_Kecleon:: - .incbin "sound/direct_sound_samples/cries/cry_kecleon.bin" + .incbin "sound/direct_sound_samples/cries/kecleon.bin" .align 2 Cry_Shuppet:: - .incbin "sound/direct_sound_samples/cries/cry_shuppet.bin" + .incbin "sound/direct_sound_samples/cries/shuppet.bin" .align 2 Cry_Banette:: - .incbin "sound/direct_sound_samples/cries/cry_banette.bin" + .incbin "sound/direct_sound_samples/cries/banette.bin" .align 2 Cry_Duskull:: - .incbin "sound/direct_sound_samples/cries/cry_duskull.bin" + .incbin "sound/direct_sound_samples/cries/duskull.bin" .align 2 Cry_Dusclops:: - .incbin "sound/direct_sound_samples/cries/cry_dusclops.bin" + .incbin "sound/direct_sound_samples/cries/dusclops.bin" .align 2 Cry_Tropius:: - .incbin "sound/direct_sound_samples/cries/cry_tropius.bin" + .incbin "sound/direct_sound_samples/cries/tropius.bin" .align 2 Cry_Chimecho:: - .incbin "sound/direct_sound_samples/cries/cry_chimecho.bin" + .incbin "sound/direct_sound_samples/cries/chimecho.bin" .align 2 Cry_Absol:: - .incbin "sound/direct_sound_samples/cries/cry_absol.bin" + .incbin "sound/direct_sound_samples/cries/absol.bin" .align 2 Cry_Wynaut:: - .incbin "sound/direct_sound_samples/cries/cry_wynaut.bin" + .incbin "sound/direct_sound_samples/cries/wynaut.bin" .align 2 Cry_Snorunt:: - .incbin "sound/direct_sound_samples/cries/cry_snorunt.bin" + .incbin "sound/direct_sound_samples/cries/snorunt.bin" .align 2 Cry_Glalie:: - .incbin "sound/direct_sound_samples/cries/cry_glalie.bin" + .incbin "sound/direct_sound_samples/cries/glalie.bin" .align 2 Cry_Spheal:: - .incbin "sound/direct_sound_samples/cries/cry_spheal.bin" + .incbin "sound/direct_sound_samples/cries/spheal.bin" .align 2 Cry_Sealeo:: - .incbin "sound/direct_sound_samples/cries/cry_sealeo.bin" + .incbin "sound/direct_sound_samples/cries/sealeo.bin" .align 2 Cry_Walrein:: - .incbin "sound/direct_sound_samples/cries/cry_walrein.bin" + .incbin "sound/direct_sound_samples/cries/walrein.bin" .align 2 Cry_Clamperl:: - .incbin "sound/direct_sound_samples/cries/cry_clamperl.bin" + .incbin "sound/direct_sound_samples/cries/clamperl.bin" .align 2 Cry_Huntail:: - .incbin "sound/direct_sound_samples/cries/cry_huntail.bin" + .incbin "sound/direct_sound_samples/cries/huntail.bin" .align 2 Cry_Gorebyss:: - .incbin "sound/direct_sound_samples/cries/cry_gorebyss.bin" + .incbin "sound/direct_sound_samples/cries/gorebyss.bin" .align 2 Cry_Relicanth:: - .incbin "sound/direct_sound_samples/cries/cry_relicanth.bin" + .incbin "sound/direct_sound_samples/cries/relicanth.bin" .align 2 Cry_Luvdisc:: - .incbin "sound/direct_sound_samples/cries/cry_luvdisc.bin" + .incbin "sound/direct_sound_samples/cries/luvdisc.bin" .align 2 Cry_Bagon:: - .incbin "sound/direct_sound_samples/cries/cry_bagon.bin" + .incbin "sound/direct_sound_samples/cries/bagon.bin" .align 2 Cry_Shelgon:: - .incbin "sound/direct_sound_samples/cries/cry_shelgon.bin" + .incbin "sound/direct_sound_samples/cries/shelgon.bin" .align 2 Cry_Salamence:: - .incbin "sound/direct_sound_samples/cries/cry_salamence.bin" + .incbin "sound/direct_sound_samples/cries/salamence.bin" .align 2 Cry_Beldum:: - .incbin "sound/direct_sound_samples/cries/cry_beldum.bin" + .incbin "sound/direct_sound_samples/cries/beldum.bin" .align 2 Cry_Metang:: - .incbin "sound/direct_sound_samples/cries/cry_metang.bin" + .incbin "sound/direct_sound_samples/cries/metang.bin" .align 2 Cry_Metagross:: - .incbin "sound/direct_sound_samples/cries/cry_metagross.bin" + .incbin "sound/direct_sound_samples/cries/metagross.bin" .align 2 Cry_Regirock:: - .incbin "sound/direct_sound_samples/cries/cry_regirock.bin" + .incbin "sound/direct_sound_samples/cries/regirock.bin" .align 2 Cry_Regice:: - .incbin "sound/direct_sound_samples/cries/cry_regice.bin" + .incbin "sound/direct_sound_samples/cries/regice.bin" .align 2 Cry_Registeel:: - .incbin "sound/direct_sound_samples/cries/cry_registeel.bin" + .incbin "sound/direct_sound_samples/cries/registeel.bin" .align 2 Cry_Latias:: - .incbin "sound/direct_sound_samples/cries/cry_latias.bin" + .incbin "sound/direct_sound_samples/cries/latias.bin" .align 2 Cry_Latios:: - .incbin "sound/direct_sound_samples/cries/cry_latios.bin" + .incbin "sound/direct_sound_samples/cries/latios.bin" .align 2 Cry_Kyogre:: - .incbin "sound/direct_sound_samples/cries/cry_kyogre.bin" + .incbin "sound/direct_sound_samples/cries/kyogre.bin" .align 2 Cry_Groudon:: - .incbin "sound/direct_sound_samples/cries/cry_groudon.bin" + .incbin "sound/direct_sound_samples/cries/groudon.bin" .align 2 Cry_Rayquaza:: - .incbin "sound/direct_sound_samples/cries/cry_rayquaza.bin" + .incbin "sound/direct_sound_samples/cries/rayquaza.bin" .align 2 Cry_Jirachi:: - .incbin "sound/direct_sound_samples/cries/cry_jirachi.bin" + .incbin "sound/direct_sound_samples/cries/jirachi.bin" .align 2 Cry_Deoxys:: - .incbin "sound/direct_sound_samples/cries/cry_deoxys.bin" + .incbin "sound/direct_sound_samples/cries/deoxys.bin" .align 2 Cry_Turtwig:: - .incbin "sound/direct_sound_samples/cries/cry_not_turtwig.bin" + .incbin "sound/direct_sound_samples/cries/turtwig.bin" .align 2 Cry_Grotle:: - .incbin "sound/direct_sound_samples/cries/cry_not_grotle.bin" + .incbin "sound/direct_sound_samples/cries/grotle.bin" .align 2 Cry_Torterra:: - .incbin "sound/direct_sound_samples/cries/cry_not_torterra.bin" + .incbin "sound/direct_sound_samples/cries/torterra.bin" .align 2 Cry_Chimchar:: - .incbin "sound/direct_sound_samples/cries/cry_not_chimchar.bin" + .incbin "sound/direct_sound_samples/cries/chimchar.bin" .align 2 Cry_Monferno:: - .incbin "sound/direct_sound_samples/cries/cry_not_monferno.bin" + .incbin "sound/direct_sound_samples/cries/monferno.bin" .align 2 Cry_Infernape:: - .incbin "sound/direct_sound_samples/cries/cry_not_infernape.bin" + .incbin "sound/direct_sound_samples/cries/infernape.bin" .align 2 Cry_Piplup:: - .incbin "sound/direct_sound_samples/cries/cry_not_piplup.bin" + .incbin "sound/direct_sound_samples/cries/piplup.bin" .align 2 Cry_Prinplup:: - .incbin "sound/direct_sound_samples/cries/cry_not_prinplup.bin" + .incbin "sound/direct_sound_samples/cries/prinplup.bin" .align 2 Cry_Empoleon:: - .incbin "sound/direct_sound_samples/cries/cry_not_empoleon.bin" + .incbin "sound/direct_sound_samples/cries/empoleon.bin" .align 2 Cry_Starly:: - .incbin "sound/direct_sound_samples/cries/cry_not_starly.bin" + .incbin "sound/direct_sound_samples/cries/starly.bin" .align 2 Cry_Staravia:: - .incbin "sound/direct_sound_samples/cries/cry_not_staravia.bin" + .incbin "sound/direct_sound_samples/cries/staravia.bin" .align 2 Cry_Staraptor:: - .incbin "sound/direct_sound_samples/cries/cry_not_staraptor.bin" + .incbin "sound/direct_sound_samples/cries/staraptor.bin" .align 2 Cry_Bidoof:: - .incbin "sound/direct_sound_samples/cries/cry_not_bidoof.bin" + .incbin "sound/direct_sound_samples/cries/bidoof.bin" .align 2 Cry_Bibarel:: - .incbin "sound/direct_sound_samples/cries/cry_not_bibarel.bin" + .incbin "sound/direct_sound_samples/cries/bibarel.bin" .align 2 Cry_Kricketot:: - .incbin "sound/direct_sound_samples/cries/cry_not_kricketot.bin" + .incbin "sound/direct_sound_samples/cries/kricketot.bin" .align 2 Cry_Kricketune:: - .incbin "sound/direct_sound_samples/cries/cry_not_kricketune.bin" + .incbin "sound/direct_sound_samples/cries/kricketune.bin" .align 2 Cry_Shinx:: - .incbin "sound/direct_sound_samples/cries/cry_not_shinx.bin" + .incbin "sound/direct_sound_samples/cries/shinx.bin" .align 2 Cry_Luxio:: - .incbin "sound/direct_sound_samples/cries/cry_not_luxio.bin" + .incbin "sound/direct_sound_samples/cries/luxio.bin" .align 2 Cry_Luxray:: - .incbin "sound/direct_sound_samples/cries/cry_not_luxray.bin" + .incbin "sound/direct_sound_samples/cries/luxray.bin" .align 2 Cry_Budew:: - .incbin "sound/direct_sound_samples/cries/cry_not_budew.bin" + .incbin "sound/direct_sound_samples/cries/budew.bin" .align 2 Cry_Roserade:: - .incbin "sound/direct_sound_samples/cries/cry_not_roserade.bin" + .incbin "sound/direct_sound_samples/cries/roserade.bin" .align 2 Cry_Cranidos:: - .incbin "sound/direct_sound_samples/cries/cry_not_cranidos.bin" + .incbin "sound/direct_sound_samples/cries/cranidos.bin" .align 2 Cry_Rampardos:: - .incbin "sound/direct_sound_samples/cries/cry_not_rampardos.bin" + .incbin "sound/direct_sound_samples/cries/rampardos.bin" .align 2 Cry_Shieldon:: - .incbin "sound/direct_sound_samples/cries/cry_not_shieldon.bin" + .incbin "sound/direct_sound_samples/cries/shieldon.bin" .align 2 Cry_Bastiodon:: - .incbin "sound/direct_sound_samples/cries/cry_not_bastiodon.bin" + .incbin "sound/direct_sound_samples/cries/bastiodon.bin" .align 2 Cry_Burmy:: - .incbin "sound/direct_sound_samples/cries/cry_not_burmy.bin" + .incbin "sound/direct_sound_samples/cries/burmy.bin" .align 2 Cry_Wormadam:: - .incbin "sound/direct_sound_samples/cries/cry_not_wormadam.bin" + .incbin "sound/direct_sound_samples/cries/wormadam.bin" .align 2 Cry_Mothim:: - .incbin "sound/direct_sound_samples/cries/cry_not_mothim.bin" + .incbin "sound/direct_sound_samples/cries/mothim.bin" .align 2 Cry_Combee:: - .incbin "sound/direct_sound_samples/cries/cry_not_combee.bin" + .incbin "sound/direct_sound_samples/cries/combee.bin" .align 2 Cry_Vespiquen:: - .incbin "sound/direct_sound_samples/cries/cry_not_vespiquen.bin" + .incbin "sound/direct_sound_samples/cries/vespiquen.bin" .align 2 Cry_Pachirisu:: - .incbin "sound/direct_sound_samples/cries/cry_not_pachirisu.bin" + .incbin "sound/direct_sound_samples/cries/pachirisu.bin" .align 2 Cry_Buizel:: - .incbin "sound/direct_sound_samples/cries/cry_not_buizel.bin" + .incbin "sound/direct_sound_samples/cries/buizel.bin" .align 2 Cry_Floatzel:: - .incbin "sound/direct_sound_samples/cries/cry_not_floatzel.bin" + .incbin "sound/direct_sound_samples/cries/floatzel.bin" .align 2 Cry_Cherubi:: - .incbin "sound/direct_sound_samples/cries/cry_not_cherubi.bin" + .incbin "sound/direct_sound_samples/cries/cherubi.bin" .align 2 Cry_Cherrim:: - .incbin "sound/direct_sound_samples/cries/cry_not_cherrim.bin" + .incbin "sound/direct_sound_samples/cries/cherrim.bin" .align 2 Cry_Shellos:: - .incbin "sound/direct_sound_samples/cries/cry_not_shellos.bin" + .incbin "sound/direct_sound_samples/cries/shellos.bin" .align 2 Cry_Gastrodon:: - .incbin "sound/direct_sound_samples/cries/cry_not_gastrodon.bin" + .incbin "sound/direct_sound_samples/cries/gastrodon.bin" .align 2 Cry_Ambipom:: - .incbin "sound/direct_sound_samples/cries/cry_not_ambipom.bin" + .incbin "sound/direct_sound_samples/cries/ambipom.bin" .align 2 Cry_Drifloon:: - .incbin "sound/direct_sound_samples/cries/cry_not_drifloon.bin" + .incbin "sound/direct_sound_samples/cries/drifloon.bin" .align 2 Cry_Drifblim:: - .incbin "sound/direct_sound_samples/cries/cry_not_drifblim.bin" + .incbin "sound/direct_sound_samples/cries/drifblim.bin" .align 2 Cry_Buneary:: - .incbin "sound/direct_sound_samples/cries/cry_not_buneary.bin" + .incbin "sound/direct_sound_samples/cries/buneary.bin" .align 2 Cry_Lopunny:: - .incbin "sound/direct_sound_samples/cries/cry_not_lopunny.bin" + .incbin "sound/direct_sound_samples/cries/lopunny.bin" .align 2 Cry_Mismagius:: - .incbin "sound/direct_sound_samples/cries/cry_not_mismagius.bin" + .incbin "sound/direct_sound_samples/cries/mismagius.bin" .align 2 Cry_Honchkrow:: - .incbin "sound/direct_sound_samples/cries/cry_not_honchkrow.bin" + .incbin "sound/direct_sound_samples/cries/honchkrow.bin" .align 2 Cry_Glameow:: - .incbin "sound/direct_sound_samples/cries/cry_not_glameow.bin" + .incbin "sound/direct_sound_samples/cries/glameow.bin" .align 2 Cry_Purugly:: - .incbin "sound/direct_sound_samples/cries/cry_not_purugly.bin" + .incbin "sound/direct_sound_samples/cries/purugly.bin" .align 2 Cry_Chingling:: - .incbin "sound/direct_sound_samples/cries/cry_not_chingling.bin" + .incbin "sound/direct_sound_samples/cries/chingling.bin" .align 2 Cry_Stunky:: - .incbin "sound/direct_sound_samples/cries/cry_not_stunky.bin" + .incbin "sound/direct_sound_samples/cries/stunky.bin" .align 2 Cry_Skuntank:: - .incbin "sound/direct_sound_samples/cries/cry_not_skuntank.bin" + .incbin "sound/direct_sound_samples/cries/skuntank.bin" .align 2 Cry_Bronzor:: - .incbin "sound/direct_sound_samples/cries/cry_not_bronzor.bin" + .incbin "sound/direct_sound_samples/cries/bronzor.bin" .align 2 Cry_Bronzong:: - .incbin "sound/direct_sound_samples/cries/cry_not_bronzong.bin" + .incbin "sound/direct_sound_samples/cries/bronzong.bin" .align 2 Cry_Bonsly:: - .incbin "sound/direct_sound_samples/cries/cry_not_bonsly.bin" + .incbin "sound/direct_sound_samples/cries/bonsly.bin" .align 2 -Cry_Mimejr:: - .incbin "sound/direct_sound_samples/cries/cry_not_mimejr.bin" +Cry_MimeJr:: + .incbin "sound/direct_sound_samples/cries/mime_jr.bin" .align 2 Cry_Happiny:: - .incbin "sound/direct_sound_samples/cries/cry_not_happiny.bin" + .incbin "sound/direct_sound_samples/cries/happiny.bin" .align 2 Cry_Chatot:: - .incbin "sound/direct_sound_samples/cries/cry_not_chatot.bin" + .incbin "sound/direct_sound_samples/cries/chatot.bin" .align 2 Cry_Spiritomb:: - .incbin "sound/direct_sound_samples/cries/cry_not_spiritomb.bin" + .incbin "sound/direct_sound_samples/cries/spiritomb.bin" .align 2 Cry_Gible:: - .incbin "sound/direct_sound_samples/cries/cry_not_gible.bin" + .incbin "sound/direct_sound_samples/cries/gible.bin" .align 2 Cry_Gabite:: - .incbin "sound/direct_sound_samples/cries/cry_not_gabite.bin" + .incbin "sound/direct_sound_samples/cries/gabite.bin" .align 2 Cry_Garchomp:: - .incbin "sound/direct_sound_samples/cries/cry_not_garchomp.bin" + .incbin "sound/direct_sound_samples/cries/garchomp.bin" .align 2 Cry_Munchlax:: - .incbin "sound/direct_sound_samples/cries/cry_not_munchlax.bin" + .incbin "sound/direct_sound_samples/cries/munchlax.bin" .align 2 Cry_Riolu:: - .incbin "sound/direct_sound_samples/cries/cry_not_riolu.bin" + .incbin "sound/direct_sound_samples/cries/riolu.bin" .align 2 Cry_Lucario:: - .incbin "sound/direct_sound_samples/cries/cry_not_lucario.bin" + .incbin "sound/direct_sound_samples/cries/lucario.bin" .align 2 Cry_Hippopotas:: - .incbin "sound/direct_sound_samples/cries/cry_not_hippopotas.bin" + .incbin "sound/direct_sound_samples/cries/hippopotas.bin" .align 2 Cry_Hippowdon:: - .incbin "sound/direct_sound_samples/cries/cry_not_hippowdon.bin" + .incbin "sound/direct_sound_samples/cries/hippowdon.bin" .align 2 Cry_Skorupi:: - .incbin "sound/direct_sound_samples/cries/cry_not_skorupi.bin" + .incbin "sound/direct_sound_samples/cries/skorupi.bin" .align 2 Cry_Drapion:: - .incbin "sound/direct_sound_samples/cries/cry_not_drapion.bin" + .incbin "sound/direct_sound_samples/cries/drapion.bin" .align 2 Cry_Croagunk:: - .incbin "sound/direct_sound_samples/cries/cry_not_croagunk.bin" + .incbin "sound/direct_sound_samples/cries/croagunk.bin" .align 2 Cry_Toxicroak:: - .incbin "sound/direct_sound_samples/cries/cry_not_toxicroak.bin" + .incbin "sound/direct_sound_samples/cries/toxicroak.bin" .align 2 Cry_Carnivine:: - .incbin "sound/direct_sound_samples/cries/cry_not_carnivine.bin" + .incbin "sound/direct_sound_samples/cries/carnivine.bin" .align 2 Cry_Finneon:: - .incbin "sound/direct_sound_samples/cries/cry_not_finneon.bin" + .incbin "sound/direct_sound_samples/cries/finneon.bin" .align 2 Cry_Lumineon:: - .incbin "sound/direct_sound_samples/cries/cry_not_lumineon.bin" + .incbin "sound/direct_sound_samples/cries/lumineon.bin" .align 2 Cry_Mantyke:: - .incbin "sound/direct_sound_samples/cries/cry_not_mantyke.bin" + .incbin "sound/direct_sound_samples/cries/mantyke.bin" .align 2 Cry_Snover:: - .incbin "sound/direct_sound_samples/cries/cry_not_snover.bin" + .incbin "sound/direct_sound_samples/cries/snover.bin" .align 2 Cry_Abomasnow:: - .incbin "sound/direct_sound_samples/cries/cry_not_abomasnow.bin" + .incbin "sound/direct_sound_samples/cries/abomasnow.bin" .align 2 Cry_Weavile:: - .incbin "sound/direct_sound_samples/cries/cry_not_weavile.bin" + .incbin "sound/direct_sound_samples/cries/weavile.bin" .align 2 Cry_Magnezone:: - .incbin "sound/direct_sound_samples/cries/cry_not_magnezone.bin" + .incbin "sound/direct_sound_samples/cries/magnezone.bin" .align 2 Cry_Lickilicky:: - .incbin "sound/direct_sound_samples/cries/cry_not_lickilicky.bin" + .incbin "sound/direct_sound_samples/cries/lickilicky.bin" .align 2 Cry_Rhyperior:: - .incbin "sound/direct_sound_samples/cries/cry_not_rhyperior.bin" + .incbin "sound/direct_sound_samples/cries/rhyperior.bin" .align 2 Cry_Tangrowth:: - .incbin "sound/direct_sound_samples/cries/cry_not_tangrowth.bin" + .incbin "sound/direct_sound_samples/cries/tangrowth.bin" .align 2 Cry_Electivire:: - .incbin "sound/direct_sound_samples/cries/cry_not_electivire.bin" + .incbin "sound/direct_sound_samples/cries/electivire.bin" .align 2 Cry_Magmortar:: - .incbin "sound/direct_sound_samples/cries/cry_not_magmortar.bin" + .incbin "sound/direct_sound_samples/cries/magmortar.bin" .align 2 Cry_Togekiss:: - .incbin "sound/direct_sound_samples/cries/cry_not_togekiss.bin" + .incbin "sound/direct_sound_samples/cries/togekiss.bin" .align 2 Cry_Yanmega:: - .incbin "sound/direct_sound_samples/cries/cry_not_yanmega.bin" + .incbin "sound/direct_sound_samples/cries/yanmega.bin" .align 2 Cry_Leafeon:: - .incbin "sound/direct_sound_samples/cries/cry_not_leafeon.bin" + .incbin "sound/direct_sound_samples/cries/leafeon.bin" .align 2 Cry_Glaceon:: - .incbin "sound/direct_sound_samples/cries/cry_not_glaceon.bin" + .incbin "sound/direct_sound_samples/cries/glaceon.bin" .align 2 Cry_Gliscor:: - .incbin "sound/direct_sound_samples/cries/cry_not_gliscor.bin" + .incbin "sound/direct_sound_samples/cries/gliscor.bin" .align 2 Cry_Mamoswine:: - .incbin "sound/direct_sound_samples/cries/cry_not_mamoswine.bin" + .incbin "sound/direct_sound_samples/cries/mamoswine.bin" .align 2 Cry_PorygonZ:: - .incbin "sound/direct_sound_samples/cries/cry_not_porygonZ.bin" + .incbin "sound/direct_sound_samples/cries/porygon_z.bin" .align 2 Cry_Gallade:: - .incbin "sound/direct_sound_samples/cries/cry_not_gallade.bin" + .incbin "sound/direct_sound_samples/cries/gallade.bin" .align 2 Cry_Probopass:: - .incbin "sound/direct_sound_samples/cries/cry_not_probopass.bin" + .incbin "sound/direct_sound_samples/cries/probopass.bin" .align 2 Cry_Dusknoir:: - .incbin "sound/direct_sound_samples/cries/cry_not_dusknoir.bin" + .incbin "sound/direct_sound_samples/cries/dusknoir.bin" .align 2 Cry_Froslass:: - .incbin "sound/direct_sound_samples/cries/cry_not_froslass.bin" + .incbin "sound/direct_sound_samples/cries/froslass.bin" .align 2 Cry_Rotom:: - .incbin "sound/direct_sound_samples/cries/cry_not_rotom.bin" + .incbin "sound/direct_sound_samples/cries/rotom.bin" .align 2 Cry_Uxie:: - .incbin "sound/direct_sound_samples/cries/cry_not_uxie.bin" + .incbin "sound/direct_sound_samples/cries/uxie.bin" .align 2 Cry_Mesprit:: - .incbin "sound/direct_sound_samples/cries/cry_not_mesprit.bin" + .incbin "sound/direct_sound_samples/cries/mesprit.bin" .align 2 Cry_Azelf:: - .incbin "sound/direct_sound_samples/cries/cry_not_azelf.bin" + .incbin "sound/direct_sound_samples/cries/azelf.bin" .align 2 Cry_Dialga:: - .incbin "sound/direct_sound_samples/cries/cry_not_dialga.bin" + .incbin "sound/direct_sound_samples/cries/dialga.bin" .align 2 Cry_Palkia:: - .incbin "sound/direct_sound_samples/cries/cry_not_palkia.bin" + .incbin "sound/direct_sound_samples/cries/palkia.bin" .align 2 Cry_Heatran:: - .incbin "sound/direct_sound_samples/cries/cry_not_heatran.bin" + .incbin "sound/direct_sound_samples/cries/heatran.bin" .align 2 Cry_Regigigas:: - .incbin "sound/direct_sound_samples/cries/cry_not_regigigas.bin" + .incbin "sound/direct_sound_samples/cries/regigigas.bin" .align 2 Cry_Giratina:: - .incbin "sound/direct_sound_samples/cries/cry_not_giratina.bin" + .incbin "sound/direct_sound_samples/cries/giratina.bin" .align 2 Cry_Cresselia:: - .incbin "sound/direct_sound_samples/cries/cry_not_cresselia.bin" + .incbin "sound/direct_sound_samples/cries/cresselia.bin" .align 2 Cry_Phione:: - .incbin "sound/direct_sound_samples/cries/cry_not_phione.bin" + .incbin "sound/direct_sound_samples/cries/phione.bin" .align 2 Cry_Manaphy:: - .incbin "sound/direct_sound_samples/cries/cry_not_manaphy.bin" + .incbin "sound/direct_sound_samples/cries/manaphy.bin" .align 2 Cry_Darkrai:: - .incbin "sound/direct_sound_samples/cries/cry_not_darkrai.bin" + .incbin "sound/direct_sound_samples/cries/darkrai.bin" .align 2 Cry_Shaymin:: - .incbin "sound/direct_sound_samples/cries/cry_not_shaymin.bin" + .incbin "sound/direct_sound_samples/cries/shaymin.bin" .align 2 Cry_Arceus:: - .incbin "sound/direct_sound_samples/cries/cry_not_arceus.bin" + .incbin "sound/direct_sound_samples/cries/arceus.bin" .align 2 Cry_Victini:: - .incbin "sound/direct_sound_samples/cries/cry_not_victini.bin" + .incbin "sound/direct_sound_samples/cries/victini.bin" .align 2 Cry_Snivy:: - .incbin "sound/direct_sound_samples/cries/cry_not_snivy.bin" + .incbin "sound/direct_sound_samples/cries/snivy.bin" .align 2 Cry_Servine:: - .incbin "sound/direct_sound_samples/cries/cry_not_servine.bin" + .incbin "sound/direct_sound_samples/cries/servine.bin" .align 2 Cry_Serperior:: - .incbin "sound/direct_sound_samples/cries/cry_not_serperior.bin" + .incbin "sound/direct_sound_samples/cries/serperior.bin" .align 2 Cry_Tepig:: - .incbin "sound/direct_sound_samples/cries/cry_not_tepig.bin" + .incbin "sound/direct_sound_samples/cries/tepig.bin" .align 2 Cry_Pignite:: - .incbin "sound/direct_sound_samples/cries/cry_not_pignite.bin" + .incbin "sound/direct_sound_samples/cries/pignite.bin" .align 2 Cry_Emboar:: - .incbin "sound/direct_sound_samples/cries/cry_not_emboar.bin" + .incbin "sound/direct_sound_samples/cries/emboar.bin" .align 2 Cry_Oshawott:: - .incbin "sound/direct_sound_samples/cries/cry_not_oshawott.bin" + .incbin "sound/direct_sound_samples/cries/oshawott.bin" .align 2 Cry_Dewott:: - .incbin "sound/direct_sound_samples/cries/cry_not_dewott.bin" + .incbin "sound/direct_sound_samples/cries/dewott.bin" .align 2 Cry_Samurott:: - .incbin "sound/direct_sound_samples/cries/cry_not_samurott.bin" + .incbin "sound/direct_sound_samples/cries/samurott.bin" .align 2 Cry_Patrat:: - .incbin "sound/direct_sound_samples/cries/cry_not_patrat.bin" + .incbin "sound/direct_sound_samples/cries/patrat.bin" .align 2 Cry_Watchog:: - .incbin "sound/direct_sound_samples/cries/cry_not_watchog.bin" + .incbin "sound/direct_sound_samples/cries/watchog.bin" .align 2 Cry_Lillipup:: - .incbin "sound/direct_sound_samples/cries/cry_not_lillipup.bin" + .incbin "sound/direct_sound_samples/cries/lillipup.bin" .align 2 Cry_Herdier:: - .incbin "sound/direct_sound_samples/cries/cry_not_herdier.bin" + .incbin "sound/direct_sound_samples/cries/herdier.bin" .align 2 Cry_Stoutland:: - .incbin "sound/direct_sound_samples/cries/cry_not_stoutland.bin" + .incbin "sound/direct_sound_samples/cries/stoutland.bin" .align 2 Cry_Purrloin:: - .incbin "sound/direct_sound_samples/cries/cry_not_purrloin.bin" + .incbin "sound/direct_sound_samples/cries/purrloin.bin" .align 2 Cry_Liepard:: - .incbin "sound/direct_sound_samples/cries/cry_not_liepard.bin" + .incbin "sound/direct_sound_samples/cries/liepard.bin" .align 2 Cry_Pansage:: - .incbin "sound/direct_sound_samples/cries/cry_not_pansage.bin" + .incbin "sound/direct_sound_samples/cries/pansage.bin" .align 2 Cry_Simisage:: - .incbin "sound/direct_sound_samples/cries/cry_not_simisage.bin" + .incbin "sound/direct_sound_samples/cries/simisage.bin" .align 2 Cry_Pansear:: - .incbin "sound/direct_sound_samples/cries/cry_not_pansear.bin" + .incbin "sound/direct_sound_samples/cries/pansear.bin" .align 2 Cry_Simisear:: - .incbin "sound/direct_sound_samples/cries/cry_not_simisear.bin" + .incbin "sound/direct_sound_samples/cries/simisear.bin" .align 2 Cry_Panpour:: - .incbin "sound/direct_sound_samples/cries/cry_not_panpour.bin" + .incbin "sound/direct_sound_samples/cries/panpour.bin" .align 2 Cry_Simipour:: - .incbin "sound/direct_sound_samples/cries/cry_not_simipour.bin" + .incbin "sound/direct_sound_samples/cries/simipour.bin" .align 2 Cry_Munna:: - .incbin "sound/direct_sound_samples/cries/cry_not_munna.bin" + .incbin "sound/direct_sound_samples/cries/munna.bin" .align 2 Cry_Musharna:: - .incbin "sound/direct_sound_samples/cries/cry_not_musharna.bin" + .incbin "sound/direct_sound_samples/cries/musharna.bin" .align 2 Cry_Pidove:: - .incbin "sound/direct_sound_samples/cries/cry_not_pidove.bin" + .incbin "sound/direct_sound_samples/cries/pidove.bin" .align 2 Cry_Tranquill:: - .incbin "sound/direct_sound_samples/cries/cry_not_tranquill.bin" + .incbin "sound/direct_sound_samples/cries/tranquill.bin" .align 2 Cry_Unfezant:: - .incbin "sound/direct_sound_samples/cries/cry_not_unfezant.bin" + .incbin "sound/direct_sound_samples/cries/unfezant.bin" .align 2 Cry_Blitzle:: - .incbin "sound/direct_sound_samples/cries/cry_not_blitzle.bin" + .incbin "sound/direct_sound_samples/cries/blitzle.bin" .align 2 Cry_Zebstrika:: - .incbin "sound/direct_sound_samples/cries/cry_not_zebstrika.bin" + .incbin "sound/direct_sound_samples/cries/zebstrika.bin" .align 2 Cry_Roggenrola:: - .incbin "sound/direct_sound_samples/cries/cry_not_roggenrola.bin" + .incbin "sound/direct_sound_samples/cries/roggenrola.bin" .align 2 Cry_Boldore:: - .incbin "sound/direct_sound_samples/cries/cry_not_boldore.bin" + .incbin "sound/direct_sound_samples/cries/boldore.bin" .align 2 Cry_Gigalith:: - .incbin "sound/direct_sound_samples/cries/cry_not_gigalith.bin" + .incbin "sound/direct_sound_samples/cries/gigalith.bin" .align 2 Cry_Woobat:: - .incbin "sound/direct_sound_samples/cries/cry_not_woobat.bin" + .incbin "sound/direct_sound_samples/cries/woobat.bin" .align 2 Cry_Swoobat:: - .incbin "sound/direct_sound_samples/cries/cry_not_swoobat.bin" + .incbin "sound/direct_sound_samples/cries/swoobat.bin" .align 2 Cry_Drilbur:: - .incbin "sound/direct_sound_samples/cries/cry_not_drilbur.bin" + .incbin "sound/direct_sound_samples/cries/drilbur.bin" .align 2 Cry_Excadrill:: - .incbin "sound/direct_sound_samples/cries/cry_not_excadrill.bin" + .incbin "sound/direct_sound_samples/cries/excadrill.bin" .align 2 Cry_Audino:: - .incbin "sound/direct_sound_samples/cries/cry_not_audino.bin" + .incbin "sound/direct_sound_samples/cries/audino.bin" .align 2 Cry_Timburr:: - .incbin "sound/direct_sound_samples/cries/cry_not_timburr.bin" + .incbin "sound/direct_sound_samples/cries/timburr.bin" .align 2 Cry_Gurdurr:: - .incbin "sound/direct_sound_samples/cries/cry_not_gurdurr.bin" + .incbin "sound/direct_sound_samples/cries/gurdurr.bin" .align 2 Cry_Conkeldurr:: - .incbin "sound/direct_sound_samples/cries/cry_not_conkeldurr.bin" + .incbin "sound/direct_sound_samples/cries/conkeldurr.bin" .align 2 Cry_Tympole:: - .incbin "sound/direct_sound_samples/cries/cry_not_tympole.bin" + .incbin "sound/direct_sound_samples/cries/tympole.bin" .align 2 Cry_Palpitoad:: - .incbin "sound/direct_sound_samples/cries/cry_not_palpitoad.bin" + .incbin "sound/direct_sound_samples/cries/palpitoad.bin" .align 2 Cry_Seismitoad:: - .incbin "sound/direct_sound_samples/cries/cry_not_seismitoad.bin" + .incbin "sound/direct_sound_samples/cries/seismitoad.bin" .align 2 Cry_Throh:: - .incbin "sound/direct_sound_samples/cries/cry_not_throh.bin" + .incbin "sound/direct_sound_samples/cries/throh.bin" .align 2 Cry_Sawk:: - .incbin "sound/direct_sound_samples/cries/cry_not_sawk.bin" + .incbin "sound/direct_sound_samples/cries/sawk.bin" .align 2 Cry_Sewaddle:: - .incbin "sound/direct_sound_samples/cries/cry_not_sewaddle.bin" + .incbin "sound/direct_sound_samples/cries/sewaddle.bin" .align 2 Cry_Swadloon:: - .incbin "sound/direct_sound_samples/cries/cry_not_swadloon.bin" + .incbin "sound/direct_sound_samples/cries/swadloon.bin" .align 2 Cry_Leavanny:: - .incbin "sound/direct_sound_samples/cries/cry_not_leavanny.bin" + .incbin "sound/direct_sound_samples/cries/leavanny.bin" .align 2 Cry_Venipede:: - .incbin "sound/direct_sound_samples/cries/cry_not_venipede.bin" + .incbin "sound/direct_sound_samples/cries/venipede.bin" .align 2 Cry_Whirlipede:: - .incbin "sound/direct_sound_samples/cries/cry_not_whirlipede.bin" + .incbin "sound/direct_sound_samples/cries/whirlipede.bin" .align 2 Cry_Scolipede:: - .incbin "sound/direct_sound_samples/cries/cry_not_scolipede.bin" + .incbin "sound/direct_sound_samples/cries/scolipede.bin" .align 2 Cry_Cottonee:: - .incbin "sound/direct_sound_samples/cries/cry_not_cottonee.bin" + .incbin "sound/direct_sound_samples/cries/cottonee.bin" .align 2 Cry_Whimsicott:: - .incbin "sound/direct_sound_samples/cries/cry_not_whimsicott.bin" + .incbin "sound/direct_sound_samples/cries/whimsicott.bin" .align 2 Cry_Petilil:: - .incbin "sound/direct_sound_samples/cries/cry_not_petilil.bin" + .incbin "sound/direct_sound_samples/cries/petilil.bin" .align 2 Cry_Lilligant:: - .incbin "sound/direct_sound_samples/cries/cry_not_lilligant.bin" + .incbin "sound/direct_sound_samples/cries/lilligant.bin" .align 2 Cry_Basculin:: - .incbin "sound/direct_sound_samples/cries/cry_not_basculin.bin" + .incbin "sound/direct_sound_samples/cries/basculin.bin" .align 2 Cry_Sandile:: - .incbin "sound/direct_sound_samples/cries/cry_not_sandile.bin" + .incbin "sound/direct_sound_samples/cries/sandile.bin" .align 2 Cry_Krokorok:: - .incbin "sound/direct_sound_samples/cries/cry_not_krokorok.bin" + .incbin "sound/direct_sound_samples/cries/krokorok.bin" .align 2 Cry_Krookodile:: - .incbin "sound/direct_sound_samples/cries/cry_not_krookodile.bin" + .incbin "sound/direct_sound_samples/cries/krookodile.bin" .align 2 Cry_Darumaka:: - .incbin "sound/direct_sound_samples/cries/cry_not_darumaka.bin" + .incbin "sound/direct_sound_samples/cries/darumaka.bin" .align 2 Cry_Darmanitan:: - .incbin "sound/direct_sound_samples/cries/cry_not_darmanitan.bin" + .incbin "sound/direct_sound_samples/cries/darmanitan.bin" .align 2 Cry_Maractus:: - .incbin "sound/direct_sound_samples/cries/cry_not_maractus.bin" + .incbin "sound/direct_sound_samples/cries/maractus.bin" .align 2 Cry_Dwebble:: - .incbin "sound/direct_sound_samples/cries/cry_not_dwebble.bin" + .incbin "sound/direct_sound_samples/cries/dwebble.bin" .align 2 Cry_Crustle:: - .incbin "sound/direct_sound_samples/cries/cry_not_crustle.bin" + .incbin "sound/direct_sound_samples/cries/crustle.bin" .align 2 Cry_Scraggy:: - .incbin "sound/direct_sound_samples/cries/cry_not_scraggy.bin" + .incbin "sound/direct_sound_samples/cries/scraggy.bin" .align 2 Cry_Scrafty:: - .incbin "sound/direct_sound_samples/cries/cry_not_scrafty.bin" + .incbin "sound/direct_sound_samples/cries/scrafty.bin" .align 2 Cry_Sigilyph:: - .incbin "sound/direct_sound_samples/cries/cry_not_sigilyph.bin" + .incbin "sound/direct_sound_samples/cries/sigilyph.bin" .align 2 Cry_Yamask:: - .incbin "sound/direct_sound_samples/cries/cry_not_yamask.bin" + .incbin "sound/direct_sound_samples/cries/yamask.bin" .align 2 Cry_Cofagrigus:: - .incbin "sound/direct_sound_samples/cries/cry_not_cofagrigus.bin" + .incbin "sound/direct_sound_samples/cries/cofagrigus.bin" .align 2 Cry_Tirtouga:: - .incbin "sound/direct_sound_samples/cries/cry_not_tirtouga.bin" + .incbin "sound/direct_sound_samples/cries/tirtouga.bin" .align 2 Cry_Carracosta:: - .incbin "sound/direct_sound_samples/cries/cry_not_carracosta.bin" + .incbin "sound/direct_sound_samples/cries/carracosta.bin" .align 2 Cry_Archen:: - .incbin "sound/direct_sound_samples/cries/cry_not_archen.bin" + .incbin "sound/direct_sound_samples/cries/archen.bin" .align 2 Cry_Archeops:: - .incbin "sound/direct_sound_samples/cries/cry_not_archeops.bin" + .incbin "sound/direct_sound_samples/cries/archeops.bin" .align 2 Cry_Trubbish:: - .incbin "sound/direct_sound_samples/cries/cry_not_trubbish.bin" + .incbin "sound/direct_sound_samples/cries/trubbish.bin" .align 2 Cry_Garbodor:: - .incbin "sound/direct_sound_samples/cries/cry_not_garbodor.bin" + .incbin "sound/direct_sound_samples/cries/garbodor.bin" .align 2 Cry_Zorua:: - .incbin "sound/direct_sound_samples/cries/cry_not_zorua.bin" + .incbin "sound/direct_sound_samples/cries/zorua.bin" .align 2 Cry_Zoroark:: - .incbin "sound/direct_sound_samples/cries/cry_not_zoroark.bin" + .incbin "sound/direct_sound_samples/cries/zoroark.bin" .align 2 Cry_Minccino:: - .incbin "sound/direct_sound_samples/cries/cry_not_minccino.bin" + .incbin "sound/direct_sound_samples/cries/minccino.bin" .align 2 Cry_Cinccino:: - .incbin "sound/direct_sound_samples/cries/cry_not_cinccino.bin" + .incbin "sound/direct_sound_samples/cries/cinccino.bin" .align 2 Cry_Gothita:: - .incbin "sound/direct_sound_samples/cries/cry_not_gothita.bin" + .incbin "sound/direct_sound_samples/cries/gothita.bin" .align 2 Cry_Gothorita:: - .incbin "sound/direct_sound_samples/cries/cry_not_gothorita.bin" + .incbin "sound/direct_sound_samples/cries/gothorita.bin" .align 2 Cry_Gothitelle:: - .incbin "sound/direct_sound_samples/cries/cry_not_gothitelle.bin" + .incbin "sound/direct_sound_samples/cries/gothitelle.bin" .align 2 Cry_Solosis:: - .incbin "sound/direct_sound_samples/cries/cry_not_solosis.bin" + .incbin "sound/direct_sound_samples/cries/solosis.bin" .align 2 Cry_Duosion:: - .incbin "sound/direct_sound_samples/cries/cry_not_duosion.bin" + .incbin "sound/direct_sound_samples/cries/duosion.bin" .align 2 Cry_Reuniclus:: - .incbin "sound/direct_sound_samples/cries/cry_not_reuniclus.bin" + .incbin "sound/direct_sound_samples/cries/reuniclus.bin" .align 2 Cry_Ducklett:: - .incbin "sound/direct_sound_samples/cries/cry_not_ducklett.bin" + .incbin "sound/direct_sound_samples/cries/ducklett.bin" .align 2 Cry_Swanna:: - .incbin "sound/direct_sound_samples/cries/cry_not_swanna.bin" + .incbin "sound/direct_sound_samples/cries/swanna.bin" .align 2 Cry_Vanillite:: - .incbin "sound/direct_sound_samples/cries/cry_not_vanillite.bin" + .incbin "sound/direct_sound_samples/cries/vanillite.bin" .align 2 Cry_Vanillish:: - .incbin "sound/direct_sound_samples/cries/cry_not_vanillish.bin" + .incbin "sound/direct_sound_samples/cries/vanillish.bin" .align 2 Cry_Vanilluxe:: - .incbin "sound/direct_sound_samples/cries/cry_not_vanilluxe.bin" + .incbin "sound/direct_sound_samples/cries/vanilluxe.bin" .align 2 Cry_Deerling:: - .incbin "sound/direct_sound_samples/cries/cry_not_deerling.bin" + .incbin "sound/direct_sound_samples/cries/deerling.bin" .align 2 Cry_Sawsbuck:: - .incbin "sound/direct_sound_samples/cries/cry_not_sawsbuck.bin" + .incbin "sound/direct_sound_samples/cries/sawsbuck.bin" .align 2 Cry_Emolga:: - .incbin "sound/direct_sound_samples/cries/cry_not_emolga.bin" + .incbin "sound/direct_sound_samples/cries/emolga.bin" .align 2 Cry_Karrablast:: - .incbin "sound/direct_sound_samples/cries/cry_not_karrablast.bin" + .incbin "sound/direct_sound_samples/cries/karrablast.bin" .align 2 Cry_Escavalier:: - .incbin "sound/direct_sound_samples/cries/cry_not_escavalier.bin" + .incbin "sound/direct_sound_samples/cries/escavalier.bin" .align 2 Cry_Foongus:: - .incbin "sound/direct_sound_samples/cries/cry_not_foongus.bin" + .incbin "sound/direct_sound_samples/cries/foongus.bin" .align 2 Cry_Amoonguss:: - .incbin "sound/direct_sound_samples/cries/cry_not_amoonguss.bin" + .incbin "sound/direct_sound_samples/cries/amoonguss.bin" .align 2 Cry_Frillish:: - .incbin "sound/direct_sound_samples/cries/cry_not_frillish.bin" + .incbin "sound/direct_sound_samples/cries/frillish.bin" .align 2 Cry_Jellicent:: - .incbin "sound/direct_sound_samples/cries/cry_not_jellicent.bin" + .incbin "sound/direct_sound_samples/cries/jellicent.bin" .align 2 Cry_Alomomola:: - .incbin "sound/direct_sound_samples/cries/cry_not_alomomola.bin" + .incbin "sound/direct_sound_samples/cries/alomomola.bin" .align 2 Cry_Joltik:: - .incbin "sound/direct_sound_samples/cries/cry_not_joltik.bin" + .incbin "sound/direct_sound_samples/cries/joltik.bin" .align 2 Cry_Galvantula:: - .incbin "sound/direct_sound_samples/cries/cry_not_galvantula.bin" + .incbin "sound/direct_sound_samples/cries/galvantula.bin" .align 2 Cry_Ferroseed:: - .incbin "sound/direct_sound_samples/cries/cry_not_ferroseed.bin" + .incbin "sound/direct_sound_samples/cries/ferroseed.bin" .align 2 Cry_Ferrothorn:: - .incbin "sound/direct_sound_samples/cries/cry_not_ferrothorn.bin" + .incbin "sound/direct_sound_samples/cries/ferrothorn.bin" .align 2 Cry_Klink:: - .incbin "sound/direct_sound_samples/cries/cry_not_klink.bin" + .incbin "sound/direct_sound_samples/cries/klink.bin" .align 2 Cry_Klang:: - .incbin "sound/direct_sound_samples/cries/cry_not_klang.bin" + .incbin "sound/direct_sound_samples/cries/klang.bin" .align 2 Cry_Klinklang:: - .incbin "sound/direct_sound_samples/cries/cry_not_klinklang.bin" + .incbin "sound/direct_sound_samples/cries/klinklang.bin" .align 2 Cry_Tynamo:: - .incbin "sound/direct_sound_samples/cries/cry_not_tynamo.bin" + .incbin "sound/direct_sound_samples/cries/tynamo.bin" .align 2 Cry_Eelektrik:: - .incbin "sound/direct_sound_samples/cries/cry_not_eelektrik.bin" + .incbin "sound/direct_sound_samples/cries/eelektrik.bin" .align 2 Cry_Eelektross:: - .incbin "sound/direct_sound_samples/cries/cry_not_eelektross.bin" + .incbin "sound/direct_sound_samples/cries/eelektross.bin" .align 2 Cry_Elgyem:: - .incbin "sound/direct_sound_samples/cries/cry_not_elgyem.bin" + .incbin "sound/direct_sound_samples/cries/elgyem.bin" .align 2 Cry_Beheeyem:: - .incbin "sound/direct_sound_samples/cries/cry_not_beheeyem.bin" + .incbin "sound/direct_sound_samples/cries/beheeyem.bin" .align 2 Cry_Litwick:: - .incbin "sound/direct_sound_samples/cries/cry_not_litwick.bin" + .incbin "sound/direct_sound_samples/cries/litwick.bin" .align 2 Cry_Lampent:: - .incbin "sound/direct_sound_samples/cries/cry_not_lampent.bin" + .incbin "sound/direct_sound_samples/cries/lampent.bin" .align 2 Cry_Chandelure:: - .incbin "sound/direct_sound_samples/cries/cry_not_chandelure.bin" + .incbin "sound/direct_sound_samples/cries/chandelure.bin" .align 2 Cry_Axew:: - .incbin "sound/direct_sound_samples/cries/cry_not_axew.bin" + .incbin "sound/direct_sound_samples/cries/axew.bin" .align 2 Cry_Fraxure:: - .incbin "sound/direct_sound_samples/cries/cry_not_fraxure.bin" + .incbin "sound/direct_sound_samples/cries/fraxure.bin" .align 2 Cry_Haxorus:: - .incbin "sound/direct_sound_samples/cries/cry_not_haxorus.bin" + .incbin "sound/direct_sound_samples/cries/haxorus.bin" .align 2 Cry_Cubchoo:: - .incbin "sound/direct_sound_samples/cries/cry_not_cubchoo.bin" + .incbin "sound/direct_sound_samples/cries/cubchoo.bin" .align 2 Cry_Beartic:: - .incbin "sound/direct_sound_samples/cries/cry_not_beartic.bin" + .incbin "sound/direct_sound_samples/cries/beartic.bin" .align 2 Cry_Cryogonal:: - .incbin "sound/direct_sound_samples/cries/cry_not_cryogonal.bin" + .incbin "sound/direct_sound_samples/cries/cryogonal.bin" .align 2 Cry_Shelmet:: - .incbin "sound/direct_sound_samples/cries/cry_not_shelmet.bin" + .incbin "sound/direct_sound_samples/cries/shelmet.bin" .align 2 Cry_Accelgor:: - .incbin "sound/direct_sound_samples/cries/cry_not_accelgor.bin" + .incbin "sound/direct_sound_samples/cries/accelgor.bin" .align 2 Cry_Stunfisk:: - .incbin "sound/direct_sound_samples/cries/cry_not_stunfisk.bin" + .incbin "sound/direct_sound_samples/cries/stunfisk.bin" .align 2 Cry_Mienfoo:: - .incbin "sound/direct_sound_samples/cries/cry_not_mienfoo.bin" + .incbin "sound/direct_sound_samples/cries/mienfoo.bin" .align 2 Cry_Mienshao:: - .incbin "sound/direct_sound_samples/cries/cry_not_mienshao.bin" + .incbin "sound/direct_sound_samples/cries/mienshao.bin" .align 2 Cry_Druddigon:: - .incbin "sound/direct_sound_samples/cries/cry_not_druddigon.bin" + .incbin "sound/direct_sound_samples/cries/druddigon.bin" .align 2 Cry_Golett:: - .incbin "sound/direct_sound_samples/cries/cry_not_golett.bin" + .incbin "sound/direct_sound_samples/cries/golett.bin" .align 2 Cry_Golurk:: - .incbin "sound/direct_sound_samples/cries/cry_not_golurk.bin" + .incbin "sound/direct_sound_samples/cries/golurk.bin" .align 2 Cry_Pawniard:: - .incbin "sound/direct_sound_samples/cries/cry_not_pawniard.bin" + .incbin "sound/direct_sound_samples/cries/pawniard.bin" .align 2 Cry_Bisharp:: - .incbin "sound/direct_sound_samples/cries/cry_not_bisharp.bin" + .incbin "sound/direct_sound_samples/cries/bisharp.bin" .align 2 Cry_Bouffalant:: - .incbin "sound/direct_sound_samples/cries/cry_not_bouffalant.bin" + .incbin "sound/direct_sound_samples/cries/bouffalant.bin" .align 2 Cry_Rufflet:: - .incbin "sound/direct_sound_samples/cries/cry_not_rufflet.bin" + .incbin "sound/direct_sound_samples/cries/rufflet.bin" .align 2 Cry_Braviary:: - .incbin "sound/direct_sound_samples/cries/cry_not_braviary.bin" + .incbin "sound/direct_sound_samples/cries/braviary.bin" .align 2 Cry_Vullaby:: - .incbin "sound/direct_sound_samples/cries/cry_not_vullaby.bin" + .incbin "sound/direct_sound_samples/cries/vullaby.bin" .align 2 Cry_Mandibuzz:: - .incbin "sound/direct_sound_samples/cries/cry_not_mandibuzz.bin" + .incbin "sound/direct_sound_samples/cries/mandibuzz.bin" .align 2 Cry_Heatmor:: - .incbin "sound/direct_sound_samples/cries/cry_not_heatmor.bin" + .incbin "sound/direct_sound_samples/cries/heatmor.bin" .align 2 Cry_Durant:: - .incbin "sound/direct_sound_samples/cries/cry_not_durant.bin" + .incbin "sound/direct_sound_samples/cries/durant.bin" .align 2 Cry_Deino:: - .incbin "sound/direct_sound_samples/cries/cry_not_deino.bin" + .incbin "sound/direct_sound_samples/cries/deino.bin" .align 2 Cry_Zweilous:: - .incbin "sound/direct_sound_samples/cries/cry_not_zweilous.bin" + .incbin "sound/direct_sound_samples/cries/zweilous.bin" .align 2 Cry_Hydreigon:: - .incbin "sound/direct_sound_samples/cries/cry_not_hydreigon.bin" + .incbin "sound/direct_sound_samples/cries/hydreigon.bin" .align 2 Cry_Larvesta:: - .incbin "sound/direct_sound_samples/cries/cry_not_larvesta.bin" + .incbin "sound/direct_sound_samples/cries/larvesta.bin" .align 2 Cry_Volcarona:: - .incbin "sound/direct_sound_samples/cries/cry_not_volcarona.bin" + .incbin "sound/direct_sound_samples/cries/volcarona.bin" .align 2 Cry_Cobalion:: - .incbin "sound/direct_sound_samples/cries/cry_not_cobalion.bin" + .incbin "sound/direct_sound_samples/cries/cobalion.bin" .align 2 Cry_Terrakion:: - .incbin "sound/direct_sound_samples/cries/cry_not_terrakion.bin" + .incbin "sound/direct_sound_samples/cries/terrakion.bin" .align 2 Cry_Virizion:: - .incbin "sound/direct_sound_samples/cries/cry_not_virizion.bin" + .incbin "sound/direct_sound_samples/cries/virizion.bin" .align 2 Cry_Tornadus:: - .incbin "sound/direct_sound_samples/cries/cry_not_tornadus.bin" + .incbin "sound/direct_sound_samples/cries/tornadus.bin" .align 2 Cry_Thundurus:: - .incbin "sound/direct_sound_samples/cries/cry_not_thundurus.bin" + .incbin "sound/direct_sound_samples/cries/thundurus.bin" .align 2 Cry_Reshiram:: - .incbin "sound/direct_sound_samples/cries/cry_not_reshiram.bin" + .incbin "sound/direct_sound_samples/cries/reshiram.bin" .align 2 Cry_Zekrom:: - .incbin "sound/direct_sound_samples/cries/cry_not_zekrom.bin" + .incbin "sound/direct_sound_samples/cries/zekrom.bin" .align 2 Cry_Landorus:: - .incbin "sound/direct_sound_samples/cries/cry_not_landorus.bin" + .incbin "sound/direct_sound_samples/cries/landorus.bin" .align 2 Cry_Kyurem:: - .incbin "sound/direct_sound_samples/cries/cry_not_kyurem.bin" + .incbin "sound/direct_sound_samples/cries/kyurem.bin" .align 2 Cry_Keldeo:: - .incbin "sound/direct_sound_samples/cries/cry_not_keldeo.bin" + .incbin "sound/direct_sound_samples/cries/keldeo.bin" .align 2 Cry_Meloetta:: - .incbin "sound/direct_sound_samples/cries/cry_not_meloetta.bin" + .incbin "sound/direct_sound_samples/cries/meloetta.bin" .align 2 Cry_Genesect:: - .incbin "sound/direct_sound_samples/cries/cry_not_genesect.bin" + .incbin "sound/direct_sound_samples/cries/genesect.bin" .align 2 Cry_Chespin:: - .incbin "sound/direct_sound_samples/cries/cry_not_chespin.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_chespin.bin" .align 2 Cry_Quilladin:: - .incbin "sound/direct_sound_samples/cries/cry_not_quilladin.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_quilladin.bin" .align 2 Cry_Chesnaught:: - .incbin "sound/direct_sound_samples/cries/cry_not_chesnaught.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_chesnaught.bin" .align 2 Cry_Fennekin:: - .incbin "sound/direct_sound_samples/cries/cry_not_fennekin.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_fennekin.bin" .align 2 Cry_Braixen:: - .incbin "sound/direct_sound_samples/cries/cry_not_braixen.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_braixen.bin" .align 2 Cry_Delphox:: - .incbin "sound/direct_sound_samples/cries/cry_not_delphox.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_delphox.bin" .align 2 Cry_Froakie:: - .incbin "sound/direct_sound_samples/cries/cry_not_froakie.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_froakie.bin" .align 2 Cry_Frogadier:: - .incbin "sound/direct_sound_samples/cries/cry_not_frogadier.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_frogadier.bin" .align 2 Cry_Greninja:: - .incbin "sound/direct_sound_samples/cries/cry_not_greninja.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_greninja.bin" .align 2 Cry_Bunnelby:: - .incbin "sound/direct_sound_samples/cries/cry_not_bunnelby.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_bunnelby.bin" .align 2 Cry_Diggersby:: - .incbin "sound/direct_sound_samples/cries/cry_not_diggersby.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_diggersby.bin" .align 2 Cry_Fletchling:: - .incbin "sound/direct_sound_samples/cries/cry_not_fletchling.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_fletchling.bin" .align 2 Cry_Fletchinder:: - .incbin "sound/direct_sound_samples/cries/cry_not_fletchinder.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_fletchinder.bin" .align 2 Cry_Talonflame:: - .incbin "sound/direct_sound_samples/cries/cry_not_talonflame.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_talonflame.bin" .align 2 Cry_Scatterbug:: - .incbin "sound/direct_sound_samples/cries/cry_not_scatterbug.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_scatterbug.bin" .align 2 Cry_Spewpa:: - .incbin "sound/direct_sound_samples/cries/cry_not_spewpa.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_spewpa.bin" .align 2 Cry_Vivillon:: - .incbin "sound/direct_sound_samples/cries/cry_not_vivillon.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_vivillon.bin" .align 2 Cry_Litleo:: - .incbin "sound/direct_sound_samples/cries/cry_not_litleo.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_litleo.bin" .align 2 Cry_Pyroar:: - .incbin "sound/direct_sound_samples/cries/cry_not_pyroar.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_pyroar.bin" .align 2 Cry_Flabebe:: - .incbin "sound/direct_sound_samples/cries/cry_not_flabebe.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_flabebe.bin" .align 2 Cry_Floette:: - .incbin "sound/direct_sound_samples/cries/cry_not_floette.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_floette.bin" .align 2 Cry_Florges:: - .incbin "sound/direct_sound_samples/cries/cry_not_florges.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_florges.bin" .align 2 Cry_Skiddo:: - .incbin "sound/direct_sound_samples/cries/cry_not_skiddo.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_skiddo.bin" .align 2 Cry_Gogoat:: - .incbin "sound/direct_sound_samples/cries/cry_not_gogoat.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_gogoat.bin" .align 2 Cry_Pancham:: - .incbin "sound/direct_sound_samples/cries/cry_not_pancham.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_pancham.bin" .align 2 Cry_Pangoro:: - .incbin "sound/direct_sound_samples/cries/cry_not_pangoro.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_pangoro.bin" .align 2 Cry_Furfrou:: - .incbin "sound/direct_sound_samples/cries/cry_not_furfrou.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_furfrou.bin" .align 2 Cry_Espurr:: - .incbin "sound/direct_sound_samples/cries/cry_not_espurr.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_espurr.bin" .align 2 Cry_Meowstic:: - .incbin "sound/direct_sound_samples/cries/cry_not_meowstic.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_meowstic.bin" .align 2 Cry_Honedge:: - .incbin "sound/direct_sound_samples/cries/cry_not_honedge.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_honedge.bin" .align 2 Cry_Doublade:: - .incbin "sound/direct_sound_samples/cries/cry_not_doublade.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_doublade.bin" .align 2 Cry_Aegislash:: - .incbin "sound/direct_sound_samples/cries/cry_not_aegislash.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_aegislash.bin" .align 2 Cry_Spritzee:: - .incbin "sound/direct_sound_samples/cries/cry_not_spritzee.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_spritzee.bin" .align 2 Cry_Aromatisse:: - .incbin "sound/direct_sound_samples/cries/cry_not_aromatisse.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_aromatisse.bin" .align 2 Cry_Swirlix:: - .incbin "sound/direct_sound_samples/cries/cry_not_swirlix.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_swirlix.bin" .align 2 Cry_Slurpuff:: - .incbin "sound/direct_sound_samples/cries/cry_not_slurpuff.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_slurpuff.bin" .align 2 Cry_Inkay:: - .incbin "sound/direct_sound_samples/cries/cry_not_inkay.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_inkay.bin" .align 2 Cry_Malamar:: - .incbin "sound/direct_sound_samples/cries/cry_not_malamar.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_malamar.bin" .align 2 Cry_Binacle:: - .incbin "sound/direct_sound_samples/cries/cry_not_binacle.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_binacle.bin" .align 2 Cry_Barbaracle:: - .incbin "sound/direct_sound_samples/cries/cry_not_barbaracle.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_barbaracle.bin" .align 2 Cry_Skrelp:: - .incbin "sound/direct_sound_samples/cries/cry_not_skrelp.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_skrelp.bin" .align 2 Cry_Dragalge:: - .incbin "sound/direct_sound_samples/cries/cry_not_dragalge.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_dragalge.bin" .align 2 Cry_Clauncher:: - .incbin "sound/direct_sound_samples/cries/cry_not_clauncher.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_clauncher.bin" .align 2 Cry_Clawitzer:: - .incbin "sound/direct_sound_samples/cries/cry_not_clawitzer.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_clawitzer.bin" .align 2 Cry_Helioptile:: - .incbin "sound/direct_sound_samples/cries/cry_not_helioptile.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_helioptile.bin" .align 2 Cry_Heliolisk:: - .incbin "sound/direct_sound_samples/cries/cry_not_heliolisk.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_heliolisk.bin" .align 2 Cry_Tyrunt:: - .incbin "sound/direct_sound_samples/cries/cry_not_tyrunt.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_tyrunt.bin" .align 2 Cry_Tyrantrum:: - .incbin "sound/direct_sound_samples/cries/cry_not_tyrantrum.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_tyrantrum.bin" .align 2 Cry_Amaura:: - .incbin "sound/direct_sound_samples/cries/cry_not_amaura.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_amaura.bin" .align 2 Cry_Aurorus:: - .incbin "sound/direct_sound_samples/cries/cry_not_aurorus.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_aurorus.bin" .align 2 Cry_Sylveon:: - .incbin "sound/direct_sound_samples/cries/cry_not_sylveon.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_sylveon.bin" .align 2 Cry_Hawlucha:: - .incbin "sound/direct_sound_samples/cries/cry_not_hawlucha.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_hawlucha.bin" .align 2 Cry_Dedenne:: - .incbin "sound/direct_sound_samples/cries/cry_not_dedenne.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_dedenne.bin" .align 2 Cry_Carbink:: - .incbin "sound/direct_sound_samples/cries/cry_not_carbink.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_carbink.bin" .align 2 Cry_Goomy:: - .incbin "sound/direct_sound_samples/cries/cry_not_goomy.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_goomy.bin" .align 2 Cry_Sliggoo:: - .incbin "sound/direct_sound_samples/cries/cry_not_sliggoo.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_sliggoo.bin" .align 2 Cry_Goodra:: - .incbin "sound/direct_sound_samples/cries/cry_not_goodra.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_goodra.bin" .align 2 Cry_Klefki:: - .incbin "sound/direct_sound_samples/cries/cry_not_klefki.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_klefki.bin" .align 2 Cry_Phantump:: - .incbin "sound/direct_sound_samples/cries/cry_not_phantump.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_phantump.bin" .align 2 Cry_Trevenant:: - .incbin "sound/direct_sound_samples/cries/cry_not_trevenant.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_trevenant.bin" .align 2 Cry_Pumpkaboo:: - .incbin "sound/direct_sound_samples/cries/cry_not_pumpkaboo.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_pumpkaboo.bin" .align 2 Cry_Gourgeist:: - .incbin "sound/direct_sound_samples/cries/cry_not_gourgeist.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_gourgeist.bin" .align 2 Cry_Bergmite:: - .incbin "sound/direct_sound_samples/cries/cry_not_bergmite.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_bergmite.bin" .align 2 Cry_Avalugg:: - .incbin "sound/direct_sound_samples/cries/cry_not_avalugg.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_avalugg.bin" .align 2 Cry_Noibat:: - .incbin "sound/direct_sound_samples/cries/cry_not_noibat.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_noibat.bin" .align 2 Cry_Noivern:: - .incbin "sound/direct_sound_samples/cries/cry_not_noivern.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_noivern.bin" .align 2 Cry_Xerneas:: - .incbin "sound/direct_sound_samples/cries/cry_not_xerneas.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_xerneas.bin" .align 2 Cry_Yveltal:: - .incbin "sound/direct_sound_samples/cries/cry_not_yveltal.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_yveltal.bin" .align 2 Cry_Zygarde:: - .incbin "sound/direct_sound_samples/cries/cry_not_zygarde.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_zygarde.bin" .align 2 Cry_Diancie:: - .incbin "sound/direct_sound_samples/cries/cry_not_diancie.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_diancie.bin" .align 2 Cry_Hoopa:: - .incbin "sound/direct_sound_samples/cries/cry_not_hoopa.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_hoopa.bin" .align 2 Cry_Volcanion:: - .incbin "sound/direct_sound_samples/cries/cry_not_volcanion.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_volcanion.bin" .align 2 Cry_Rowlet:: - .incbin "sound/direct_sound_samples/cries/cry_not_rowlet.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_rowlet.bin" .align 2 Cry_Dartrix:: - .incbin "sound/direct_sound_samples/cries/cry_not_dartrix.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_dartrix.bin" .align 2 Cry_Decidueye:: - .incbin "sound/direct_sound_samples/cries/cry_not_decidueye.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_decidueye.bin" .align 2 Cry_Litten:: - .incbin "sound/direct_sound_samples/cries/cry_not_litten.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_litten.bin" .align 2 Cry_Torracat:: - .incbin "sound/direct_sound_samples/cries/cry_not_torracat.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_torracat.bin" .align 2 Cry_Incineroar:: - .incbin "sound/direct_sound_samples/cries/cry_not_incineroar.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_incineroar.bin" .align 2 Cry_Popplio:: - .incbin "sound/direct_sound_samples/cries/cry_not_popplio.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_popplio.bin" .align 2 Cry_Brionne:: - .incbin "sound/direct_sound_samples/cries/cry_not_brionne.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_brionne.bin" .align 2 Cry_Primarina:: - .incbin "sound/direct_sound_samples/cries/cry_not_primarina.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_primarina.bin" .align 2 Cry_Pikipek:: - .incbin "sound/direct_sound_samples/cries/cry_not_pikipek.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_pikipek.bin" .align 2 Cry_Trumbeak:: - .incbin "sound/direct_sound_samples/cries/cry_not_trumbeak.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_trumbeak.bin" .align 2 Cry_Toucannon:: - .incbin "sound/direct_sound_samples/cries/cry_not_toucannon.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_toucannon.bin" .align 2 Cry_Yungoos:: - .incbin "sound/direct_sound_samples/cries/cry_not_yungoos.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_yungoos.bin" .align 2 Cry_Gumshoos:: - .incbin "sound/direct_sound_samples/cries/cry_not_gumshoos.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_gumshoos.bin" .align 2 Cry_Grubbin:: - .incbin "sound/direct_sound_samples/cries/cry_not_grubbin.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_grubbin.bin" .align 2 Cry_Charjabug:: - .incbin "sound/direct_sound_samples/cries/cry_not_charjabug.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_charjabug.bin" .align 2 Cry_Vikavolt:: - .incbin "sound/direct_sound_samples/cries/cry_not_vikavolt.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_vikavolt.bin" .align 2 Cry_Crabrawler:: - .incbin "sound/direct_sound_samples/cries/cry_not_crabrawler.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_crabrawler.bin" .align 2 Cry_Crabominable:: - .incbin "sound/direct_sound_samples/cries/cry_not_crabominable.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_crabominable.bin" .align 2 Cry_Oricorio:: - .incbin "sound/direct_sound_samples/cries/cry_not_oricorio.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_oricorio.bin" .align 2 Cry_Cutiefly:: - .incbin "sound/direct_sound_samples/cries/cry_not_cutiefly.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_cutiefly.bin" .align 2 Cry_Ribombee:: - .incbin "sound/direct_sound_samples/cries/cry_not_ribombee.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_ribombee.bin" .align 2 Cry_Rockruff:: - .incbin "sound/direct_sound_samples/cries/cry_not_rockruff.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_rockruff.bin" .align 2 Cry_Lycanroc:: - .incbin "sound/direct_sound_samples/cries/cry_not_lycanroc.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_lycanroc.bin" .align 2 Cry_Wishiwashi:: - .incbin "sound/direct_sound_samples/cries/cry_not_wishiwashi.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_wishiwashi.bin" .align 2 Cry_Mareanie:: - .incbin "sound/direct_sound_samples/cries/cry_not_mareanie.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_mareanie.bin" .align 2 Cry_Toxapex:: - .incbin "sound/direct_sound_samples/cries/cry_not_toxapex.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_toxapex.bin" .align 2 Cry_Mudbray:: - .incbin "sound/direct_sound_samples/cries/cry_not_mudbray.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_mudbray.bin" .align 2 Cry_Mudsdale:: - .incbin "sound/direct_sound_samples/cries/cry_not_mudsdale.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_mudsdale.bin" .align 2 Cry_Dewpider:: - .incbin "sound/direct_sound_samples/cries/cry_not_dewpider.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_dewpider.bin" .align 2 Cry_Araquanid:: - .incbin "sound/direct_sound_samples/cries/cry_not_araquanid.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_araquanid.bin" .align 2 Cry_Fomantis:: - .incbin "sound/direct_sound_samples/cries/cry_not_fomantis.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_fomantis.bin" .align 2 Cry_Lurantis:: - .incbin "sound/direct_sound_samples/cries/cry_not_lurantis.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_lurantis.bin" .align 2 Cry_Morelull:: - .incbin "sound/direct_sound_samples/cries/cry_not_morelull.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_morelull.bin" .align 2 Cry_Shiinotic:: - .incbin "sound/direct_sound_samples/cries/cry_not_shiinotic.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_shiinotic.bin" .align 2 Cry_Salandit:: - .incbin "sound/direct_sound_samples/cries/cry_not_salandit.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_salandit.bin" .align 2 Cry_Salazzle:: - .incbin "sound/direct_sound_samples/cries/cry_not_salazzle.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_salazzle.bin" .align 2 Cry_Stufful:: - .incbin "sound/direct_sound_samples/cries/cry_not_stufful.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_stufful.bin" .align 2 Cry_Bewear:: - .incbin "sound/direct_sound_samples/cries/cry_not_bewear.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_bewear.bin" .align 2 Cry_Bounsweet:: - .incbin "sound/direct_sound_samples/cries/cry_not_bounsweet.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_bounsweet.bin" .align 2 Cry_Steenee:: - .incbin "sound/direct_sound_samples/cries/cry_not_steenee.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_steenee.bin" .align 2 Cry_Tsareena:: - .incbin "sound/direct_sound_samples/cries/cry_not_tsareena.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_tsareena.bin" .align 2 Cry_Comfey:: - .incbin "sound/direct_sound_samples/cries/cry_not_comfey.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_comfey.bin" .align 2 Cry_Oranguru:: - .incbin "sound/direct_sound_samples/cries/cry_not_oranguru.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_oranguru.bin" .align 2 Cry_Passimian:: - .incbin "sound/direct_sound_samples/cries/cry_not_passimian.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_passimian.bin" .align 2 Cry_Wimpod:: - .incbin "sound/direct_sound_samples/cries/cry_not_wimpod.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_wimpod.bin" .align 2 Cry_Golisopod:: - .incbin "sound/direct_sound_samples/cries/cry_not_golisopod.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_golisopod.bin" .align 2 Cry_Sandygast:: - .incbin "sound/direct_sound_samples/cries/cry_not_sandygast.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_sandygast.bin" .align 2 Cry_Palossand:: - .incbin "sound/direct_sound_samples/cries/cry_not_palossand.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_palossand.bin" .align 2 Cry_Pyukumuku:: - .incbin "sound/direct_sound_samples/cries/cry_not_pyukumuku.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_pyukumuku.bin" .align 2 -Cry_Type_null:: - .incbin "sound/direct_sound_samples/cries/cry_not_type_null.bin" +Cry_TypeNull:: + .incbin "sound/direct_sound_samples/cries/uncomp_type_null.bin" .align 2 Cry_Silvally:: - .incbin "sound/direct_sound_samples/cries/cry_not_silvally.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_silvally.bin" .align 2 Cry_Minior:: - .incbin "sound/direct_sound_samples/cries/cry_not_minior.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_minior.bin" .align 2 Cry_Komala:: - .incbin "sound/direct_sound_samples/cries/cry_not_komala.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_komala.bin" .align 2 Cry_Turtonator:: - .incbin "sound/direct_sound_samples/cries/cry_not_turtonator.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_turtonator.bin" .align 2 Cry_Togedemaru:: - .incbin "sound/direct_sound_samples/cries/cry_not_togedemaru.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_togedemaru.bin" .align 2 Cry_Mimikyu:: - .incbin "sound/direct_sound_samples/cries/cry_not_mimikyu.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_mimikyu.bin" .align 2 Cry_Bruxish:: - .incbin "sound/direct_sound_samples/cries/cry_not_bruxish.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_bruxish.bin" .align 2 Cry_Drampa:: - .incbin "sound/direct_sound_samples/cries/cry_not_drampa.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_drampa.bin" .align 2 Cry_Dhelmise:: - .incbin "sound/direct_sound_samples/cries/cry_not_dhelmise.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_dhelmise.bin" .align 2 -Cry_Jangmo_o:: - .incbin "sound/direct_sound_samples/cries/cry_not_jangmo_o.bin" +Cry_Jangmoo:: + .incbin "sound/direct_sound_samples/cries/uncomp_jangmo_o.bin" .align 2 -Cry_Hakamo_o:: - .incbin "sound/direct_sound_samples/cries/cry_not_hakamo_o.bin" +Cry_Hakamoo:: + .incbin "sound/direct_sound_samples/cries/uncomp_hakamo_o.bin" .align 2 -Cry_Kommo_o:: - .incbin "sound/direct_sound_samples/cries/cry_not_kommo_o.bin" +Cry_Kommoo:: + .incbin "sound/direct_sound_samples/cries/uncomp_kommo_o.bin" .align 2 -Cry_Tapu_koko:: - .incbin "sound/direct_sound_samples/cries/cry_not_tapu_koko.bin" +Cry_TapuKoko:: + .incbin "sound/direct_sound_samples/cries/uncomp_tapu_koko.bin" .align 2 -Cry_Tapu_lele:: - .incbin "sound/direct_sound_samples/cries/cry_not_tapu_lele.bin" +Cry_TapuLele:: + .incbin "sound/direct_sound_samples/cries/uncomp_tapu_lele.bin" .align 2 -Cry_Tapu_bulu:: - .incbin "sound/direct_sound_samples/cries/cry_not_tapu_bulu.bin" +Cry_TapuBulu:: + .incbin "sound/direct_sound_samples/cries/uncomp_tapu_bulu.bin" .align 2 -Cry_Tapu_fini:: - .incbin "sound/direct_sound_samples/cries/cry_not_tapu_fini.bin" +Cry_TapuFini:: + .incbin "sound/direct_sound_samples/cries/uncomp_tapu_fini.bin" .align 2 Cry_Cosmog:: - .incbin "sound/direct_sound_samples/cries/cry_not_cosmog.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_cosmog.bin" .align 2 Cry_Cosmoem:: - .incbin "sound/direct_sound_samples/cries/cry_not_cosmoem.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_cosmoem.bin" .align 2 Cry_Solgaleo:: - .incbin "sound/direct_sound_samples/cries/cry_not_solgaleo.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_solgaleo.bin" .align 2 Cry_Lunala:: - .incbin "sound/direct_sound_samples/cries/cry_not_lunala.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_lunala.bin" .align 2 Cry_Nihilego:: - .incbin "sound/direct_sound_samples/cries/cry_not_nihilego.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_nihilego.bin" .align 2 Cry_Buzzwole:: - .incbin "sound/direct_sound_samples/cries/cry_not_buzzwole.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_buzzwole.bin" .align 2 Cry_Pheromosa:: - .incbin "sound/direct_sound_samples/cries/cry_not_pheromosa.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_pheromosa.bin" .align 2 Cry_Xurkitree:: - .incbin "sound/direct_sound_samples/cries/cry_not_xurkitree.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_xurkitree.bin" .align 2 Cry_Celesteela:: - .incbin "sound/direct_sound_samples/cries/cry_not_celesteela.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_celesteela.bin" .align 2 Cry_Kartana:: - .incbin "sound/direct_sound_samples/cries/cry_not_kartana.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_kartana.bin" .align 2 Cry_Guzzlord:: - .incbin "sound/direct_sound_samples/cries/cry_not_guzzlord.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_guzzlord.bin" .align 2 Cry_Necrozma:: - .incbin "sound/direct_sound_samples/cries/cry_not_necrozma.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_necrozma.bin" .align 2 Cry_Magearna:: - .incbin "sound/direct_sound_samples/cries/cry_not_magearna.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_magearna.bin" .align 2 Cry_Marshadow:: - .incbin "sound/direct_sound_samples/cries/cry_not_marshadow.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_marshadow.bin" .align 2 Cry_Poipole:: - .incbin "sound/direct_sound_samples/cries/cry_not_poipole.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_poipole.bin" .align 2 Cry_Naganadel:: - .incbin "sound/direct_sound_samples/cries/cry_not_naganadel.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_naganadel.bin" .align 2 Cry_Stakataka:: - .incbin "sound/direct_sound_samples/cries/cry_not_stakataka.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_stakataka.bin" .align 2 Cry_Blacephalon:: - .incbin "sound/direct_sound_samples/cries/cry_not_blacephalon.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_blacephalon.bin" .align 2 Cry_Zeraora:: - .incbin "sound/direct_sound_samples/cries/cry_not_zeraora.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_zeraora.bin" .align 2 Cry_Meltan:: - .incbin "sound/direct_sound_samples/cries/cry_not_meltan.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_meltan.bin" .align 2 Cry_Melmetal:: - .incbin "sound/direct_sound_samples/cries/cry_not_melmetal.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_melmetal.bin" .align 2 Cry_Grookey:: - .incbin "sound/direct_sound_samples/cries/cry_not_grookey.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_grookey.bin" .align 2 Cry_Thwackey:: - .incbin "sound/direct_sound_samples/cries/cry_not_thwackey.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_thwackey.bin" .align 2 Cry_Rillaboom:: - .incbin "sound/direct_sound_samples/cries/cry_not_rillaboom.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_rillaboom.bin" .align 2 Cry_Scorbunny:: - .incbin "sound/direct_sound_samples/cries/cry_not_scorbunny.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_scorbunny.bin" .align 2 Cry_Raboot:: - .incbin "sound/direct_sound_samples/cries/cry_not_raboot.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_raboot.bin" .align 2 Cry_Cinderace:: - .incbin "sound/direct_sound_samples/cries/cry_not_cinderace.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_cinderace.bin" .align 2 Cry_Sobble:: - .incbin "sound/direct_sound_samples/cries/cry_not_sobble.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_sobble.bin" .align 2 Cry_Drizzile:: - .incbin "sound/direct_sound_samples/cries/cry_not_drizzile.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_drizzile.bin" .align 2 Cry_Inteleon:: - .incbin "sound/direct_sound_samples/cries/cry_not_inteleon.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_inteleon.bin" .align 2 Cry_Skwovet:: - .incbin "sound/direct_sound_samples/cries/cry_not_skwovet.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_skwovet.bin" .align 2 Cry_Greedent:: - .incbin "sound/direct_sound_samples/cries/cry_not_greedent.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_greedent.bin" .align 2 Cry_Rookidee:: - .incbin "sound/direct_sound_samples/cries/cry_not_rookidee.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_rookidee.bin" .align 2 Cry_Corvisquire:: - .incbin "sound/direct_sound_samples/cries/cry_not_corvisquire.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_corvisquire.bin" .align 2 Cry_Corviknight:: - .incbin "sound/direct_sound_samples/cries/cry_not_corviknight.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_corviknight.bin" .align 2 Cry_Blipbug:: - .incbin "sound/direct_sound_samples/cries/cry_not_blipbug.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_blipbug.bin" .align 2 Cry_Dottler:: - .incbin "sound/direct_sound_samples/cries/cry_not_dottler.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_dottler.bin" .align 2 Cry_Orbeetle:: - .incbin "sound/direct_sound_samples/cries/cry_not_orbeetle.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_orbeetle.bin" .align 2 Cry_Nickit:: - .incbin "sound/direct_sound_samples/cries/cry_not_nickit.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_nickit.bin" .align 2 Cry_Thievul:: - .incbin "sound/direct_sound_samples/cries/cry_not_thievul.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_thievul.bin" .align 2 Cry_Gossifleur:: - .incbin "sound/direct_sound_samples/cries/cry_not_gossifleur.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_gossifleur.bin" .align 2 Cry_Eldegoss:: - .incbin "sound/direct_sound_samples/cries/cry_not_eldegoss.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_eldegoss.bin" .align 2 Cry_Wooloo:: - .incbin "sound/direct_sound_samples/cries/cry_not_wooloo.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_wooloo.bin" .align 2 Cry_Dubwool:: - .incbin "sound/direct_sound_samples/cries/cry_not_dubwool.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_dubwool.bin" .align 2 Cry_Chewtle:: - .incbin "sound/direct_sound_samples/cries/cry_not_chewtle.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_chewtle.bin" .align 2 Cry_Drednaw:: - .incbin "sound/direct_sound_samples/cries/cry_not_drednaw.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_drednaw.bin" .align 2 Cry_Yamper:: - .incbin "sound/direct_sound_samples/cries/cry_not_yamper.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_yamper.bin" .align 2 Cry_Boltund:: - .incbin "sound/direct_sound_samples/cries/cry_not_boltund.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_boltund.bin" .align 2 Cry_Rolycoly:: - .incbin "sound/direct_sound_samples/cries/cry_not_rolycoly.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_rolycoly.bin" .align 2 Cry_Carkol:: - .incbin "sound/direct_sound_samples/cries/cry_not_carkol.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_carkol.bin" .align 2 Cry_Coalossal:: - .incbin "sound/direct_sound_samples/cries/cry_not_coalossal.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_coalossal.bin" .align 2 Cry_Applin:: - .incbin "sound/direct_sound_samples/cries/cry_not_applin.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_applin.bin" .align 2 Cry_Flapple:: - .incbin "sound/direct_sound_samples/cries/cry_not_flapple.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_flapple.bin" .align 2 Cry_Appletun:: - .incbin "sound/direct_sound_samples/cries/cry_not_appletun.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_appletun.bin" .align 2 Cry_Silicobra:: - .incbin "sound/direct_sound_samples/cries/cry_not_silicobra.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_silicobra.bin" .align 2 Cry_Sandaconda:: - .incbin "sound/direct_sound_samples/cries/cry_not_sandaconda.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_sandaconda.bin" .align 2 Cry_Cramorant:: - .incbin "sound/direct_sound_samples/cries/cry_not_cramorant.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_cramorant.bin" .align 2 Cry_Arrokuda:: - .incbin "sound/direct_sound_samples/cries/cry_not_arrokuda.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_arrokuda.bin" .align 2 Cry_Barraskewda:: - .incbin "sound/direct_sound_samples/cries/cry_not_barraskewda.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_barraskewda.bin" .align 2 Cry_Toxel:: - .incbin "sound/direct_sound_samples/cries/cry_not_toxel.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_toxel.bin" .align 2 Cry_Toxtricity:: - .incbin "sound/direct_sound_samples/cries/cry_not_toxtricity.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_toxtricity.bin" .align 2 Cry_Sizzlipede:: - .incbin "sound/direct_sound_samples/cries/cry_not_sizzlipede.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_sizzlipede.bin" .align 2 Cry_Centiskorch:: - .incbin "sound/direct_sound_samples/cries/cry_not_centiskorch.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_centiskorch.bin" .align 2 Cry_Clobbopus:: - .incbin "sound/direct_sound_samples/cries/cry_not_clobbopus.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_clobbopus.bin" .align 2 Cry_Grapploct:: - .incbin "sound/direct_sound_samples/cries/cry_not_grapploct.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_grapploct.bin" .align 2 Cry_Sinistea:: - .incbin "sound/direct_sound_samples/cries/cry_not_sinistea.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_sinistea.bin" .align 2 Cry_Polteageist:: - .incbin "sound/direct_sound_samples/cries/cry_not_polteageist.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_polteageist.bin" .align 2 Cry_Hatenna:: - .incbin "sound/direct_sound_samples/cries/cry_not_hatenna.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_hatenna.bin" .align 2 Cry_Hattrem:: - .incbin "sound/direct_sound_samples/cries/cry_not_hattrem.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_hattrem.bin" .align 2 Cry_Hatterene:: - .incbin "sound/direct_sound_samples/cries/cry_not_hatterene.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_hatterene.bin" .align 2 Cry_Impidimp:: - .incbin "sound/direct_sound_samples/cries/cry_not_impidimp.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_impidimp.bin" .align 2 Cry_Morgrem:: - .incbin "sound/direct_sound_samples/cries/cry_not_morgrem.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_morgrem.bin" .align 2 Cry_Grimmsnarl:: - .incbin "sound/direct_sound_samples/cries/cry_not_grimmsnarl.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_grimmsnarl.bin" .align 2 Cry_Obstagoon:: - .incbin "sound/direct_sound_samples/cries/cry_not_obstagoon.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_obstagoon.bin" .align 2 Cry_Perrserker:: - .incbin "sound/direct_sound_samples/cries/cry_not_perrserker.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_perrserker.bin" .align 2 Cry_Cursola:: - .incbin "sound/direct_sound_samples/cries/cry_not_cursola.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_cursola.bin" .align 2 Cry_Sirfetchd:: - .incbin "sound/direct_sound_samples/cries/cry_not_sirfetchd.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_sirfetchd.bin" .align 2 Cry_MrRime:: - .incbin "sound/direct_sound_samples/cries/cry_not_mr_rime.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_mr_rime.bin" .align 2 Cry_Runerigus:: - .incbin "sound/direct_sound_samples/cries/cry_not_runerigus.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_runerigus.bin" .align 2 Cry_Milcery:: - .incbin "sound/direct_sound_samples/cries/cry_not_milcery.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_milcery.bin" .align 2 Cry_Alcremie:: - .incbin "sound/direct_sound_samples/cries/cry_not_alcremie.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_alcremie.bin" .align 2 Cry_Falinks:: - .incbin "sound/direct_sound_samples/cries/cry_not_falinks.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_falinks.bin" .align 2 Cry_Pincurchin:: - .incbin "sound/direct_sound_samples/cries/cry_not_pincurchin.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_pincurchin.bin" .align 2 Cry_Snom:: - .incbin "sound/direct_sound_samples/cries/cry_not_snom.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_snom.bin" .align 2 Cry_Frosmoth:: - .incbin "sound/direct_sound_samples/cries/cry_not_frosmoth.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_frosmoth.bin" .align 2 Cry_Stonjourner:: - .incbin "sound/direct_sound_samples/cries/cry_not_stonjourner.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_stonjourner.bin" .align 2 Cry_Eiscue:: - .incbin "sound/direct_sound_samples/cries/cry_not_eiscue.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_eiscue.bin" .align 2 Cry_Indeedee:: - .incbin "sound/direct_sound_samples/cries/cry_not_indeedee.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_indeedee.bin" .align 2 Cry_Morpeko:: - .incbin "sound/direct_sound_samples/cries/cry_not_morpeko.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_morpeko.bin" .align 2 Cry_Cufant:: - .incbin "sound/direct_sound_samples/cries/cry_not_cufant.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_cufant.bin" .align 2 Cry_Copperajah:: - .incbin "sound/direct_sound_samples/cries/cry_not_copperajah.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_copperajah.bin" .align 2 Cry_Dracozolt:: - .incbin "sound/direct_sound_samples/cries/cry_not_dracozolt.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_dracozolt.bin" .align 2 Cry_Arctozolt:: - .incbin "sound/direct_sound_samples/cries/cry_not_arctozolt.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_arctozolt.bin" .align 2 Cry_Dracovish:: - .incbin "sound/direct_sound_samples/cries/cry_not_dracovish.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_dracovish.bin" .align 2 Cry_Arctovish:: - .incbin "sound/direct_sound_samples/cries/cry_not_arctovish.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_arctovish.bin" .align 2 Cry_Duraludon:: - .incbin "sound/direct_sound_samples/cries/cry_not_duraludon.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_duraludon.bin" .align 2 Cry_Dreepy:: - .incbin "sound/direct_sound_samples/cries/cry_not_dreepy.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_dreepy.bin" .align 2 Cry_Drakloak:: - .incbin "sound/direct_sound_samples/cries/cry_not_drakloak.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_drakloak.bin" .align 2 Cry_Dragapult:: - .incbin "sound/direct_sound_samples/cries/cry_not_dragapult.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_dragapult.bin" .align 2 Cry_Zacian:: - .incbin "sound/direct_sound_samples/cries/cry_not_zacian.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_zacian.bin" .align 2 Cry_Zamazenta:: - .incbin "sound/direct_sound_samples/cries/cry_not_zamazenta.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_zamazenta.bin" .align 2 Cry_Eternatus:: - .incbin "sound/direct_sound_samples/cries/cry_not_eternatus.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_eternatus.bin" .align 2 Cry_Kubfu:: - .incbin "sound/direct_sound_samples/cries/cry_not_kubfu.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_kubfu.bin" .align 2 Cry_Urshifu:: - .incbin "sound/direct_sound_samples/cries/cry_not_urshifu.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_urshifu.bin" .align 2 Cry_Zarude:: - .incbin "sound/direct_sound_samples/cries/cry_not_zarude.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_zarude.bin" .align 2 Cry_Regieleki:: - .incbin "sound/direct_sound_samples/cries/cry_not_regieleki.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_regieleki.bin" .align 2 Cry_Regidrago:: - .incbin "sound/direct_sound_samples/cries/cry_not_regidrago.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_regidrago.bin" .align 2 Cry_Glastrier:: - .incbin "sound/direct_sound_samples/cries/cry_not_glastrier.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_glastrier.bin" .align 2 Cry_Spectrier:: - .incbin "sound/direct_sound_samples/cries/cry_not_spectrier.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_spectrier.bin" .align 2 Cry_Calyrex:: - .incbin "sound/direct_sound_samples/cries/cry_not_calyrex.bin" + .incbin "sound/direct_sound_samples/cries/uncomp_calyrex.bin" .align 2 -Cry_Venusaur_Mega:: - .incbin "sound/direct_sound_samples/cries/cry_not_mega_venusaur.bin" +Cry_VenusaurMega:: + .incbin "sound/direct_sound_samples/cries/uncomp_mega_venusaur.bin" .align 2 -Cry_Charizard_Mega_X:: - .incbin "sound/direct_sound_samples/cries/cry_not_mega_charizard_x.bin" +Cry_CharizardMegaX:: + .incbin "sound/direct_sound_samples/cries/uncomp_mega_charizard_x.bin" .align 2 -Cry_Charizard_Mega_Y:: - .incbin "sound/direct_sound_samples/cries/cry_not_mega_charizard_y.bin" +Cry_CharizardMegaY:: + .incbin "sound/direct_sound_samples/cries/uncomp_mega_charizard_y.bin" .align 2 -Cry_Blastoise_Mega:: - .incbin "sound/direct_sound_samples/cries/cry_not_mega_blastoise.bin" +Cry_BlastoiseMega:: + .incbin "sound/direct_sound_samples/cries/uncomp_mega_blastoise.bin" .align 2 -Cry_Beedrill_Mega:: - .incbin "sound/direct_sound_samples/cries/cry_not_mega_beedrill.bin" +Cry_BeedrillMega:: + .incbin "sound/direct_sound_samples/cries/uncomp_mega_beedrill.bin" .align 2 -Cry_Pidgeot_Mega:: - .incbin "sound/direct_sound_samples/cries/cry_not_mega_pidgeot.bin" +Cry_PidgeotMega:: + .incbin "sound/direct_sound_samples/cries/uncomp_mega_pidgeot.bin" .align 2 -Cry_Alakazam_Mega:: - .incbin "sound/direct_sound_samples/cries/cry_not_mega_alakazam.bin" +Cry_AlakazamMega:: + .incbin "sound/direct_sound_samples/cries/uncomp_mega_alakazam.bin" .align 2 -Cry_Slowbro_Mega:: - .incbin "sound/direct_sound_samples/cries/cry_not_mega_slowbro.bin" +Cry_SlowbroMega:: + .incbin "sound/direct_sound_samples/cries/uncomp_mega_slowbro.bin" .align 2 -Cry_Gengar_Mega:: - .incbin "sound/direct_sound_samples/cries/cry_not_mega_gengar.bin" +Cry_GengarMega:: + .incbin "sound/direct_sound_samples/cries/uncomp_mega_gengar.bin" .align 2 -Cry_Kangaskhan_Mega:: - .incbin "sound/direct_sound_samples/cries/cry_not_mega_kangaskhan.bin" +Cry_KangaskhanMega:: + .incbin "sound/direct_sound_samples/cries/uncomp_mega_kangaskhan.bin" .align 2 -Cry_Pinsir_Mega:: - .incbin "sound/direct_sound_samples/cries/cry_not_mega_pinsir.bin" +Cry_PinsirMega:: + .incbin "sound/direct_sound_samples/cries/uncomp_mega_pinsir.bin" .align 2 -Cry_Gyarados_Mega:: - .incbin "sound/direct_sound_samples/cries/cry_not_mega_gyarados.bin" +Cry_GyaradosMega:: + .incbin "sound/direct_sound_samples/cries/uncomp_mega_gyarados.bin" .align 2 -Cry_Aerodactyl_Mega:: - .incbin "sound/direct_sound_samples/cries/cry_not_mega_aerodactyl.bin" +Cry_AerodactylMega:: + .incbin "sound/direct_sound_samples/cries/uncomp_mega_aerodactyl.bin" .align 2 -Cry_Mewtwo_Mega_X:: - .incbin "sound/direct_sound_samples/cries/cry_not_mega_mewtwo_x.bin" +Cry_MewtwoMegaX:: + .incbin "sound/direct_sound_samples/cries/uncomp_mega_mewtwo_x.bin" .align 2 -Cry_Mewtwo_Mega_Y:: - .incbin "sound/direct_sound_samples/cries/cry_not_mega_mewtwo_y.bin" +Cry_MewtwoMegaY:: + .incbin "sound/direct_sound_samples/cries/uncomp_mega_mewtwo_y.bin" .align 2 -Cry_Ampharos_Mega:: - .incbin "sound/direct_sound_samples/cries/cry_not_mega_ampharos.bin" +Cry_AmpharosMega:: + .incbin "sound/direct_sound_samples/cries/uncomp_mega_ampharos.bin" .align 2 -Cry_Steelix_Mega:: - .incbin "sound/direct_sound_samples/cries/cry_not_mega_steelix.bin" +Cry_SteelixMega:: + .incbin "sound/direct_sound_samples/cries/uncomp_mega_steelix.bin" .align 2 -Cry_Scizor_Mega:: - .incbin "sound/direct_sound_samples/cries/cry_not_mega_scizor.bin" +Cry_ScizorMega:: + .incbin "sound/direct_sound_samples/cries/uncomp_mega_scizor.bin" .align 2 -Cry_Heracross_Mega:: - .incbin "sound/direct_sound_samples/cries/cry_not_mega_heracross.bin" +Cry_HeracrossMega:: + .incbin "sound/direct_sound_samples/cries/uncomp_mega_heracross.bin" .align 2 -Cry_Houndoom_Mega:: - .incbin "sound/direct_sound_samples/cries/cry_not_mega_houndoom.bin" +Cry_HoundoomMega:: + .incbin "sound/direct_sound_samples/cries/uncomp_mega_houndoom.bin" .align 2 -Cry_Tyranitar_Mega:: - .incbin "sound/direct_sound_samples/cries/cry_not_mega_tyranitar.bin" +Cry_TyranitarMega:: + .incbin "sound/direct_sound_samples/cries/uncomp_mega_tyranitar.bin" .align 2 -Cry_Sceptile_Mega:: - .incbin "sound/direct_sound_samples/cries/cry_not_mega_sceptile.bin" +Cry_SceptileMega:: + .incbin "sound/direct_sound_samples/cries/uncomp_mega_sceptile.bin" .align 2 -Cry_Blaziken_Mega:: - .incbin "sound/direct_sound_samples/cries/cry_not_mega_blaziken.bin" +Cry_BlazikenMega:: + .incbin "sound/direct_sound_samples/cries/uncomp_mega_blaziken.bin" .align 2 -Cry_Swampert_Mega:: - .incbin "sound/direct_sound_samples/cries/cry_not_mega_swampert.bin" +Cry_SwampertMega:: + .incbin "sound/direct_sound_samples/cries/uncomp_mega_swampert.bin" .align 2 -Cry_Gardevoir_Mega:: - .incbin "sound/direct_sound_samples/cries/cry_not_mega_gardevoir.bin" +Cry_GardevoirMega:: + .incbin "sound/direct_sound_samples/cries/uncomp_mega_gardevoir.bin" .align 2 -Cry_Sableye_Mega:: - .incbin "sound/direct_sound_samples/cries/cry_not_mega_sableye.bin" +Cry_SableyeMega:: + .incbin "sound/direct_sound_samples/cries/uncomp_mega_sableye.bin" .align 2 -Cry_Mawile_Mega:: - .incbin "sound/direct_sound_samples/cries/cry_not_mega_mawile.bin" +Cry_MawileMega:: + .incbin "sound/direct_sound_samples/cries/uncomp_mega_mawile.bin" .align 2 -Cry_Aggron_Mega:: - .incbin "sound/direct_sound_samples/cries/cry_not_mega_aggron.bin" +Cry_AggronMega:: + .incbin "sound/direct_sound_samples/cries/uncomp_mega_aggron.bin" .align 2 -Cry_Medicham_Mega:: - .incbin "sound/direct_sound_samples/cries/cry_not_mega_medicham.bin" +Cry_MedichamMega:: + .incbin "sound/direct_sound_samples/cries/uncomp_mega_medicham.bin" .align 2 -Cry_Manectric_Mega:: - .incbin "sound/direct_sound_samples/cries/cry_not_mega_manectric.bin" +Cry_ManectricMega:: + .incbin "sound/direct_sound_samples/cries/uncomp_mega_manectric.bin" .align 2 -Cry_Sharpedo_Mega:: - .incbin "sound/direct_sound_samples/cries/cry_not_mega_sharpedo.bin" +Cry_SharpedoMega:: + .incbin "sound/direct_sound_samples/cries/uncomp_mega_sharpedo.bin" .align 2 -Cry_Camerupt_Mega:: - .incbin "sound/direct_sound_samples/cries/cry_not_mega_camerupt.bin" +Cry_CameruptMega:: + .incbin "sound/direct_sound_samples/cries/uncomp_mega_camerupt.bin" .align 2 -Cry_Altaria_Mega:: - .incbin "sound/direct_sound_samples/cries/cry_not_mega_altaria.bin" +Cry_AltariaMega:: + .incbin "sound/direct_sound_samples/cries/uncomp_mega_altaria.bin" .align 2 -Cry_Banette_Mega:: - .incbin "sound/direct_sound_samples/cries/cry_not_mega_banette.bin" +Cry_BanetteMega:: + .incbin "sound/direct_sound_samples/cries/uncomp_mega_banette.bin" .align 2 -Cry_Absol_Mega:: - .incbin "sound/direct_sound_samples/cries/cry_not_mega_absol.bin" +Cry_AbsolMega:: + .incbin "sound/direct_sound_samples/cries/uncomp_mega_absol.bin" .align 2 -Cry_Glalie_Mega:: - .incbin "sound/direct_sound_samples/cries/cry_not_mega_glalie.bin" +Cry_GlalieMega:: + .incbin "sound/direct_sound_samples/cries/uncomp_mega_glalie.bin" .align 2 -Cry_Salamence_Mega:: - .incbin "sound/direct_sound_samples/cries/cry_not_mega_salamence.bin" +Cry_SalamenceMega:: + .incbin "sound/direct_sound_samples/cries/uncomp_mega_salamence.bin" .align 2 -Cry_Metagross_Mega:: - .incbin "sound/direct_sound_samples/cries/cry_not_mega_metagross.bin" +Cry_MetagrossMega:: + .incbin "sound/direct_sound_samples/cries/uncomp_mega_metagross.bin" .align 2 -Cry_Latias_Mega:: - .incbin "sound/direct_sound_samples/cries/cry_not_mega_latias.bin" +Cry_LatiasMega:: + .incbin "sound/direct_sound_samples/cries/uncomp_mega_latias.bin" .align 2 -Cry_Latios_Mega:: - .incbin "sound/direct_sound_samples/cries/cry_not_mega_latios.bin" +Cry_LatiosMega:: + .incbin "sound/direct_sound_samples/cries/uncomp_mega_latios.bin" .align 2 -Cry_Lopunny_Mega:: - .incbin "sound/direct_sound_samples/cries/cry_not_mega_lopunny.bin" +Cry_LopunnyMega:: + .incbin "sound/direct_sound_samples/cries/uncomp_mega_lopunny.bin" .align 2 -Cry_Garchomp_Mega:: - .incbin "sound/direct_sound_samples/cries/cry_not_mega_garchomp.bin" +Cry_GarchompMega:: + .incbin "sound/direct_sound_samples/cries/uncomp_mega_garchomp.bin" .align 2 -Cry_Lucario_Mega:: - .incbin "sound/direct_sound_samples/cries/cry_not_mega_lucario.bin" +Cry_LucarioMega:: + .incbin "sound/direct_sound_samples/cries/uncomp_mega_lucario.bin" .align 2 -Cry_Abomasnow_Mega:: - .incbin "sound/direct_sound_samples/cries/cry_not_mega_abomasnow.bin" +Cry_AbomasnowMega:: + .incbin "sound/direct_sound_samples/cries/uncomp_mega_abomasnow.bin" .align 2 -Cry_Gallade_Mega:: - .incbin "sound/direct_sound_samples/cries/cry_not_mega_gallade.bin" +Cry_GalladeMega:: + .incbin "sound/direct_sound_samples/cries/uncomp_mega_gallade.bin" .align 2 -Cry_Audino_Mega:: - .incbin "sound/direct_sound_samples/cries/cry_not_mega_audino.bin" +Cry_AudinoMega:: + .incbin "sound/direct_sound_samples/cries/uncomp_mega_audino.bin" .align 2 -Cry_Diancie_Mega:: - .incbin "sound/direct_sound_samples/cries/cry_not_mega_diancie.bin" +Cry_DiancieMega:: + .incbin "sound/direct_sound_samples/cries/uncomp_mega_diancie.bin" .align 2 -Cry_Rayquaza_Mega:: - .incbin "sound/direct_sound_samples/cries/cry_not_mega_rayquaza.bin" +Cry_RayquazaMega:: + .incbin "sound/direct_sound_samples/cries/uncomp_mega_rayquaza.bin" .align 2 -Cry_Kyogre_Primal:: - .incbin "sound/direct_sound_samples/cries/cry_not_primal_kyogre.bin" +Cry_KyogrePrimal:: + .incbin "sound/direct_sound_samples/cries/uncomp_primal_kyogre.bin" .align 2 -Cry_Groudon_Primal:: - .incbin "sound/direct_sound_samples/cries/cry_not_primal_groudon.bin" +Cry_GroudonPrimal:: + .incbin "sound/direct_sound_samples/cries/uncomp_primal_groudon.bin" .align 2 -Cry_Slowpoke_Galarian:: - .incbin "sound/direct_sound_samples/cries/cry_not_slowpoke_galarian.bin" +Cry_SlowpokeGalarian:: + .incbin "sound/direct_sound_samples/cries/uncomp_slowpoke_galarian.bin" .align 2 -Cry_Shaymin_Sky:: - .incbin "sound/direct_sound_samples/cries/cry_not_shaymin_sky.bin" +Cry_ShayminSky:: + .incbin "sound/direct_sound_samples/cries/shaymin_sky.bin" .align 2 -Cry_Tornadus_Therian:: - .incbin "sound/direct_sound_samples/cries/cry_not_tornadus_therian.bin" +Cry_TornadusTherian:: + .incbin "sound/direct_sound_samples/cries/tornadus_therian.bin" .align 2 -Cry_Thundurus_Therian:: - .incbin "sound/direct_sound_samples/cries/cry_not_thundurus_therian.bin" +Cry_ThundurusTherian:: + .incbin "sound/direct_sound_samples/cries/thundurus_therian.bin" .align 2 -Cry_Landorus_Therian:: - .incbin "sound/direct_sound_samples/cries/cry_not_landorus_therian.bin" +Cry_LandorusTherian:: + .incbin "sound/direct_sound_samples/cries/landorus_therian.bin" .align 2 -Cry_Kyurem_White:: - .incbin "sound/direct_sound_samples/cries/cry_not_kyurem_white.bin" +Cry_KyuremWhite:: + .incbin "sound/direct_sound_samples/cries/kyurem_white.bin" .align 2 -Cry_Kyurem_Black:: - .incbin "sound/direct_sound_samples/cries/cry_not_kyurem_black.bin" +Cry_KyuremBlack:: + .incbin "sound/direct_sound_samples/cries/kyurem_black.bin" .align 2 -Cry_Floette_Eternal_Flower:: - .incbin "sound/direct_sound_samples/cries/cry_not_floette_eternal_flower.bin" +Cry_FloetteEternalFlower:: + .incbin "sound/direct_sound_samples/cries/uncomp_floette_eternal_flower.bin" .align 2 -Cry_Pumpkaboo_Super:: - .incbin "sound/direct_sound_samples/cries/cry_not_pumpkaboo_super.bin" +Cry_PumpkabooSuper:: + .incbin "sound/direct_sound_samples/cries/uncomp_pumpkaboo_super.bin" .align 2 -Cry_Gourgeist_Super:: - .incbin "sound/direct_sound_samples/cries/cry_not_gourgeist_super.bin" +Cry_GourgeistSuper:: + .incbin "sound/direct_sound_samples/cries/uncomp_gourgeist_super.bin" .align 2 -Cry_Zygarde_10:: - .incbin "sound/direct_sound_samples/cries/cry_not_zygarde_10.bin" +Cry_Zygarde10:: + .incbin "sound/direct_sound_samples/cries/uncomp_zygarde_10.bin" .align 2 -Cry_Zygarde_Complete:: - .incbin "sound/direct_sound_samples/cries/cry_not_zygarde_complete.bin" +Cry_ZygardeComplete:: + .incbin "sound/direct_sound_samples/cries/uncomp_zygarde_complete.bin" .align 2 -Cry_Hoopa_Unbound:: - .incbin "sound/direct_sound_samples/cries/cry_not_hoopa_unbound.bin" +Cry_HoopaUnbound:: + .incbin "sound/direct_sound_samples/cries/uncomp_hoopa_unbound.bin" .align 2 -Cry_Oricorio_Pom_Pom:: - .incbin "sound/direct_sound_samples/cries/cry_not_oricorio_pom_pom.bin" +Cry_OricorioPomPom:: + .incbin "sound/direct_sound_samples/cries/uncomp_oricorio_pom_pom.bin" .align 2 -Cry_Oricorio_Pa_u:: - .incbin "sound/direct_sound_samples/cries/cry_not_oricorio_pa_u.bin" +Cry_OricorioPau:: + .incbin "sound/direct_sound_samples/cries/uncomp_oricorio_pau.bin" .align 2 -Cry_Oricorio_Sensu:: - .incbin "sound/direct_sound_samples/cries/cry_not_oricorio_sensu.bin" +Cry_OricorioSensu:: + .incbin "sound/direct_sound_samples/cries/uncomp_oricorio_sensu.bin" .align 2 -Cry_Lycanroc_Midnight:: - .incbin "sound/direct_sound_samples/cries/cry_not_lycanroc_midnight.bin" +Cry_LycanrocMidnight:: + .incbin "sound/direct_sound_samples/cries/uncomp_lycanroc_midnight.bin" .align 2 -Cry_Lycanroc_Dusk:: - .incbin "sound/direct_sound_samples/cries/cry_not_lycanroc_dusk.bin" +Cry_LycanrocDusk:: + .incbin "sound/direct_sound_samples/cries/uncomp_lycanroc_dusk.bin" .align 2 -Cry_Wishiwashi_School:: - .incbin "sound/direct_sound_samples/cries/cry_not_wishiwashi_school.bin" +Cry_WishiwashiSchool:: + .incbin "sound/direct_sound_samples/cries/uncomp_wishiwashi_school.bin" .align 2 -Cry_Necrozma_Dusk_Mane:: - .incbin "sound/direct_sound_samples/cries/cry_not_necrozma_dusk_mane.bin" +Cry_NecrozmaDuskMane:: + .incbin "sound/direct_sound_samples/cries/uncomp_necrozma_dusk_mane.bin" .align 2 -Cry_Necrozma_Dawn_Wings:: - .incbin "sound/direct_sound_samples/cries/cry_not_necrozma_dawn_wings.bin" +Cry_NecrozmaDawnWings:: + .incbin "sound/direct_sound_samples/cries/uncomp_necrozma_dawn_wings.bin" .align 2 -Cry_Necrozma_Ultra:: - .incbin "sound/direct_sound_samples/cries/cry_not_necrozma_ultra.bin" +Cry_NecrozmaUltra:: + .incbin "sound/direct_sound_samples/cries/uncomp_necrozma_ultra.bin" .align 2 -Cry_Toxtricity_Low_Key:: - .incbin "sound/direct_sound_samples/cries/cry_not_toxtricity_low_key.bin" +Cry_ToxtricityLowKey:: + .incbin "sound/direct_sound_samples/cries/uncomp_toxtricity_low_key.bin" .align 2 -Cry_Eiscue_Noice_Face:: - .incbin "sound/direct_sound_samples/cries/cry_not_eiscue_noice_face.bin" +Cry_EiscueNoiceFace:: + .incbin "sound/direct_sound_samples/cries/uncomp_eiscue_noice_face.bin" .align 2 -Cry_Indeedee_Female:: - .incbin "sound/direct_sound_samples/cries/cry_not_indeedee_female.bin" +Cry_IndeedeeFemale:: + .incbin "sound/direct_sound_samples/cries/uncomp_indeedee_female.bin" .align 2 -Cry_Morpeko_Hangry:: - .incbin "sound/direct_sound_samples/cries/cry_not_morpeko_hangry.bin" +Cry_MorpekoHangry:: + .incbin "sound/direct_sound_samples/cries/uncomp_morpeko_hangry.bin" .align 2 -Cry_Zacian_Crowned_Sword:: - .incbin "sound/direct_sound_samples/cries/cry_not_zacian_crowned_sword.bin" +Cry_ZacianCrownedSword:: + .incbin "sound/direct_sound_samples/cries/uncomp_zacian_crowned_sword.bin" .align 2 -Cry_Zamazenta_Crowned_Shield:: - .incbin "sound/direct_sound_samples/cries/cry_not_zamazenta_crowned_shield.bin" +Cry_ZamazentaCrownedShield:: + .incbin "sound/direct_sound_samples/cries/uncomp_zamazenta_crowned_shield.bin" .align 2 -Cry_Eternatus_Eternamax:: - .incbin "sound/direct_sound_samples/cries/cry_not_eternatus_eternamax.bin" +Cry_EternatusEternamax:: + .incbin "sound/direct_sound_samples/cries/uncomp_eternatus_eternamax.bin" .align 2 -Cry_Urshifu_Rapid_Strike_Style:: - .incbin "sound/direct_sound_samples/cries/cry_not_urshifu_rapid_strike_style.bin" +Cry_UrshifuRapidStrikeStyle:: + .incbin "sound/direct_sound_samples/cries/uncomp_urshifu_rapid_strike_style.bin" .align 2 -Cry_Calyrex_Ice_Rider:: - .incbin "sound/direct_sound_samples/cries/cry_not_calyrex_ice_rider.bin" +Cry_CalyrexIceRider:: + .incbin "sound/direct_sound_samples/cries/uncomp_calyrex_ice_rider.bin" .align 2 -Cry_Calyrex_Shadow_Rider:: - .incbin "sound/direct_sound_samples/cries/cry_not_calyrex_shadow_rider.bin" +Cry_CalyrexShadowRider:: + .incbin "sound/direct_sound_samples/cries/uncomp_calyrex_shadow_rider.bin" .align 2 DirectSoundWaveData_register_noise:: diff --git a/sound/direct_sound_samples/cries/abomasnow.aif b/sound/direct_sound_samples/cries/abomasnow.aif new file mode 100644 index 000000000..dce794161 Binary files /dev/null and b/sound/direct_sound_samples/cries/abomasnow.aif differ diff --git a/sound/direct_sound_samples/cries/abra.aif b/sound/direct_sound_samples/cries/abra.aif new file mode 100644 index 000000000..153f4982e Binary files /dev/null and b/sound/direct_sound_samples/cries/abra.aif differ diff --git a/sound/direct_sound_samples/cries/absol.aif b/sound/direct_sound_samples/cries/absol.aif new file mode 100644 index 000000000..f21d3138c Binary files /dev/null and b/sound/direct_sound_samples/cries/absol.aif differ diff --git a/sound/direct_sound_samples/cries/accelgor.aif b/sound/direct_sound_samples/cries/accelgor.aif new file mode 100644 index 000000000..7fb5e4c96 Binary files /dev/null and b/sound/direct_sound_samples/cries/accelgor.aif differ diff --git a/sound/direct_sound_samples/cries/aerodactyl.aif b/sound/direct_sound_samples/cries/aerodactyl.aif new file mode 100644 index 000000000..bbf19e00b Binary files /dev/null and b/sound/direct_sound_samples/cries/aerodactyl.aif differ diff --git a/sound/direct_sound_samples/cries/aggron.aif b/sound/direct_sound_samples/cries/aggron.aif new file mode 100644 index 000000000..ed0afaa99 Binary files /dev/null and b/sound/direct_sound_samples/cries/aggron.aif differ diff --git a/sound/direct_sound_samples/cries/aipom.aif b/sound/direct_sound_samples/cries/aipom.aif new file mode 100644 index 000000000..c1e643890 Binary files /dev/null and b/sound/direct_sound_samples/cries/aipom.aif differ diff --git a/sound/direct_sound_samples/cries/alakazam.aif b/sound/direct_sound_samples/cries/alakazam.aif new file mode 100644 index 000000000..4ecfcf5fc Binary files /dev/null and b/sound/direct_sound_samples/cries/alakazam.aif differ diff --git a/sound/direct_sound_samples/cries/alomomola.aif b/sound/direct_sound_samples/cries/alomomola.aif new file mode 100644 index 000000000..a12e3bc23 Binary files /dev/null and b/sound/direct_sound_samples/cries/alomomola.aif differ diff --git a/sound/direct_sound_samples/cries/altaria.aif b/sound/direct_sound_samples/cries/altaria.aif new file mode 100644 index 000000000..f59364a9c Binary files /dev/null and b/sound/direct_sound_samples/cries/altaria.aif differ diff --git a/sound/direct_sound_samples/cries/ambipom.aif b/sound/direct_sound_samples/cries/ambipom.aif new file mode 100644 index 000000000..77f2e45e8 Binary files /dev/null and b/sound/direct_sound_samples/cries/ambipom.aif differ diff --git a/sound/direct_sound_samples/cries/amoonguss.aif b/sound/direct_sound_samples/cries/amoonguss.aif new file mode 100644 index 000000000..fcdbea91e Binary files /dev/null and b/sound/direct_sound_samples/cries/amoonguss.aif differ diff --git a/sound/direct_sound_samples/cries/ampharos.aif b/sound/direct_sound_samples/cries/ampharos.aif new file mode 100644 index 000000000..3c41f7634 Binary files /dev/null and b/sound/direct_sound_samples/cries/ampharos.aif differ diff --git a/sound/direct_sound_samples/cries/anorith.aif b/sound/direct_sound_samples/cries/anorith.aif new file mode 100644 index 000000000..cb0d37b58 Binary files /dev/null and b/sound/direct_sound_samples/cries/anorith.aif differ diff --git a/sound/direct_sound_samples/cries/arbok.aif b/sound/direct_sound_samples/cries/arbok.aif new file mode 100644 index 000000000..0e7b0b964 Binary files /dev/null and b/sound/direct_sound_samples/cries/arbok.aif differ diff --git a/sound/direct_sound_samples/cries/arcanine.aif b/sound/direct_sound_samples/cries/arcanine.aif new file mode 100644 index 000000000..17a7b3c6b Binary files /dev/null and b/sound/direct_sound_samples/cries/arcanine.aif differ diff --git a/sound/direct_sound_samples/cries/arceus.aif b/sound/direct_sound_samples/cries/arceus.aif new file mode 100644 index 000000000..5db8a3c27 Binary files /dev/null and b/sound/direct_sound_samples/cries/arceus.aif differ diff --git a/sound/direct_sound_samples/cries/archen.aif b/sound/direct_sound_samples/cries/archen.aif new file mode 100644 index 000000000..2f008dcf7 Binary files /dev/null and b/sound/direct_sound_samples/cries/archen.aif differ diff --git a/sound/direct_sound_samples/cries/archeops.aif b/sound/direct_sound_samples/cries/archeops.aif new file mode 100644 index 000000000..f721fe2d7 Binary files /dev/null and b/sound/direct_sound_samples/cries/archeops.aif differ diff --git a/sound/direct_sound_samples/cries/ariados.aif b/sound/direct_sound_samples/cries/ariados.aif new file mode 100644 index 000000000..de9057b45 Binary files /dev/null and b/sound/direct_sound_samples/cries/ariados.aif differ diff --git a/sound/direct_sound_samples/cries/armaldo.aif b/sound/direct_sound_samples/cries/armaldo.aif new file mode 100644 index 000000000..574a3d753 Binary files /dev/null and b/sound/direct_sound_samples/cries/armaldo.aif differ diff --git a/sound/direct_sound_samples/cries/aron.aif b/sound/direct_sound_samples/cries/aron.aif new file mode 100644 index 000000000..da82823e2 Binary files /dev/null and b/sound/direct_sound_samples/cries/aron.aif differ diff --git a/sound/direct_sound_samples/cries/articuno.aif b/sound/direct_sound_samples/cries/articuno.aif new file mode 100644 index 000000000..e3975a17c Binary files /dev/null and b/sound/direct_sound_samples/cries/articuno.aif differ diff --git a/sound/direct_sound_samples/cries/audino.aif b/sound/direct_sound_samples/cries/audino.aif new file mode 100644 index 000000000..278fc4ca1 Binary files /dev/null and b/sound/direct_sound_samples/cries/audino.aif differ diff --git a/sound/direct_sound_samples/cries/axew.aif b/sound/direct_sound_samples/cries/axew.aif new file mode 100644 index 000000000..1fbaa3ada Binary files /dev/null and b/sound/direct_sound_samples/cries/axew.aif differ diff --git a/sound/direct_sound_samples/cries/azelf.aif b/sound/direct_sound_samples/cries/azelf.aif new file mode 100644 index 000000000..79761d610 Binary files /dev/null and b/sound/direct_sound_samples/cries/azelf.aif differ diff --git a/sound/direct_sound_samples/cries/azumarill.aif b/sound/direct_sound_samples/cries/azumarill.aif new file mode 100644 index 000000000..5d4d994f7 Binary files /dev/null and b/sound/direct_sound_samples/cries/azumarill.aif differ diff --git a/sound/direct_sound_samples/cries/azurill.aif b/sound/direct_sound_samples/cries/azurill.aif new file mode 100644 index 000000000..538001ec4 Binary files /dev/null and b/sound/direct_sound_samples/cries/azurill.aif differ diff --git a/sound/direct_sound_samples/cries/bagon.aif b/sound/direct_sound_samples/cries/bagon.aif new file mode 100644 index 000000000..76ec8243a Binary files /dev/null and b/sound/direct_sound_samples/cries/bagon.aif differ diff --git a/sound/direct_sound_samples/cries/baltoy.aif b/sound/direct_sound_samples/cries/baltoy.aif new file mode 100644 index 000000000..9c9771924 Binary files /dev/null and b/sound/direct_sound_samples/cries/baltoy.aif differ diff --git a/sound/direct_sound_samples/cries/banette.aif b/sound/direct_sound_samples/cries/banette.aif new file mode 100644 index 000000000..e00d6a0ac Binary files /dev/null and b/sound/direct_sound_samples/cries/banette.aif differ diff --git a/sound/direct_sound_samples/cries/barboach.aif b/sound/direct_sound_samples/cries/barboach.aif new file mode 100644 index 000000000..0f1a355be Binary files /dev/null and b/sound/direct_sound_samples/cries/barboach.aif differ diff --git a/sound/direct_sound_samples/cries/basculin.aif b/sound/direct_sound_samples/cries/basculin.aif new file mode 100644 index 000000000..afeef551e Binary files /dev/null and b/sound/direct_sound_samples/cries/basculin.aif differ diff --git a/sound/direct_sound_samples/cries/bastiodon.aif b/sound/direct_sound_samples/cries/bastiodon.aif new file mode 100644 index 000000000..9c87d2e58 Binary files /dev/null and b/sound/direct_sound_samples/cries/bastiodon.aif differ diff --git a/sound/direct_sound_samples/cries/bayleef.aif b/sound/direct_sound_samples/cries/bayleef.aif new file mode 100644 index 000000000..b1ff0088d Binary files /dev/null and b/sound/direct_sound_samples/cries/bayleef.aif differ diff --git a/sound/direct_sound_samples/cries/beartic.aif b/sound/direct_sound_samples/cries/beartic.aif new file mode 100644 index 000000000..2b5fd99af Binary files /dev/null and b/sound/direct_sound_samples/cries/beartic.aif differ diff --git a/sound/direct_sound_samples/cries/beautifly.aif b/sound/direct_sound_samples/cries/beautifly.aif new file mode 100644 index 000000000..be81439f1 Binary files /dev/null and b/sound/direct_sound_samples/cries/beautifly.aif differ diff --git a/sound/direct_sound_samples/cries/beedrill.aif b/sound/direct_sound_samples/cries/beedrill.aif new file mode 100644 index 000000000..0a31a1974 Binary files /dev/null and b/sound/direct_sound_samples/cries/beedrill.aif differ diff --git a/sound/direct_sound_samples/cries/beheeyem.aif b/sound/direct_sound_samples/cries/beheeyem.aif new file mode 100644 index 000000000..c5bf9839f Binary files /dev/null and b/sound/direct_sound_samples/cries/beheeyem.aif differ diff --git a/sound/direct_sound_samples/cries/beldum.aif b/sound/direct_sound_samples/cries/beldum.aif new file mode 100644 index 000000000..7b7b10c2e Binary files /dev/null and b/sound/direct_sound_samples/cries/beldum.aif differ diff --git a/sound/direct_sound_samples/cries/bellossom.aif b/sound/direct_sound_samples/cries/bellossom.aif new file mode 100644 index 000000000..06ba87374 Binary files /dev/null and b/sound/direct_sound_samples/cries/bellossom.aif differ diff --git a/sound/direct_sound_samples/cries/bellsprout.aif b/sound/direct_sound_samples/cries/bellsprout.aif new file mode 100644 index 000000000..b47ef6023 Binary files /dev/null and b/sound/direct_sound_samples/cries/bellsprout.aif differ diff --git a/sound/direct_sound_samples/cries/bibarel.aif b/sound/direct_sound_samples/cries/bibarel.aif new file mode 100644 index 000000000..2c7ea81bb Binary files /dev/null and b/sound/direct_sound_samples/cries/bibarel.aif differ diff --git a/sound/direct_sound_samples/cries/bidoof.aif b/sound/direct_sound_samples/cries/bidoof.aif new file mode 100644 index 000000000..d61765511 Binary files /dev/null and b/sound/direct_sound_samples/cries/bidoof.aif differ diff --git a/sound/direct_sound_samples/cries/bisharp.aif b/sound/direct_sound_samples/cries/bisharp.aif new file mode 100644 index 000000000..ac3bf36d3 Binary files /dev/null and b/sound/direct_sound_samples/cries/bisharp.aif differ diff --git a/sound/direct_sound_samples/cries/blastoise.aif b/sound/direct_sound_samples/cries/blastoise.aif new file mode 100644 index 000000000..ed03bd447 Binary files /dev/null and b/sound/direct_sound_samples/cries/blastoise.aif differ diff --git a/sound/direct_sound_samples/cries/blaziken.aif b/sound/direct_sound_samples/cries/blaziken.aif new file mode 100644 index 000000000..b316a8565 Binary files /dev/null and b/sound/direct_sound_samples/cries/blaziken.aif differ diff --git a/sound/direct_sound_samples/cries/blissey.aif b/sound/direct_sound_samples/cries/blissey.aif new file mode 100644 index 000000000..58d3b926c Binary files /dev/null and b/sound/direct_sound_samples/cries/blissey.aif differ diff --git a/sound/direct_sound_samples/cries/blitzle.aif b/sound/direct_sound_samples/cries/blitzle.aif new file mode 100644 index 000000000..c7db171eb Binary files /dev/null and b/sound/direct_sound_samples/cries/blitzle.aif differ diff --git a/sound/direct_sound_samples/cries/boldore.aif b/sound/direct_sound_samples/cries/boldore.aif new file mode 100644 index 000000000..e275af209 Binary files /dev/null and b/sound/direct_sound_samples/cries/boldore.aif differ diff --git a/sound/direct_sound_samples/cries/bonsly.aif b/sound/direct_sound_samples/cries/bonsly.aif new file mode 100644 index 000000000..251865909 Binary files /dev/null and b/sound/direct_sound_samples/cries/bonsly.aif differ diff --git a/sound/direct_sound_samples/cries/bouffalant.aif b/sound/direct_sound_samples/cries/bouffalant.aif new file mode 100644 index 000000000..b4dc574ce Binary files /dev/null and b/sound/direct_sound_samples/cries/bouffalant.aif differ diff --git a/sound/direct_sound_samples/cries/braviary.aif b/sound/direct_sound_samples/cries/braviary.aif new file mode 100644 index 000000000..d35229448 Binary files /dev/null and b/sound/direct_sound_samples/cries/braviary.aif differ diff --git a/sound/direct_sound_samples/cries/breloom.aif b/sound/direct_sound_samples/cries/breloom.aif new file mode 100644 index 000000000..2f549c4e6 Binary files /dev/null and b/sound/direct_sound_samples/cries/breloom.aif differ diff --git a/sound/direct_sound_samples/cries/bronzong.aif b/sound/direct_sound_samples/cries/bronzong.aif new file mode 100644 index 000000000..16e171e4f Binary files /dev/null and b/sound/direct_sound_samples/cries/bronzong.aif differ diff --git a/sound/direct_sound_samples/cries/bronzor.aif b/sound/direct_sound_samples/cries/bronzor.aif new file mode 100644 index 000000000..f9007186b Binary files /dev/null and b/sound/direct_sound_samples/cries/bronzor.aif differ diff --git a/sound/direct_sound_samples/cries/budew.aif b/sound/direct_sound_samples/cries/budew.aif new file mode 100644 index 000000000..82e036502 Binary files /dev/null and b/sound/direct_sound_samples/cries/budew.aif differ diff --git a/sound/direct_sound_samples/cries/buizel.aif b/sound/direct_sound_samples/cries/buizel.aif new file mode 100644 index 000000000..910a6b145 Binary files /dev/null and b/sound/direct_sound_samples/cries/buizel.aif differ diff --git a/sound/direct_sound_samples/cries/bulbasaur.aif b/sound/direct_sound_samples/cries/bulbasaur.aif new file mode 100644 index 000000000..bc49f1617 Binary files /dev/null and b/sound/direct_sound_samples/cries/bulbasaur.aif differ diff --git a/sound/direct_sound_samples/cries/buneary.aif b/sound/direct_sound_samples/cries/buneary.aif new file mode 100644 index 000000000..5ce292967 Binary files /dev/null and b/sound/direct_sound_samples/cries/buneary.aif differ diff --git a/sound/direct_sound_samples/cries/burmy.aif b/sound/direct_sound_samples/cries/burmy.aif new file mode 100644 index 000000000..ea15d0c71 Binary files /dev/null and b/sound/direct_sound_samples/cries/burmy.aif differ diff --git a/sound/direct_sound_samples/cries/butterfree.aif b/sound/direct_sound_samples/cries/butterfree.aif new file mode 100644 index 000000000..1ce238346 Binary files /dev/null and b/sound/direct_sound_samples/cries/butterfree.aif differ diff --git a/sound/direct_sound_samples/cries/cacnea.aif b/sound/direct_sound_samples/cries/cacnea.aif new file mode 100644 index 000000000..ece82d34c Binary files /dev/null and b/sound/direct_sound_samples/cries/cacnea.aif differ diff --git a/sound/direct_sound_samples/cries/cacturne.aif b/sound/direct_sound_samples/cries/cacturne.aif new file mode 100644 index 000000000..76e8f3aa9 Binary files /dev/null and b/sound/direct_sound_samples/cries/cacturne.aif differ diff --git a/sound/direct_sound_samples/cries/camerupt.aif b/sound/direct_sound_samples/cries/camerupt.aif new file mode 100644 index 000000000..f47ce498e Binary files /dev/null and b/sound/direct_sound_samples/cries/camerupt.aif differ diff --git a/sound/direct_sound_samples/cries/carnivine.aif b/sound/direct_sound_samples/cries/carnivine.aif new file mode 100644 index 000000000..edc8bb049 Binary files /dev/null and b/sound/direct_sound_samples/cries/carnivine.aif differ diff --git a/sound/direct_sound_samples/cries/carracosta.aif b/sound/direct_sound_samples/cries/carracosta.aif new file mode 100644 index 000000000..8f676d83e Binary files /dev/null and b/sound/direct_sound_samples/cries/carracosta.aif differ diff --git a/sound/direct_sound_samples/cries/carvanha.aif b/sound/direct_sound_samples/cries/carvanha.aif new file mode 100644 index 000000000..8ae11271d Binary files /dev/null and b/sound/direct_sound_samples/cries/carvanha.aif differ diff --git a/sound/direct_sound_samples/cries/cascoon.aif b/sound/direct_sound_samples/cries/cascoon.aif new file mode 100644 index 000000000..3390ff0db Binary files /dev/null and b/sound/direct_sound_samples/cries/cascoon.aif differ diff --git a/sound/direct_sound_samples/cries/castform.aif b/sound/direct_sound_samples/cries/castform.aif new file mode 100644 index 000000000..23c0c39b5 Binary files /dev/null and b/sound/direct_sound_samples/cries/castform.aif differ diff --git a/sound/direct_sound_samples/cries/caterpie.aif b/sound/direct_sound_samples/cries/caterpie.aif new file mode 100644 index 000000000..c3b599d7d Binary files /dev/null and b/sound/direct_sound_samples/cries/caterpie.aif differ diff --git a/sound/direct_sound_samples/cries/celebi.aif b/sound/direct_sound_samples/cries/celebi.aif new file mode 100644 index 000000000..068046dbe Binary files /dev/null and b/sound/direct_sound_samples/cries/celebi.aif differ diff --git a/sound/direct_sound_samples/cries/chandelure.aif b/sound/direct_sound_samples/cries/chandelure.aif new file mode 100644 index 000000000..de25ee852 Binary files /dev/null and b/sound/direct_sound_samples/cries/chandelure.aif differ diff --git a/sound/direct_sound_samples/cries/chansey.aif b/sound/direct_sound_samples/cries/chansey.aif new file mode 100644 index 000000000..b641fd3a9 Binary files /dev/null and b/sound/direct_sound_samples/cries/chansey.aif differ diff --git a/sound/direct_sound_samples/cries/charizard.aif b/sound/direct_sound_samples/cries/charizard.aif new file mode 100644 index 000000000..36e10511a Binary files /dev/null and b/sound/direct_sound_samples/cries/charizard.aif differ diff --git a/sound/direct_sound_samples/cries/charmander.aif b/sound/direct_sound_samples/cries/charmander.aif new file mode 100644 index 000000000..3c96777b6 Binary files /dev/null and b/sound/direct_sound_samples/cries/charmander.aif differ diff --git a/sound/direct_sound_samples/cries/charmeleon.aif b/sound/direct_sound_samples/cries/charmeleon.aif new file mode 100644 index 000000000..0cf2f47a1 Binary files /dev/null and b/sound/direct_sound_samples/cries/charmeleon.aif differ diff --git a/sound/direct_sound_samples/cries/chatot.aif b/sound/direct_sound_samples/cries/chatot.aif new file mode 100644 index 000000000..6dc58e519 Binary files /dev/null and b/sound/direct_sound_samples/cries/chatot.aif differ diff --git a/sound/direct_sound_samples/cries/cherrim.aif b/sound/direct_sound_samples/cries/cherrim.aif new file mode 100644 index 000000000..fee121278 Binary files /dev/null and b/sound/direct_sound_samples/cries/cherrim.aif differ diff --git a/sound/direct_sound_samples/cries/cherubi.aif b/sound/direct_sound_samples/cries/cherubi.aif new file mode 100644 index 000000000..02fd6d6dd Binary files /dev/null and b/sound/direct_sound_samples/cries/cherubi.aif differ diff --git a/sound/direct_sound_samples/cries/chikorita.aif b/sound/direct_sound_samples/cries/chikorita.aif new file mode 100644 index 000000000..b5ccaf7cb Binary files /dev/null and b/sound/direct_sound_samples/cries/chikorita.aif differ diff --git a/sound/direct_sound_samples/cries/chimchar.aif b/sound/direct_sound_samples/cries/chimchar.aif new file mode 100644 index 000000000..95c90b633 Binary files /dev/null and b/sound/direct_sound_samples/cries/chimchar.aif differ diff --git a/sound/direct_sound_samples/cries/chimecho.aif b/sound/direct_sound_samples/cries/chimecho.aif new file mode 100644 index 000000000..b7aacc8bf Binary files /dev/null and b/sound/direct_sound_samples/cries/chimecho.aif differ diff --git a/sound/direct_sound_samples/cries/chinchou.aif b/sound/direct_sound_samples/cries/chinchou.aif new file mode 100644 index 000000000..889cea6c2 Binary files /dev/null and b/sound/direct_sound_samples/cries/chinchou.aif differ diff --git a/sound/direct_sound_samples/cries/chingling.aif b/sound/direct_sound_samples/cries/chingling.aif new file mode 100644 index 000000000..8154abc5c Binary files /dev/null and b/sound/direct_sound_samples/cries/chingling.aif differ diff --git a/sound/direct_sound_samples/cries/cinccino.aif b/sound/direct_sound_samples/cries/cinccino.aif new file mode 100644 index 000000000..005771f78 Binary files /dev/null and b/sound/direct_sound_samples/cries/cinccino.aif differ diff --git a/sound/direct_sound_samples/cries/clamperl.aif b/sound/direct_sound_samples/cries/clamperl.aif new file mode 100644 index 000000000..9046fa0c2 Binary files /dev/null and b/sound/direct_sound_samples/cries/clamperl.aif differ diff --git a/sound/direct_sound_samples/cries/claydol.aif b/sound/direct_sound_samples/cries/claydol.aif new file mode 100644 index 000000000..07cac57a7 Binary files /dev/null and b/sound/direct_sound_samples/cries/claydol.aif differ diff --git a/sound/direct_sound_samples/cries/clefable.aif b/sound/direct_sound_samples/cries/clefable.aif new file mode 100644 index 000000000..8ebb7f340 Binary files /dev/null and b/sound/direct_sound_samples/cries/clefable.aif differ diff --git a/sound/direct_sound_samples/cries/clefairy.aif b/sound/direct_sound_samples/cries/clefairy.aif new file mode 100644 index 000000000..eff944e76 Binary files /dev/null and b/sound/direct_sound_samples/cries/clefairy.aif differ diff --git a/sound/direct_sound_samples/cries/cleffa.aif b/sound/direct_sound_samples/cries/cleffa.aif new file mode 100644 index 000000000..c060d6bc1 Binary files /dev/null and b/sound/direct_sound_samples/cries/cleffa.aif differ diff --git a/sound/direct_sound_samples/cries/cloyster.aif b/sound/direct_sound_samples/cries/cloyster.aif new file mode 100644 index 000000000..d93f93d8b Binary files /dev/null and b/sound/direct_sound_samples/cries/cloyster.aif differ diff --git a/sound/direct_sound_samples/cries/cobalion.aif b/sound/direct_sound_samples/cries/cobalion.aif new file mode 100644 index 000000000..e53ea9b03 Binary files /dev/null and b/sound/direct_sound_samples/cries/cobalion.aif differ diff --git a/sound/direct_sound_samples/cries/cofagrigus.aif b/sound/direct_sound_samples/cries/cofagrigus.aif new file mode 100644 index 000000000..b971f50bb Binary files /dev/null and b/sound/direct_sound_samples/cries/cofagrigus.aif differ diff --git a/sound/direct_sound_samples/cries/combee.aif b/sound/direct_sound_samples/cries/combee.aif new file mode 100644 index 000000000..d07abbb15 Binary files /dev/null and b/sound/direct_sound_samples/cries/combee.aif differ diff --git a/sound/direct_sound_samples/cries/combusken.aif b/sound/direct_sound_samples/cries/combusken.aif new file mode 100644 index 000000000..2f53b8f83 Binary files /dev/null and b/sound/direct_sound_samples/cries/combusken.aif differ diff --git a/sound/direct_sound_samples/cries/conkeldurr.aif b/sound/direct_sound_samples/cries/conkeldurr.aif new file mode 100644 index 000000000..8fc66c6b6 Binary files /dev/null and b/sound/direct_sound_samples/cries/conkeldurr.aif differ diff --git a/sound/direct_sound_samples/cries/corphish.aif b/sound/direct_sound_samples/cries/corphish.aif new file mode 100644 index 000000000..2605e1fd2 Binary files /dev/null and b/sound/direct_sound_samples/cries/corphish.aif differ diff --git a/sound/direct_sound_samples/cries/corsola.aif b/sound/direct_sound_samples/cries/corsola.aif new file mode 100644 index 000000000..6eae55ea7 Binary files /dev/null and b/sound/direct_sound_samples/cries/corsola.aif differ diff --git a/sound/direct_sound_samples/cries/cottonee.aif b/sound/direct_sound_samples/cries/cottonee.aif new file mode 100644 index 000000000..526dc5f79 Binary files /dev/null and b/sound/direct_sound_samples/cries/cottonee.aif differ diff --git a/sound/direct_sound_samples/cries/cradily.aif b/sound/direct_sound_samples/cries/cradily.aif new file mode 100644 index 000000000..695f4c36f Binary files /dev/null and b/sound/direct_sound_samples/cries/cradily.aif differ diff --git a/sound/direct_sound_samples/cries/cranidos.aif b/sound/direct_sound_samples/cries/cranidos.aif new file mode 100644 index 000000000..4e0c32b7a Binary files /dev/null and b/sound/direct_sound_samples/cries/cranidos.aif differ diff --git a/sound/direct_sound_samples/cries/crawdaunt.aif b/sound/direct_sound_samples/cries/crawdaunt.aif new file mode 100644 index 000000000..091e34fbd Binary files /dev/null and b/sound/direct_sound_samples/cries/crawdaunt.aif differ diff --git a/sound/direct_sound_samples/cries/cresselia.aif b/sound/direct_sound_samples/cries/cresselia.aif new file mode 100644 index 000000000..e7f25b717 Binary files /dev/null and b/sound/direct_sound_samples/cries/cresselia.aif differ diff --git a/sound/direct_sound_samples/cries/croagunk.aif b/sound/direct_sound_samples/cries/croagunk.aif new file mode 100644 index 000000000..6ebc6cc8b Binary files /dev/null and b/sound/direct_sound_samples/cries/croagunk.aif differ diff --git a/sound/direct_sound_samples/cries/crobat.aif b/sound/direct_sound_samples/cries/crobat.aif new file mode 100644 index 000000000..f3f458171 Binary files /dev/null and b/sound/direct_sound_samples/cries/crobat.aif differ diff --git a/sound/direct_sound_samples/cries/croconaw.aif b/sound/direct_sound_samples/cries/croconaw.aif new file mode 100644 index 000000000..791eb366d Binary files /dev/null and b/sound/direct_sound_samples/cries/croconaw.aif differ diff --git a/sound/direct_sound_samples/cries/crustle.aif b/sound/direct_sound_samples/cries/crustle.aif new file mode 100644 index 000000000..d4a383646 Binary files /dev/null and b/sound/direct_sound_samples/cries/crustle.aif differ diff --git a/sound/direct_sound_samples/cries/cry_abra.aif b/sound/direct_sound_samples/cries/cry_abra.aif deleted file mode 100644 index 7df4446db..000000000 Binary files a/sound/direct_sound_samples/cries/cry_abra.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_absol.aif b/sound/direct_sound_samples/cries/cry_absol.aif deleted file mode 100644 index 884ab22b3..000000000 Binary files a/sound/direct_sound_samples/cries/cry_absol.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_aerodactyl.aif b/sound/direct_sound_samples/cries/cry_aerodactyl.aif deleted file mode 100644 index c0e40f6d1..000000000 Binary files a/sound/direct_sound_samples/cries/cry_aerodactyl.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_aggron.aif b/sound/direct_sound_samples/cries/cry_aggron.aif deleted file mode 100644 index b89ea1222..000000000 Binary files a/sound/direct_sound_samples/cries/cry_aggron.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_aipom.aif b/sound/direct_sound_samples/cries/cry_aipom.aif deleted file mode 100644 index 5ca276de2..000000000 Binary files a/sound/direct_sound_samples/cries/cry_aipom.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_alakazam.aif b/sound/direct_sound_samples/cries/cry_alakazam.aif deleted file mode 100644 index 920e2ff94..000000000 Binary files a/sound/direct_sound_samples/cries/cry_alakazam.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_altaria.aif b/sound/direct_sound_samples/cries/cry_altaria.aif deleted file mode 100644 index 3e8e35e8e..000000000 Binary files a/sound/direct_sound_samples/cries/cry_altaria.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_ampharos.aif b/sound/direct_sound_samples/cries/cry_ampharos.aif deleted file mode 100644 index 4f6e255a0..000000000 Binary files a/sound/direct_sound_samples/cries/cry_ampharos.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_anorith.aif b/sound/direct_sound_samples/cries/cry_anorith.aif deleted file mode 100644 index 96e87e919..000000000 Binary files a/sound/direct_sound_samples/cries/cry_anorith.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_arbok.aif b/sound/direct_sound_samples/cries/cry_arbok.aif deleted file mode 100644 index 6ccace9f9..000000000 Binary files a/sound/direct_sound_samples/cries/cry_arbok.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_arcanine.aif b/sound/direct_sound_samples/cries/cry_arcanine.aif deleted file mode 100644 index 61d802153..000000000 Binary files a/sound/direct_sound_samples/cries/cry_arcanine.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_ariados.aif b/sound/direct_sound_samples/cries/cry_ariados.aif deleted file mode 100644 index 1748624fb..000000000 Binary files a/sound/direct_sound_samples/cries/cry_ariados.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_armaldo.aif b/sound/direct_sound_samples/cries/cry_armaldo.aif deleted file mode 100644 index 756bf0842..000000000 Binary files a/sound/direct_sound_samples/cries/cry_armaldo.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_aron.aif b/sound/direct_sound_samples/cries/cry_aron.aif deleted file mode 100644 index cce70b73b..000000000 Binary files a/sound/direct_sound_samples/cries/cry_aron.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_articuno.aif b/sound/direct_sound_samples/cries/cry_articuno.aif deleted file mode 100644 index 4f237dd0f..000000000 Binary files a/sound/direct_sound_samples/cries/cry_articuno.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_azumarill.aif b/sound/direct_sound_samples/cries/cry_azumarill.aif deleted file mode 100644 index 18411f93c..000000000 Binary files a/sound/direct_sound_samples/cries/cry_azumarill.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_azurill.aif b/sound/direct_sound_samples/cries/cry_azurill.aif deleted file mode 100644 index 7f651c3d3..000000000 Binary files a/sound/direct_sound_samples/cries/cry_azurill.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_bagon.aif b/sound/direct_sound_samples/cries/cry_bagon.aif deleted file mode 100644 index 3843fb9f4..000000000 Binary files a/sound/direct_sound_samples/cries/cry_bagon.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_baltoy.aif b/sound/direct_sound_samples/cries/cry_baltoy.aif deleted file mode 100644 index 25e1a708a..000000000 Binary files a/sound/direct_sound_samples/cries/cry_baltoy.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_banette.aif b/sound/direct_sound_samples/cries/cry_banette.aif deleted file mode 100644 index 23713f1b5..000000000 Binary files a/sound/direct_sound_samples/cries/cry_banette.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_barboach.aif b/sound/direct_sound_samples/cries/cry_barboach.aif deleted file mode 100644 index 4b9228259..000000000 Binary files a/sound/direct_sound_samples/cries/cry_barboach.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_bayleef.aif b/sound/direct_sound_samples/cries/cry_bayleef.aif deleted file mode 100644 index 8cef22df3..000000000 Binary files a/sound/direct_sound_samples/cries/cry_bayleef.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_beautifly.aif b/sound/direct_sound_samples/cries/cry_beautifly.aif deleted file mode 100644 index 0924b6c55..000000000 Binary files a/sound/direct_sound_samples/cries/cry_beautifly.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_beedrill.aif b/sound/direct_sound_samples/cries/cry_beedrill.aif deleted file mode 100644 index 00d0bc96c..000000000 Binary files a/sound/direct_sound_samples/cries/cry_beedrill.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_beldum.aif b/sound/direct_sound_samples/cries/cry_beldum.aif deleted file mode 100644 index 76435a6a8..000000000 Binary files a/sound/direct_sound_samples/cries/cry_beldum.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_bellossom.aif b/sound/direct_sound_samples/cries/cry_bellossom.aif deleted file mode 100644 index 86580df65..000000000 Binary files a/sound/direct_sound_samples/cries/cry_bellossom.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_bellsprout.aif b/sound/direct_sound_samples/cries/cry_bellsprout.aif deleted file mode 100644 index cfdd7aed2..000000000 Binary files a/sound/direct_sound_samples/cries/cry_bellsprout.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_blastoise.aif b/sound/direct_sound_samples/cries/cry_blastoise.aif deleted file mode 100644 index 76dac2bcc..000000000 Binary files a/sound/direct_sound_samples/cries/cry_blastoise.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_blaziken.aif b/sound/direct_sound_samples/cries/cry_blaziken.aif deleted file mode 100644 index 83e5ccf23..000000000 Binary files a/sound/direct_sound_samples/cries/cry_blaziken.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_blissey.aif b/sound/direct_sound_samples/cries/cry_blissey.aif deleted file mode 100644 index 897eb3d69..000000000 Binary files a/sound/direct_sound_samples/cries/cry_blissey.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_breloom.aif b/sound/direct_sound_samples/cries/cry_breloom.aif deleted file mode 100644 index ea3f1bb66..000000000 Binary files a/sound/direct_sound_samples/cries/cry_breloom.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_bulbasaur.aif b/sound/direct_sound_samples/cries/cry_bulbasaur.aif deleted file mode 100644 index 040fb1df7..000000000 Binary files a/sound/direct_sound_samples/cries/cry_bulbasaur.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_butterfree.aif b/sound/direct_sound_samples/cries/cry_butterfree.aif deleted file mode 100644 index f27616395..000000000 Binary files a/sound/direct_sound_samples/cries/cry_butterfree.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_cacnea.aif b/sound/direct_sound_samples/cries/cry_cacnea.aif deleted file mode 100644 index 4fd5acd36..000000000 Binary files a/sound/direct_sound_samples/cries/cry_cacnea.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_cacturne.aif b/sound/direct_sound_samples/cries/cry_cacturne.aif deleted file mode 100644 index d9fb8fda8..000000000 Binary files a/sound/direct_sound_samples/cries/cry_cacturne.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_camerupt.aif b/sound/direct_sound_samples/cries/cry_camerupt.aif deleted file mode 100644 index 325df1220..000000000 Binary files a/sound/direct_sound_samples/cries/cry_camerupt.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_carvanha.aif b/sound/direct_sound_samples/cries/cry_carvanha.aif deleted file mode 100644 index c7cdedf91..000000000 Binary files a/sound/direct_sound_samples/cries/cry_carvanha.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_cascoon.aif b/sound/direct_sound_samples/cries/cry_cascoon.aif deleted file mode 100644 index 17eef0ee9..000000000 Binary files a/sound/direct_sound_samples/cries/cry_cascoon.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_castform.aif b/sound/direct_sound_samples/cries/cry_castform.aif deleted file mode 100644 index c10745640..000000000 Binary files a/sound/direct_sound_samples/cries/cry_castform.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_caterpie.aif b/sound/direct_sound_samples/cries/cry_caterpie.aif deleted file mode 100644 index b0b246b4f..000000000 Binary files a/sound/direct_sound_samples/cries/cry_caterpie.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_celebi.aif b/sound/direct_sound_samples/cries/cry_celebi.aif deleted file mode 100644 index 9f9f3ea39..000000000 Binary files a/sound/direct_sound_samples/cries/cry_celebi.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_chansey.aif b/sound/direct_sound_samples/cries/cry_chansey.aif deleted file mode 100644 index d764c86ce..000000000 Binary files a/sound/direct_sound_samples/cries/cry_chansey.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_charizard.aif b/sound/direct_sound_samples/cries/cry_charizard.aif deleted file mode 100644 index 48321b792..000000000 Binary files a/sound/direct_sound_samples/cries/cry_charizard.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_charmander.aif b/sound/direct_sound_samples/cries/cry_charmander.aif deleted file mode 100644 index d72c0f9e0..000000000 Binary files a/sound/direct_sound_samples/cries/cry_charmander.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_charmeleon.aif b/sound/direct_sound_samples/cries/cry_charmeleon.aif deleted file mode 100644 index 8e84af0d8..000000000 Binary files a/sound/direct_sound_samples/cries/cry_charmeleon.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_chikorita.aif b/sound/direct_sound_samples/cries/cry_chikorita.aif deleted file mode 100644 index 67ceafdc3..000000000 Binary files a/sound/direct_sound_samples/cries/cry_chikorita.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_chimecho.aif b/sound/direct_sound_samples/cries/cry_chimecho.aif deleted file mode 100644 index 87ee2faee..000000000 Binary files a/sound/direct_sound_samples/cries/cry_chimecho.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_chinchou.aif b/sound/direct_sound_samples/cries/cry_chinchou.aif deleted file mode 100644 index 356475678..000000000 Binary files a/sound/direct_sound_samples/cries/cry_chinchou.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_clamperl.aif b/sound/direct_sound_samples/cries/cry_clamperl.aif deleted file mode 100644 index 7250bd703..000000000 Binary files a/sound/direct_sound_samples/cries/cry_clamperl.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_claydol.aif b/sound/direct_sound_samples/cries/cry_claydol.aif deleted file mode 100644 index b89772021..000000000 Binary files a/sound/direct_sound_samples/cries/cry_claydol.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_clefable.aif b/sound/direct_sound_samples/cries/cry_clefable.aif deleted file mode 100644 index 9c2d8c664..000000000 Binary files a/sound/direct_sound_samples/cries/cry_clefable.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_clefairy.aif b/sound/direct_sound_samples/cries/cry_clefairy.aif deleted file mode 100644 index c370c4a9b..000000000 Binary files a/sound/direct_sound_samples/cries/cry_clefairy.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_cleffa.aif b/sound/direct_sound_samples/cries/cry_cleffa.aif deleted file mode 100644 index b27cdeca9..000000000 Binary files a/sound/direct_sound_samples/cries/cry_cleffa.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_cloyster.aif b/sound/direct_sound_samples/cries/cry_cloyster.aif deleted file mode 100644 index b406deab0..000000000 Binary files a/sound/direct_sound_samples/cries/cry_cloyster.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_combusken.aif b/sound/direct_sound_samples/cries/cry_combusken.aif deleted file mode 100644 index 7d4b0d4cc..000000000 Binary files a/sound/direct_sound_samples/cries/cry_combusken.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_corphish.aif b/sound/direct_sound_samples/cries/cry_corphish.aif deleted file mode 100644 index f0f5ca01e..000000000 Binary files a/sound/direct_sound_samples/cries/cry_corphish.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_corsola.aif b/sound/direct_sound_samples/cries/cry_corsola.aif deleted file mode 100644 index 68e743bfd..000000000 Binary files a/sound/direct_sound_samples/cries/cry_corsola.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_cradily.aif b/sound/direct_sound_samples/cries/cry_cradily.aif deleted file mode 100644 index 197dc8d92..000000000 Binary files a/sound/direct_sound_samples/cries/cry_cradily.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_crawdaunt.aif b/sound/direct_sound_samples/cries/cry_crawdaunt.aif deleted file mode 100644 index a203ce2fb..000000000 Binary files a/sound/direct_sound_samples/cries/cry_crawdaunt.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_crobat.aif b/sound/direct_sound_samples/cries/cry_crobat.aif deleted file mode 100644 index 75d039bd8..000000000 Binary files a/sound/direct_sound_samples/cries/cry_crobat.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_croconaw.aif b/sound/direct_sound_samples/cries/cry_croconaw.aif deleted file mode 100644 index afb7f3fdc..000000000 Binary files a/sound/direct_sound_samples/cries/cry_croconaw.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_cubone.aif b/sound/direct_sound_samples/cries/cry_cubone.aif deleted file mode 100644 index 170745da1..000000000 Binary files a/sound/direct_sound_samples/cries/cry_cubone.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_cyndaquil.aif b/sound/direct_sound_samples/cries/cry_cyndaquil.aif deleted file mode 100644 index 4aa580199..000000000 Binary files a/sound/direct_sound_samples/cries/cry_cyndaquil.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_delcatty.aif b/sound/direct_sound_samples/cries/cry_delcatty.aif deleted file mode 100644 index dd665b110..000000000 Binary files a/sound/direct_sound_samples/cries/cry_delcatty.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_delibird.aif b/sound/direct_sound_samples/cries/cry_delibird.aif deleted file mode 100644 index dbedc42d4..000000000 Binary files a/sound/direct_sound_samples/cries/cry_delibird.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_deoxys.aif b/sound/direct_sound_samples/cries/cry_deoxys.aif deleted file mode 100644 index b9623b337..000000000 Binary files a/sound/direct_sound_samples/cries/cry_deoxys.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_dewgong.aif b/sound/direct_sound_samples/cries/cry_dewgong.aif deleted file mode 100644 index 72d69b773..000000000 Binary files a/sound/direct_sound_samples/cries/cry_dewgong.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_diglett.aif b/sound/direct_sound_samples/cries/cry_diglett.aif deleted file mode 100644 index b116af7f2..000000000 Binary files a/sound/direct_sound_samples/cries/cry_diglett.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_ditto.aif b/sound/direct_sound_samples/cries/cry_ditto.aif deleted file mode 100644 index 2c797f4c4..000000000 Binary files a/sound/direct_sound_samples/cries/cry_ditto.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_dodrio.aif b/sound/direct_sound_samples/cries/cry_dodrio.aif deleted file mode 100644 index 111d8bf3e..000000000 Binary files a/sound/direct_sound_samples/cries/cry_dodrio.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_doduo.aif b/sound/direct_sound_samples/cries/cry_doduo.aif deleted file mode 100644 index 5700b91d9..000000000 Binary files a/sound/direct_sound_samples/cries/cry_doduo.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_donphan.aif b/sound/direct_sound_samples/cries/cry_donphan.aif deleted file mode 100644 index a41c124b1..000000000 Binary files a/sound/direct_sound_samples/cries/cry_donphan.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_dragonair.aif b/sound/direct_sound_samples/cries/cry_dragonair.aif deleted file mode 100644 index 38c3955ef..000000000 Binary files a/sound/direct_sound_samples/cries/cry_dragonair.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_dragonite.aif b/sound/direct_sound_samples/cries/cry_dragonite.aif deleted file mode 100644 index d1e7b11cf..000000000 Binary files a/sound/direct_sound_samples/cries/cry_dragonite.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_dratini.aif b/sound/direct_sound_samples/cries/cry_dratini.aif deleted file mode 100644 index 298497480..000000000 Binary files a/sound/direct_sound_samples/cries/cry_dratini.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_drowzee.aif b/sound/direct_sound_samples/cries/cry_drowzee.aif deleted file mode 100644 index 0d53eb2ff..000000000 Binary files a/sound/direct_sound_samples/cries/cry_drowzee.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_dugtrio.aif b/sound/direct_sound_samples/cries/cry_dugtrio.aif deleted file mode 100644 index dff573dfe..000000000 Binary files a/sound/direct_sound_samples/cries/cry_dugtrio.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_dunsparce.aif b/sound/direct_sound_samples/cries/cry_dunsparce.aif deleted file mode 100644 index 454617c05..000000000 Binary files a/sound/direct_sound_samples/cries/cry_dunsparce.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_dusclops.aif b/sound/direct_sound_samples/cries/cry_dusclops.aif deleted file mode 100644 index de9657e4f..000000000 Binary files a/sound/direct_sound_samples/cries/cry_dusclops.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_duskull.aif b/sound/direct_sound_samples/cries/cry_duskull.aif deleted file mode 100644 index d84ea274e..000000000 Binary files a/sound/direct_sound_samples/cries/cry_duskull.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_dustox.aif b/sound/direct_sound_samples/cries/cry_dustox.aif deleted file mode 100644 index 56d8eb336..000000000 Binary files a/sound/direct_sound_samples/cries/cry_dustox.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_eevee.aif b/sound/direct_sound_samples/cries/cry_eevee.aif deleted file mode 100644 index 8711a1470..000000000 Binary files a/sound/direct_sound_samples/cries/cry_eevee.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_ekans.aif b/sound/direct_sound_samples/cries/cry_ekans.aif deleted file mode 100644 index 9eb396735..000000000 Binary files a/sound/direct_sound_samples/cries/cry_ekans.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_electabuzz.aif b/sound/direct_sound_samples/cries/cry_electabuzz.aif deleted file mode 100644 index 5abdb49b7..000000000 Binary files a/sound/direct_sound_samples/cries/cry_electabuzz.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_electrike.aif b/sound/direct_sound_samples/cries/cry_electrike.aif deleted file mode 100644 index 56c9666df..000000000 Binary files a/sound/direct_sound_samples/cries/cry_electrike.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_electrode.aif b/sound/direct_sound_samples/cries/cry_electrode.aif deleted file mode 100644 index cbd7f0971..000000000 Binary files a/sound/direct_sound_samples/cries/cry_electrode.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_elekid.aif b/sound/direct_sound_samples/cries/cry_elekid.aif deleted file mode 100644 index 839bdee17..000000000 Binary files a/sound/direct_sound_samples/cries/cry_elekid.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_entei.aif b/sound/direct_sound_samples/cries/cry_entei.aif deleted file mode 100644 index 56a740207..000000000 Binary files a/sound/direct_sound_samples/cries/cry_entei.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_espeon.aif b/sound/direct_sound_samples/cries/cry_espeon.aif deleted file mode 100644 index 53dc62f4d..000000000 Binary files a/sound/direct_sound_samples/cries/cry_espeon.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_exeggcute.aif b/sound/direct_sound_samples/cries/cry_exeggcute.aif deleted file mode 100644 index 147912c2f..000000000 Binary files a/sound/direct_sound_samples/cries/cry_exeggcute.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_exeggutor.aif b/sound/direct_sound_samples/cries/cry_exeggutor.aif deleted file mode 100644 index c0b9177bf..000000000 Binary files a/sound/direct_sound_samples/cries/cry_exeggutor.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_exploud.aif b/sound/direct_sound_samples/cries/cry_exploud.aif deleted file mode 100644 index 5b80870cc..000000000 Binary files a/sound/direct_sound_samples/cries/cry_exploud.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_farfetchd.aif b/sound/direct_sound_samples/cries/cry_farfetchd.aif deleted file mode 100644 index f1db556dc..000000000 Binary files a/sound/direct_sound_samples/cries/cry_farfetchd.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_fearow.aif b/sound/direct_sound_samples/cries/cry_fearow.aif deleted file mode 100644 index 74a76f6d4..000000000 Binary files a/sound/direct_sound_samples/cries/cry_fearow.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_feebas.aif b/sound/direct_sound_samples/cries/cry_feebas.aif deleted file mode 100644 index c386522f1..000000000 Binary files a/sound/direct_sound_samples/cries/cry_feebas.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_feraligatr.aif b/sound/direct_sound_samples/cries/cry_feraligatr.aif deleted file mode 100644 index 9fcd93cff..000000000 Binary files a/sound/direct_sound_samples/cries/cry_feraligatr.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_flaaffy.aif b/sound/direct_sound_samples/cries/cry_flaaffy.aif deleted file mode 100644 index 93dfacfaf..000000000 Binary files a/sound/direct_sound_samples/cries/cry_flaaffy.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_flareon.aif b/sound/direct_sound_samples/cries/cry_flareon.aif deleted file mode 100644 index 58d28e60a..000000000 Binary files a/sound/direct_sound_samples/cries/cry_flareon.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_flygon.aif b/sound/direct_sound_samples/cries/cry_flygon.aif deleted file mode 100644 index c8c377016..000000000 Binary files a/sound/direct_sound_samples/cries/cry_flygon.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_forretress.aif b/sound/direct_sound_samples/cries/cry_forretress.aif deleted file mode 100644 index 288dacbea..000000000 Binary files a/sound/direct_sound_samples/cries/cry_forretress.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_furret.aif b/sound/direct_sound_samples/cries/cry_furret.aif deleted file mode 100644 index 6b4e9ce11..000000000 Binary files a/sound/direct_sound_samples/cries/cry_furret.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_gardevoir.aif b/sound/direct_sound_samples/cries/cry_gardevoir.aif deleted file mode 100644 index a14780990..000000000 Binary files a/sound/direct_sound_samples/cries/cry_gardevoir.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_gastly.aif b/sound/direct_sound_samples/cries/cry_gastly.aif deleted file mode 100644 index 93cef851d..000000000 Binary files a/sound/direct_sound_samples/cries/cry_gastly.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_gengar.aif b/sound/direct_sound_samples/cries/cry_gengar.aif deleted file mode 100644 index 379b5d37e..000000000 Binary files a/sound/direct_sound_samples/cries/cry_gengar.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_geodude.aif b/sound/direct_sound_samples/cries/cry_geodude.aif deleted file mode 100644 index 143b9031c..000000000 Binary files a/sound/direct_sound_samples/cries/cry_geodude.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_girafarig.aif b/sound/direct_sound_samples/cries/cry_girafarig.aif deleted file mode 100644 index 1dd5f93e2..000000000 Binary files a/sound/direct_sound_samples/cries/cry_girafarig.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_glalie.aif b/sound/direct_sound_samples/cries/cry_glalie.aif deleted file mode 100644 index e4e896547..000000000 Binary files a/sound/direct_sound_samples/cries/cry_glalie.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_gligar.aif b/sound/direct_sound_samples/cries/cry_gligar.aif deleted file mode 100644 index 4050f08b0..000000000 Binary files a/sound/direct_sound_samples/cries/cry_gligar.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_gloom.aif b/sound/direct_sound_samples/cries/cry_gloom.aif deleted file mode 100644 index e930328ac..000000000 Binary files a/sound/direct_sound_samples/cries/cry_gloom.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_golbat.aif b/sound/direct_sound_samples/cries/cry_golbat.aif deleted file mode 100644 index 11413df3a..000000000 Binary files a/sound/direct_sound_samples/cries/cry_golbat.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_goldeen.aif b/sound/direct_sound_samples/cries/cry_goldeen.aif deleted file mode 100644 index 81fd1ecdf..000000000 Binary files a/sound/direct_sound_samples/cries/cry_goldeen.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_golduck.aif b/sound/direct_sound_samples/cries/cry_golduck.aif deleted file mode 100644 index b6b71a7a4..000000000 Binary files a/sound/direct_sound_samples/cries/cry_golduck.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_golem.aif b/sound/direct_sound_samples/cries/cry_golem.aif deleted file mode 100644 index 0d2c4515e..000000000 Binary files a/sound/direct_sound_samples/cries/cry_golem.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_gorebyss.aif b/sound/direct_sound_samples/cries/cry_gorebyss.aif deleted file mode 100644 index b7605062c..000000000 Binary files a/sound/direct_sound_samples/cries/cry_gorebyss.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_granbull.aif b/sound/direct_sound_samples/cries/cry_granbull.aif deleted file mode 100644 index 146b3bd0c..000000000 Binary files a/sound/direct_sound_samples/cries/cry_granbull.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_graveler.aif b/sound/direct_sound_samples/cries/cry_graveler.aif deleted file mode 100644 index 773994228..000000000 Binary files a/sound/direct_sound_samples/cries/cry_graveler.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_grimer.aif b/sound/direct_sound_samples/cries/cry_grimer.aif deleted file mode 100644 index 95eed1061..000000000 Binary files a/sound/direct_sound_samples/cries/cry_grimer.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_groudon.aif b/sound/direct_sound_samples/cries/cry_groudon.aif deleted file mode 100644 index 62452b4d9..000000000 Binary files a/sound/direct_sound_samples/cries/cry_groudon.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_grovyle.aif b/sound/direct_sound_samples/cries/cry_grovyle.aif deleted file mode 100644 index 983bcfff3..000000000 Binary files a/sound/direct_sound_samples/cries/cry_grovyle.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_growlithe.aif b/sound/direct_sound_samples/cries/cry_growlithe.aif deleted file mode 100644 index 134e29834..000000000 Binary files a/sound/direct_sound_samples/cries/cry_growlithe.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_grumpig.aif b/sound/direct_sound_samples/cries/cry_grumpig.aif deleted file mode 100644 index 97c372076..000000000 Binary files a/sound/direct_sound_samples/cries/cry_grumpig.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_gulpin.aif b/sound/direct_sound_samples/cries/cry_gulpin.aif deleted file mode 100644 index f3043b422..000000000 Binary files a/sound/direct_sound_samples/cries/cry_gulpin.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_gyarados.aif b/sound/direct_sound_samples/cries/cry_gyarados.aif deleted file mode 100644 index 238b6d721..000000000 Binary files a/sound/direct_sound_samples/cries/cry_gyarados.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_hariyama.aif b/sound/direct_sound_samples/cries/cry_hariyama.aif deleted file mode 100644 index 1ac1f3f7e..000000000 Binary files a/sound/direct_sound_samples/cries/cry_hariyama.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_haunter.aif b/sound/direct_sound_samples/cries/cry_haunter.aif deleted file mode 100644 index 60ec72171..000000000 Binary files a/sound/direct_sound_samples/cries/cry_haunter.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_heracross.aif b/sound/direct_sound_samples/cries/cry_heracross.aif deleted file mode 100644 index a0734748f..000000000 Binary files a/sound/direct_sound_samples/cries/cry_heracross.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_hitmonchan.aif b/sound/direct_sound_samples/cries/cry_hitmonchan.aif deleted file mode 100644 index 40479452c..000000000 Binary files a/sound/direct_sound_samples/cries/cry_hitmonchan.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_hitmonlee.aif b/sound/direct_sound_samples/cries/cry_hitmonlee.aif deleted file mode 100644 index 3a4bcddca..000000000 Binary files a/sound/direct_sound_samples/cries/cry_hitmonlee.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_hitmontop.aif b/sound/direct_sound_samples/cries/cry_hitmontop.aif deleted file mode 100644 index 3fbee8041..000000000 Binary files a/sound/direct_sound_samples/cries/cry_hitmontop.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_ho_oh.aif b/sound/direct_sound_samples/cries/cry_ho_oh.aif deleted file mode 100644 index 52f8dd307..000000000 Binary files a/sound/direct_sound_samples/cries/cry_ho_oh.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_hoothoot.aif b/sound/direct_sound_samples/cries/cry_hoothoot.aif deleted file mode 100644 index 59e685dcc..000000000 Binary files a/sound/direct_sound_samples/cries/cry_hoothoot.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_hoppip.aif b/sound/direct_sound_samples/cries/cry_hoppip.aif deleted file mode 100644 index ea47877d0..000000000 Binary files a/sound/direct_sound_samples/cries/cry_hoppip.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_horsea.aif b/sound/direct_sound_samples/cries/cry_horsea.aif deleted file mode 100644 index e41eff4b1..000000000 Binary files a/sound/direct_sound_samples/cries/cry_horsea.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_houndoom.aif b/sound/direct_sound_samples/cries/cry_houndoom.aif deleted file mode 100644 index 6fec16d39..000000000 Binary files a/sound/direct_sound_samples/cries/cry_houndoom.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_houndour.aif b/sound/direct_sound_samples/cries/cry_houndour.aif deleted file mode 100644 index 7431bbf29..000000000 Binary files a/sound/direct_sound_samples/cries/cry_houndour.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_huntail.aif b/sound/direct_sound_samples/cries/cry_huntail.aif deleted file mode 100644 index f1d3b29d9..000000000 Binary files a/sound/direct_sound_samples/cries/cry_huntail.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_hypno.aif b/sound/direct_sound_samples/cries/cry_hypno.aif deleted file mode 100644 index 32672a3c3..000000000 Binary files a/sound/direct_sound_samples/cries/cry_hypno.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_igglybuff.aif b/sound/direct_sound_samples/cries/cry_igglybuff.aif deleted file mode 100644 index 8de8394d5..000000000 Binary files a/sound/direct_sound_samples/cries/cry_igglybuff.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_illumise.aif b/sound/direct_sound_samples/cries/cry_illumise.aif deleted file mode 100644 index 75e03efc8..000000000 Binary files a/sound/direct_sound_samples/cries/cry_illumise.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_ivysaur.aif b/sound/direct_sound_samples/cries/cry_ivysaur.aif deleted file mode 100644 index ea474ff88..000000000 Binary files a/sound/direct_sound_samples/cries/cry_ivysaur.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_jigglypuff.aif b/sound/direct_sound_samples/cries/cry_jigglypuff.aif deleted file mode 100644 index 780424b4f..000000000 Binary files a/sound/direct_sound_samples/cries/cry_jigglypuff.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_jirachi.aif b/sound/direct_sound_samples/cries/cry_jirachi.aif deleted file mode 100644 index ea8a5c8ad..000000000 Binary files a/sound/direct_sound_samples/cries/cry_jirachi.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_jolteon.aif b/sound/direct_sound_samples/cries/cry_jolteon.aif deleted file mode 100644 index 013369158..000000000 Binary files a/sound/direct_sound_samples/cries/cry_jolteon.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_jumpluff.aif b/sound/direct_sound_samples/cries/cry_jumpluff.aif deleted file mode 100644 index 13b0fd315..000000000 Binary files a/sound/direct_sound_samples/cries/cry_jumpluff.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_jynx.aif b/sound/direct_sound_samples/cries/cry_jynx.aif deleted file mode 100644 index 7394a48a2..000000000 Binary files a/sound/direct_sound_samples/cries/cry_jynx.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_kabuto.aif b/sound/direct_sound_samples/cries/cry_kabuto.aif deleted file mode 100644 index 6ae9801b5..000000000 Binary files a/sound/direct_sound_samples/cries/cry_kabuto.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_kabutops.aif b/sound/direct_sound_samples/cries/cry_kabutops.aif deleted file mode 100644 index cb888bff9..000000000 Binary files a/sound/direct_sound_samples/cries/cry_kabutops.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_kadabra.aif b/sound/direct_sound_samples/cries/cry_kadabra.aif deleted file mode 100644 index bfcc18031..000000000 Binary files a/sound/direct_sound_samples/cries/cry_kadabra.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_kakuna.aif b/sound/direct_sound_samples/cries/cry_kakuna.aif deleted file mode 100644 index 7c4e9d7a8..000000000 Binary files a/sound/direct_sound_samples/cries/cry_kakuna.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_kangaskhan.aif b/sound/direct_sound_samples/cries/cry_kangaskhan.aif deleted file mode 100644 index 643e81eb7..000000000 Binary files a/sound/direct_sound_samples/cries/cry_kangaskhan.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_kecleon.aif b/sound/direct_sound_samples/cries/cry_kecleon.aif deleted file mode 100644 index f27ae1832..000000000 Binary files a/sound/direct_sound_samples/cries/cry_kecleon.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_kingdra.aif b/sound/direct_sound_samples/cries/cry_kingdra.aif deleted file mode 100644 index ade230c82..000000000 Binary files a/sound/direct_sound_samples/cries/cry_kingdra.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_kingler.aif b/sound/direct_sound_samples/cries/cry_kingler.aif deleted file mode 100644 index a1d845f45..000000000 Binary files a/sound/direct_sound_samples/cries/cry_kingler.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_kirlia.aif b/sound/direct_sound_samples/cries/cry_kirlia.aif deleted file mode 100644 index 692e03e5f..000000000 Binary files a/sound/direct_sound_samples/cries/cry_kirlia.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_koffing.aif b/sound/direct_sound_samples/cries/cry_koffing.aif deleted file mode 100644 index 7ca9de088..000000000 Binary files a/sound/direct_sound_samples/cries/cry_koffing.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_krabby.aif b/sound/direct_sound_samples/cries/cry_krabby.aif deleted file mode 100644 index 6b7692f21..000000000 Binary files a/sound/direct_sound_samples/cries/cry_krabby.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_kyogre.aif b/sound/direct_sound_samples/cries/cry_kyogre.aif deleted file mode 100644 index 290948319..000000000 Binary files a/sound/direct_sound_samples/cries/cry_kyogre.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_lairon.aif b/sound/direct_sound_samples/cries/cry_lairon.aif deleted file mode 100644 index b487165bf..000000000 Binary files a/sound/direct_sound_samples/cries/cry_lairon.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_lanturn.aif b/sound/direct_sound_samples/cries/cry_lanturn.aif deleted file mode 100644 index dfeac1fbd..000000000 Binary files a/sound/direct_sound_samples/cries/cry_lanturn.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_lapras.aif b/sound/direct_sound_samples/cries/cry_lapras.aif deleted file mode 100644 index 61de32408..000000000 Binary files a/sound/direct_sound_samples/cries/cry_lapras.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_larvitar.aif b/sound/direct_sound_samples/cries/cry_larvitar.aif deleted file mode 100644 index 1ab0e1d5f..000000000 Binary files a/sound/direct_sound_samples/cries/cry_larvitar.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_latias.aif b/sound/direct_sound_samples/cries/cry_latias.aif deleted file mode 100644 index 46f7235f3..000000000 Binary files a/sound/direct_sound_samples/cries/cry_latias.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_latios.aif b/sound/direct_sound_samples/cries/cry_latios.aif deleted file mode 100644 index b8ace2a30..000000000 Binary files a/sound/direct_sound_samples/cries/cry_latios.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_ledian.aif b/sound/direct_sound_samples/cries/cry_ledian.aif deleted file mode 100644 index baefb5fa3..000000000 Binary files a/sound/direct_sound_samples/cries/cry_ledian.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_ledyba.aif b/sound/direct_sound_samples/cries/cry_ledyba.aif deleted file mode 100644 index 4f26859a7..000000000 Binary files a/sound/direct_sound_samples/cries/cry_ledyba.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_lickitung.aif b/sound/direct_sound_samples/cries/cry_lickitung.aif deleted file mode 100644 index e469450a1..000000000 Binary files a/sound/direct_sound_samples/cries/cry_lickitung.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_lileep.aif b/sound/direct_sound_samples/cries/cry_lileep.aif deleted file mode 100644 index ed8258eb7..000000000 Binary files a/sound/direct_sound_samples/cries/cry_lileep.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_linoone.aif b/sound/direct_sound_samples/cries/cry_linoone.aif deleted file mode 100644 index 4e5e7d3b5..000000000 Binary files a/sound/direct_sound_samples/cries/cry_linoone.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_lombre.aif b/sound/direct_sound_samples/cries/cry_lombre.aif deleted file mode 100644 index abafe4321..000000000 Binary files a/sound/direct_sound_samples/cries/cry_lombre.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_lotad.aif b/sound/direct_sound_samples/cries/cry_lotad.aif deleted file mode 100644 index 2596f4390..000000000 Binary files a/sound/direct_sound_samples/cries/cry_lotad.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_loudred.aif b/sound/direct_sound_samples/cries/cry_loudred.aif deleted file mode 100644 index fed7ebec8..000000000 Binary files a/sound/direct_sound_samples/cries/cry_loudred.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_ludicolo.aif b/sound/direct_sound_samples/cries/cry_ludicolo.aif deleted file mode 100644 index 7cf670f38..000000000 Binary files a/sound/direct_sound_samples/cries/cry_ludicolo.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_lugia.aif b/sound/direct_sound_samples/cries/cry_lugia.aif deleted file mode 100644 index 45890a2fc..000000000 Binary files a/sound/direct_sound_samples/cries/cry_lugia.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_lunatone.aif b/sound/direct_sound_samples/cries/cry_lunatone.aif deleted file mode 100644 index 42cbc5e3c..000000000 Binary files a/sound/direct_sound_samples/cries/cry_lunatone.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_luvdisc.aif b/sound/direct_sound_samples/cries/cry_luvdisc.aif deleted file mode 100644 index 3cc0cc744..000000000 Binary files a/sound/direct_sound_samples/cries/cry_luvdisc.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_machamp.aif b/sound/direct_sound_samples/cries/cry_machamp.aif deleted file mode 100644 index ddeaf22c8..000000000 Binary files a/sound/direct_sound_samples/cries/cry_machamp.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_machoke.aif b/sound/direct_sound_samples/cries/cry_machoke.aif deleted file mode 100644 index 97065ee09..000000000 Binary files a/sound/direct_sound_samples/cries/cry_machoke.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_machop.aif b/sound/direct_sound_samples/cries/cry_machop.aif deleted file mode 100644 index d92419e84..000000000 Binary files a/sound/direct_sound_samples/cries/cry_machop.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_magby.aif b/sound/direct_sound_samples/cries/cry_magby.aif deleted file mode 100644 index 12f3dc889..000000000 Binary files a/sound/direct_sound_samples/cries/cry_magby.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_magcargo.aif b/sound/direct_sound_samples/cries/cry_magcargo.aif deleted file mode 100644 index bef0351c0..000000000 Binary files a/sound/direct_sound_samples/cries/cry_magcargo.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_magikarp.aif b/sound/direct_sound_samples/cries/cry_magikarp.aif deleted file mode 100644 index f4f9219c5..000000000 Binary files a/sound/direct_sound_samples/cries/cry_magikarp.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_magmar.aif b/sound/direct_sound_samples/cries/cry_magmar.aif deleted file mode 100644 index b79c8b9a1..000000000 Binary files a/sound/direct_sound_samples/cries/cry_magmar.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_magnemite.aif b/sound/direct_sound_samples/cries/cry_magnemite.aif deleted file mode 100644 index ebb9103d9..000000000 Binary files a/sound/direct_sound_samples/cries/cry_magnemite.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_magneton.aif b/sound/direct_sound_samples/cries/cry_magneton.aif deleted file mode 100644 index 53083ac62..000000000 Binary files a/sound/direct_sound_samples/cries/cry_magneton.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_makuhita.aif b/sound/direct_sound_samples/cries/cry_makuhita.aif deleted file mode 100644 index 38d7f4b44..000000000 Binary files a/sound/direct_sound_samples/cries/cry_makuhita.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_manectric.aif b/sound/direct_sound_samples/cries/cry_manectric.aif deleted file mode 100644 index 18a8f4666..000000000 Binary files a/sound/direct_sound_samples/cries/cry_manectric.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_mankey.aif b/sound/direct_sound_samples/cries/cry_mankey.aif deleted file mode 100644 index dda929d4c..000000000 Binary files a/sound/direct_sound_samples/cries/cry_mankey.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_mantine.aif b/sound/direct_sound_samples/cries/cry_mantine.aif deleted file mode 100644 index d1840aafa..000000000 Binary files a/sound/direct_sound_samples/cries/cry_mantine.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_mareep.aif b/sound/direct_sound_samples/cries/cry_mareep.aif deleted file mode 100644 index 2615b9def..000000000 Binary files a/sound/direct_sound_samples/cries/cry_mareep.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_marill.aif b/sound/direct_sound_samples/cries/cry_marill.aif deleted file mode 100644 index 48d936e7d..000000000 Binary files a/sound/direct_sound_samples/cries/cry_marill.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_marowak.aif b/sound/direct_sound_samples/cries/cry_marowak.aif deleted file mode 100644 index 279381bb5..000000000 Binary files a/sound/direct_sound_samples/cries/cry_marowak.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_marshtomp.aif b/sound/direct_sound_samples/cries/cry_marshtomp.aif deleted file mode 100644 index c0106ff6c..000000000 Binary files a/sound/direct_sound_samples/cries/cry_marshtomp.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_masquerain.aif b/sound/direct_sound_samples/cries/cry_masquerain.aif deleted file mode 100644 index 107bed2f7..000000000 Binary files a/sound/direct_sound_samples/cries/cry_masquerain.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_mawile.aif b/sound/direct_sound_samples/cries/cry_mawile.aif deleted file mode 100644 index 81b252b57..000000000 Binary files a/sound/direct_sound_samples/cries/cry_mawile.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_medicham.aif b/sound/direct_sound_samples/cries/cry_medicham.aif deleted file mode 100644 index dc85dd3b5..000000000 Binary files a/sound/direct_sound_samples/cries/cry_medicham.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_meditite.aif b/sound/direct_sound_samples/cries/cry_meditite.aif deleted file mode 100644 index 8ac680f79..000000000 Binary files a/sound/direct_sound_samples/cries/cry_meditite.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_meganium.aif b/sound/direct_sound_samples/cries/cry_meganium.aif deleted file mode 100644 index ea1e1aa51..000000000 Binary files a/sound/direct_sound_samples/cries/cry_meganium.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_meowth.aif b/sound/direct_sound_samples/cries/cry_meowth.aif deleted file mode 100644 index aaf3825d5..000000000 Binary files a/sound/direct_sound_samples/cries/cry_meowth.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_metagross.aif b/sound/direct_sound_samples/cries/cry_metagross.aif deleted file mode 100644 index b96e6647c..000000000 Binary files a/sound/direct_sound_samples/cries/cry_metagross.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_metang.aif b/sound/direct_sound_samples/cries/cry_metang.aif deleted file mode 100644 index da544ce4d..000000000 Binary files a/sound/direct_sound_samples/cries/cry_metang.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_metapod.aif b/sound/direct_sound_samples/cries/cry_metapod.aif deleted file mode 100644 index ddba3ed44..000000000 Binary files a/sound/direct_sound_samples/cries/cry_metapod.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_mew.aif b/sound/direct_sound_samples/cries/cry_mew.aif deleted file mode 100644 index 2651b96ca..000000000 Binary files a/sound/direct_sound_samples/cries/cry_mew.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_mewtwo.aif b/sound/direct_sound_samples/cries/cry_mewtwo.aif deleted file mode 100644 index 8e1e6c7f1..000000000 Binary files a/sound/direct_sound_samples/cries/cry_mewtwo.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_mightyena.aif b/sound/direct_sound_samples/cries/cry_mightyena.aif deleted file mode 100644 index 53a645edc..000000000 Binary files a/sound/direct_sound_samples/cries/cry_mightyena.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_milotic.aif b/sound/direct_sound_samples/cries/cry_milotic.aif deleted file mode 100644 index 93a14161b..000000000 Binary files a/sound/direct_sound_samples/cries/cry_milotic.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_miltank.aif b/sound/direct_sound_samples/cries/cry_miltank.aif deleted file mode 100644 index ad8a41a45..000000000 Binary files a/sound/direct_sound_samples/cries/cry_miltank.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_minun.aif b/sound/direct_sound_samples/cries/cry_minun.aif deleted file mode 100644 index a55aa5631..000000000 Binary files a/sound/direct_sound_samples/cries/cry_minun.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_misdreavus.aif b/sound/direct_sound_samples/cries/cry_misdreavus.aif deleted file mode 100644 index 39a09f4d0..000000000 Binary files a/sound/direct_sound_samples/cries/cry_misdreavus.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_moltres.aif b/sound/direct_sound_samples/cries/cry_moltres.aif deleted file mode 100644 index 2e038a3d7..000000000 Binary files a/sound/direct_sound_samples/cries/cry_moltres.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_mr_mime.aif b/sound/direct_sound_samples/cries/cry_mr_mime.aif deleted file mode 100644 index ff870dbc4..000000000 Binary files a/sound/direct_sound_samples/cries/cry_mr_mime.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_mudkip.aif b/sound/direct_sound_samples/cries/cry_mudkip.aif deleted file mode 100644 index e8fa5c212..000000000 Binary files a/sound/direct_sound_samples/cries/cry_mudkip.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_muk.aif b/sound/direct_sound_samples/cries/cry_muk.aif deleted file mode 100644 index f61ff4075..000000000 Binary files a/sound/direct_sound_samples/cries/cry_muk.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_murkrow.aif b/sound/direct_sound_samples/cries/cry_murkrow.aif deleted file mode 100644 index 4beddff1e..000000000 Binary files a/sound/direct_sound_samples/cries/cry_murkrow.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_natu.aif b/sound/direct_sound_samples/cries/cry_natu.aif deleted file mode 100644 index e6e38d5cc..000000000 Binary files a/sound/direct_sound_samples/cries/cry_natu.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_nidoking.aif b/sound/direct_sound_samples/cries/cry_nidoking.aif deleted file mode 100644 index a0c86f9ab..000000000 Binary files a/sound/direct_sound_samples/cries/cry_nidoking.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_nidoqueen.aif b/sound/direct_sound_samples/cries/cry_nidoqueen.aif deleted file mode 100644 index 6c8f5254b..000000000 Binary files a/sound/direct_sound_samples/cries/cry_nidoqueen.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_nidoran_f.aif b/sound/direct_sound_samples/cries/cry_nidoran_f.aif deleted file mode 100644 index b7c8a5317..000000000 Binary files a/sound/direct_sound_samples/cries/cry_nidoran_f.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_nidoran_m.aif b/sound/direct_sound_samples/cries/cry_nidoran_m.aif deleted file mode 100644 index 08fc81c8b..000000000 Binary files a/sound/direct_sound_samples/cries/cry_nidoran_m.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_nidorina.aif b/sound/direct_sound_samples/cries/cry_nidorina.aif deleted file mode 100644 index 91e293a50..000000000 Binary files a/sound/direct_sound_samples/cries/cry_nidorina.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_nidorino.aif b/sound/direct_sound_samples/cries/cry_nidorino.aif deleted file mode 100644 index 959351363..000000000 Binary files a/sound/direct_sound_samples/cries/cry_nidorino.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_nincada.aif b/sound/direct_sound_samples/cries/cry_nincada.aif deleted file mode 100644 index 5f96bda50..000000000 Binary files a/sound/direct_sound_samples/cries/cry_nincada.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_ninetales.aif b/sound/direct_sound_samples/cries/cry_ninetales.aif deleted file mode 100644 index 70c8cf528..000000000 Binary files a/sound/direct_sound_samples/cries/cry_ninetales.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_ninjask.aif b/sound/direct_sound_samples/cries/cry_ninjask.aif deleted file mode 100644 index a6f07e8d3..000000000 Binary files a/sound/direct_sound_samples/cries/cry_ninjask.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_noctowl.aif b/sound/direct_sound_samples/cries/cry_noctowl.aif deleted file mode 100644 index fe2e63d45..000000000 Binary files a/sound/direct_sound_samples/cries/cry_noctowl.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_nosepass.aif b/sound/direct_sound_samples/cries/cry_nosepass.aif deleted file mode 100644 index be65ba082..000000000 Binary files a/sound/direct_sound_samples/cries/cry_nosepass.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_abomasnow.aif b/sound/direct_sound_samples/cries/cry_not_abomasnow.aif deleted file mode 100644 index f3636aa9f..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_abomasnow.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_accelgor.aif b/sound/direct_sound_samples/cries/cry_not_accelgor.aif deleted file mode 100644 index ba17f8324..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_accelgor.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_alomomola.aif b/sound/direct_sound_samples/cries/cry_not_alomomola.aif deleted file mode 100644 index 7be08dc8f..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_alomomola.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_ambipom.aif b/sound/direct_sound_samples/cries/cry_not_ambipom.aif deleted file mode 100644 index dd12a4fe5..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_ambipom.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_amoonguss.aif b/sound/direct_sound_samples/cries/cry_not_amoonguss.aif deleted file mode 100644 index 5937da6b6..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_amoonguss.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_arceus.aif b/sound/direct_sound_samples/cries/cry_not_arceus.aif deleted file mode 100644 index 73e954a15..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_arceus.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_archen.aif b/sound/direct_sound_samples/cries/cry_not_archen.aif deleted file mode 100644 index fc0ad6f70..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_archen.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_archeops.aif b/sound/direct_sound_samples/cries/cry_not_archeops.aif deleted file mode 100644 index 5e7477cfc..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_archeops.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_audino.aif b/sound/direct_sound_samples/cries/cry_not_audino.aif deleted file mode 100644 index 3171a5897..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_audino.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_axew.aif b/sound/direct_sound_samples/cries/cry_not_axew.aif deleted file mode 100644 index 86ff0d777..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_axew.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_azelf.aif b/sound/direct_sound_samples/cries/cry_not_azelf.aif deleted file mode 100644 index ff56f124e..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_azelf.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_basculin.aif b/sound/direct_sound_samples/cries/cry_not_basculin.aif deleted file mode 100644 index 890dcb087..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_basculin.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_bastiodon.aif b/sound/direct_sound_samples/cries/cry_not_bastiodon.aif deleted file mode 100644 index dae1da948..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_bastiodon.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_beartic.aif b/sound/direct_sound_samples/cries/cry_not_beartic.aif deleted file mode 100644 index 6c7af0a06..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_beartic.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_beheeyem.aif b/sound/direct_sound_samples/cries/cry_not_beheeyem.aif deleted file mode 100644 index f68986fa1..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_beheeyem.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_bibarel.aif b/sound/direct_sound_samples/cries/cry_not_bibarel.aif deleted file mode 100644 index 860b0ef88..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_bibarel.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_bidoof.aif b/sound/direct_sound_samples/cries/cry_not_bidoof.aif deleted file mode 100644 index 4e0c19c37..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_bidoof.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_bisharp.aif b/sound/direct_sound_samples/cries/cry_not_bisharp.aif deleted file mode 100644 index 54e46d0c8..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_bisharp.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_blitzle.aif b/sound/direct_sound_samples/cries/cry_not_blitzle.aif deleted file mode 100644 index cd81b9c1c..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_blitzle.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_boldore.aif b/sound/direct_sound_samples/cries/cry_not_boldore.aif deleted file mode 100644 index dcd20013d..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_boldore.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_bonsly.aif b/sound/direct_sound_samples/cries/cry_not_bonsly.aif deleted file mode 100644 index b33d2995c..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_bonsly.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_bouffalant.aif b/sound/direct_sound_samples/cries/cry_not_bouffalant.aif deleted file mode 100644 index a6f58e94f..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_bouffalant.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_braviary.aif b/sound/direct_sound_samples/cries/cry_not_braviary.aif deleted file mode 100644 index 6dbfc7daf..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_braviary.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_bronzong.aif b/sound/direct_sound_samples/cries/cry_not_bronzong.aif deleted file mode 100644 index 95e2dd271..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_bronzong.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_bronzor.aif b/sound/direct_sound_samples/cries/cry_not_bronzor.aif deleted file mode 100644 index 479bb3f07..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_bronzor.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_budew.aif b/sound/direct_sound_samples/cries/cry_not_budew.aif deleted file mode 100644 index ddaeb326d..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_budew.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_buizel.aif b/sound/direct_sound_samples/cries/cry_not_buizel.aif deleted file mode 100644 index a0cbab6e1..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_buizel.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_buneary.aif b/sound/direct_sound_samples/cries/cry_not_buneary.aif deleted file mode 100644 index b99ca827f..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_buneary.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_burmy.aif b/sound/direct_sound_samples/cries/cry_not_burmy.aif deleted file mode 100644 index adb0c01f3..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_burmy.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_carnivine.aif b/sound/direct_sound_samples/cries/cry_not_carnivine.aif deleted file mode 100644 index b096ff5c5..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_carnivine.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_carracosta.aif b/sound/direct_sound_samples/cries/cry_not_carracosta.aif deleted file mode 100644 index 03e62be1c..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_carracosta.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_chandelure.aif b/sound/direct_sound_samples/cries/cry_not_chandelure.aif deleted file mode 100644 index 47cc45846..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_chandelure.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_chatot.aif b/sound/direct_sound_samples/cries/cry_not_chatot.aif deleted file mode 100644 index 04c8032ad..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_chatot.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_cherrim.aif b/sound/direct_sound_samples/cries/cry_not_cherrim.aif deleted file mode 100644 index d01e9cb8a..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_cherrim.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_cherubi.aif b/sound/direct_sound_samples/cries/cry_not_cherubi.aif deleted file mode 100644 index b2374506d..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_cherubi.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_chimchar.aif b/sound/direct_sound_samples/cries/cry_not_chimchar.aif deleted file mode 100644 index ba7c8ba3b..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_chimchar.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_chingling.aif b/sound/direct_sound_samples/cries/cry_not_chingling.aif deleted file mode 100644 index cc9e362b3..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_chingling.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_cinccino.aif b/sound/direct_sound_samples/cries/cry_not_cinccino.aif deleted file mode 100644 index 89f2b2f91..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_cinccino.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_cobalion.aif b/sound/direct_sound_samples/cries/cry_not_cobalion.aif deleted file mode 100644 index 1f62055df..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_cobalion.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_cofagrigus.aif b/sound/direct_sound_samples/cries/cry_not_cofagrigus.aif deleted file mode 100644 index 5728ba514..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_cofagrigus.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_combee.aif b/sound/direct_sound_samples/cries/cry_not_combee.aif deleted file mode 100644 index 87dcd6300..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_combee.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_conkeldurr.aif b/sound/direct_sound_samples/cries/cry_not_conkeldurr.aif deleted file mode 100644 index 0e05f8050..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_conkeldurr.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_cranidos.aif b/sound/direct_sound_samples/cries/cry_not_cranidos.aif deleted file mode 100644 index f086e905e..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_cranidos.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_cresselia.aif b/sound/direct_sound_samples/cries/cry_not_cresselia.aif deleted file mode 100644 index e1d26a88b..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_cresselia.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_croagunk.aif b/sound/direct_sound_samples/cries/cry_not_croagunk.aif deleted file mode 100644 index b6eee44b1..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_croagunk.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_crustle.aif b/sound/direct_sound_samples/cries/cry_not_crustle.aif deleted file mode 100644 index 46b8dd573..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_crustle.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_cryogonal.aif b/sound/direct_sound_samples/cries/cry_not_cryogonal.aif deleted file mode 100644 index 6ea0e09ce..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_cryogonal.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_cubchoo.aif b/sound/direct_sound_samples/cries/cry_not_cubchoo.aif deleted file mode 100644 index cd00f2e5b..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_cubchoo.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_darkrai.aif b/sound/direct_sound_samples/cries/cry_not_darkrai.aif deleted file mode 100644 index 448d8e3d0..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_darkrai.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_darmanitan.aif b/sound/direct_sound_samples/cries/cry_not_darmanitan.aif deleted file mode 100644 index f56211b3b..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_darmanitan.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_darumaka.aif b/sound/direct_sound_samples/cries/cry_not_darumaka.aif deleted file mode 100644 index 67a22c3c2..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_darumaka.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_deerling.aif b/sound/direct_sound_samples/cries/cry_not_deerling.aif deleted file mode 100644 index 967e5b66a..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_deerling.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_deino.aif b/sound/direct_sound_samples/cries/cry_not_deino.aif deleted file mode 100644 index d2c3a45e8..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_deino.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_dewott.aif b/sound/direct_sound_samples/cries/cry_not_dewott.aif deleted file mode 100644 index 27884a318..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_dewott.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_dialga.aif b/sound/direct_sound_samples/cries/cry_not_dialga.aif deleted file mode 100644 index d4a59f2c1..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_dialga.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_drapion.aif b/sound/direct_sound_samples/cries/cry_not_drapion.aif deleted file mode 100644 index 9dbf1e0f3..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_drapion.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_drifblim.aif b/sound/direct_sound_samples/cries/cry_not_drifblim.aif deleted file mode 100644 index 5b4bd3ba7..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_drifblim.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_drifloon.aif b/sound/direct_sound_samples/cries/cry_not_drifloon.aif deleted file mode 100644 index ee7b3025e..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_drifloon.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_drilbur.aif b/sound/direct_sound_samples/cries/cry_not_drilbur.aif deleted file mode 100644 index 4c848203b..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_drilbur.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_druddigon.aif b/sound/direct_sound_samples/cries/cry_not_druddigon.aif deleted file mode 100644 index 717cc55fd..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_druddigon.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_ducklett.aif b/sound/direct_sound_samples/cries/cry_not_ducklett.aif deleted file mode 100644 index 2867bd9c4..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_ducklett.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_duosion.aif b/sound/direct_sound_samples/cries/cry_not_duosion.aif deleted file mode 100644 index e861937b8..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_duosion.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_durant.aif b/sound/direct_sound_samples/cries/cry_not_durant.aif deleted file mode 100644 index dfd2a0606..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_durant.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_dusknoir.aif b/sound/direct_sound_samples/cries/cry_not_dusknoir.aif deleted file mode 100644 index 7aa41def7..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_dusknoir.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_dwebble.aif b/sound/direct_sound_samples/cries/cry_not_dwebble.aif deleted file mode 100644 index f27ae9b09..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_dwebble.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_eelektrik.aif b/sound/direct_sound_samples/cries/cry_not_eelektrik.aif deleted file mode 100644 index 7735cdc5c..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_eelektrik.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_eelektross.aif b/sound/direct_sound_samples/cries/cry_not_eelektross.aif deleted file mode 100644 index e5781116f..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_eelektross.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_electivire.aif b/sound/direct_sound_samples/cries/cry_not_electivire.aif deleted file mode 100644 index d12f7a562..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_electivire.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_emboar.aif b/sound/direct_sound_samples/cries/cry_not_emboar.aif deleted file mode 100644 index d698bdf1b..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_emboar.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_emolga.aif b/sound/direct_sound_samples/cries/cry_not_emolga.aif deleted file mode 100644 index c46668806..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_emolga.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_empoleon.aif b/sound/direct_sound_samples/cries/cry_not_empoleon.aif deleted file mode 100644 index 53c4ce07e..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_empoleon.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_escavalier.aif b/sound/direct_sound_samples/cries/cry_not_escavalier.aif deleted file mode 100644 index f485d9951..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_escavalier.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_excadrill.aif b/sound/direct_sound_samples/cries/cry_not_excadrill.aif deleted file mode 100644 index 00f72bad3..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_excadrill.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_ferroseed.aif b/sound/direct_sound_samples/cries/cry_not_ferroseed.aif deleted file mode 100644 index 64fa0400f..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_ferroseed.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_ferrothorn.aif b/sound/direct_sound_samples/cries/cry_not_ferrothorn.aif deleted file mode 100644 index 76615e324..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_ferrothorn.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_finneon.aif b/sound/direct_sound_samples/cries/cry_not_finneon.aif deleted file mode 100644 index cd7315bd7..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_finneon.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_floatzel.aif b/sound/direct_sound_samples/cries/cry_not_floatzel.aif deleted file mode 100644 index 96deaabe1..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_floatzel.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_fraxure.aif b/sound/direct_sound_samples/cries/cry_not_fraxure.aif deleted file mode 100644 index aac4fd441..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_fraxure.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_frillish.aif b/sound/direct_sound_samples/cries/cry_not_frillish.aif deleted file mode 100644 index e61e321b9..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_frillish.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_froslass.aif b/sound/direct_sound_samples/cries/cry_not_froslass.aif deleted file mode 100644 index 79df96b79..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_froslass.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_gabite.aif b/sound/direct_sound_samples/cries/cry_not_gabite.aif deleted file mode 100644 index 5fddfa602..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_gabite.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_gallade.aif b/sound/direct_sound_samples/cries/cry_not_gallade.aif deleted file mode 100644 index 68c8953cd..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_gallade.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_galvantula.aif b/sound/direct_sound_samples/cries/cry_not_galvantula.aif deleted file mode 100644 index fce9ed5e6..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_galvantula.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_garbodor.aif b/sound/direct_sound_samples/cries/cry_not_garbodor.aif deleted file mode 100644 index f7ae8b4f8..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_garbodor.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_garchomp.aif b/sound/direct_sound_samples/cries/cry_not_garchomp.aif deleted file mode 100644 index ba1ea14e0..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_garchomp.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_gastrodon.aif b/sound/direct_sound_samples/cries/cry_not_gastrodon.aif deleted file mode 100644 index 358452be2..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_gastrodon.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_genesect.aif b/sound/direct_sound_samples/cries/cry_not_genesect.aif deleted file mode 100644 index 040fb1df7..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_genesect.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_gible.aif b/sound/direct_sound_samples/cries/cry_not_gible.aif deleted file mode 100644 index 91e2fb6f3..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_gible.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_gigalith.aif b/sound/direct_sound_samples/cries/cry_not_gigalith.aif deleted file mode 100644 index 7f6d07110..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_gigalith.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_giratina.aif b/sound/direct_sound_samples/cries/cry_not_giratina.aif deleted file mode 100644 index 9566e340c..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_giratina.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_glaceon.aif b/sound/direct_sound_samples/cries/cry_not_glaceon.aif deleted file mode 100644 index 3a036f62d..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_glaceon.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_glameow.aif b/sound/direct_sound_samples/cries/cry_not_glameow.aif deleted file mode 100644 index b3dca18c9..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_glameow.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_gliscor.aif b/sound/direct_sound_samples/cries/cry_not_gliscor.aif deleted file mode 100644 index 3f581528a..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_gliscor.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_golett.aif b/sound/direct_sound_samples/cries/cry_not_golett.aif deleted file mode 100644 index d607d18b3..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_golett.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_golurk.aif b/sound/direct_sound_samples/cries/cry_not_golurk.aif deleted file mode 100644 index 389de1db1..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_golurk.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_gothita.aif b/sound/direct_sound_samples/cries/cry_not_gothita.aif deleted file mode 100644 index 4694f7623..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_gothita.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_gothitelle.aif b/sound/direct_sound_samples/cries/cry_not_gothitelle.aif deleted file mode 100644 index 0815938f7..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_gothitelle.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_gothorita.aif b/sound/direct_sound_samples/cries/cry_not_gothorita.aif deleted file mode 100644 index 51ce1f08e..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_gothorita.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_grotle.aif b/sound/direct_sound_samples/cries/cry_not_grotle.aif deleted file mode 100644 index e1016f6b5..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_grotle.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_gurdurr.aif b/sound/direct_sound_samples/cries/cry_not_gurdurr.aif deleted file mode 100644 index 0fc213be1..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_gurdurr.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_happiny.aif b/sound/direct_sound_samples/cries/cry_not_happiny.aif deleted file mode 100644 index e12e8e0f7..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_happiny.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_haxorus.aif b/sound/direct_sound_samples/cries/cry_not_haxorus.aif deleted file mode 100644 index dfd74c428..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_haxorus.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_heatmor.aif b/sound/direct_sound_samples/cries/cry_not_heatmor.aif deleted file mode 100644 index 437e1941e..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_heatmor.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_heatran.aif b/sound/direct_sound_samples/cries/cry_not_heatran.aif deleted file mode 100644 index 58cfc700d..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_heatran.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_herdier.aif b/sound/direct_sound_samples/cries/cry_not_herdier.aif deleted file mode 100644 index 6735f510b..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_herdier.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_hippopotas.aif b/sound/direct_sound_samples/cries/cry_not_hippopotas.aif deleted file mode 100644 index 9dfdf6f01..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_hippopotas.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_hippowdon.aif b/sound/direct_sound_samples/cries/cry_not_hippowdon.aif deleted file mode 100644 index 920e65d19..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_hippowdon.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_honchkrow.aif b/sound/direct_sound_samples/cries/cry_not_honchkrow.aif deleted file mode 100644 index e75971738..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_honchkrow.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_hydreigon.aif b/sound/direct_sound_samples/cries/cry_not_hydreigon.aif deleted file mode 100644 index dfe698898..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_hydreigon.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_infernape.aif b/sound/direct_sound_samples/cries/cry_not_infernape.aif deleted file mode 100644 index 32cca05df..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_infernape.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_jellicent.aif b/sound/direct_sound_samples/cries/cry_not_jellicent.aif deleted file mode 100644 index 4bdd94073..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_jellicent.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_joltik.aif b/sound/direct_sound_samples/cries/cry_not_joltik.aif deleted file mode 100644 index 6ca339e80..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_joltik.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_karrablast.aif b/sound/direct_sound_samples/cries/cry_not_karrablast.aif deleted file mode 100644 index cf19777f1..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_karrablast.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_klang.aif b/sound/direct_sound_samples/cries/cry_not_klang.aif deleted file mode 100644 index 96d9acf23..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_klang.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_klink.aif b/sound/direct_sound_samples/cries/cry_not_klink.aif deleted file mode 100644 index 7ba2385e1..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_klink.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_klinklang.aif b/sound/direct_sound_samples/cries/cry_not_klinklang.aif deleted file mode 100644 index c0dcb1ba8..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_klinklang.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_kricketot.aif b/sound/direct_sound_samples/cries/cry_not_kricketot.aif deleted file mode 100644 index e0468fcb7..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_kricketot.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_kricketune.aif b/sound/direct_sound_samples/cries/cry_not_kricketune.aif deleted file mode 100644 index 0394a092e..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_kricketune.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_krokorok.aif b/sound/direct_sound_samples/cries/cry_not_krokorok.aif deleted file mode 100644 index 5550164db..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_krokorok.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_krookodile.aif b/sound/direct_sound_samples/cries/cry_not_krookodile.aif deleted file mode 100644 index 8f691b6dc..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_krookodile.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_kyurem.aif b/sound/direct_sound_samples/cries/cry_not_kyurem.aif deleted file mode 100644 index 5a9ca2ad6..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_kyurem.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_kyurem_black.aif b/sound/direct_sound_samples/cries/cry_not_kyurem_black.aif deleted file mode 100644 index 83b0ee8cd..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_kyurem_black.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_kyurem_white.aif b/sound/direct_sound_samples/cries/cry_not_kyurem_white.aif deleted file mode 100644 index 8bfa10c33..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_kyurem_white.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_lampent.aif b/sound/direct_sound_samples/cries/cry_not_lampent.aif deleted file mode 100644 index 7822103f6..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_lampent.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_landorus.aif b/sound/direct_sound_samples/cries/cry_not_landorus.aif deleted file mode 100644 index 71b2b444b..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_landorus.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_landorus_therian.aif b/sound/direct_sound_samples/cries/cry_not_landorus_therian.aif deleted file mode 100644 index f10fe1dd2..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_landorus_therian.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_larvesta.aif b/sound/direct_sound_samples/cries/cry_not_larvesta.aif deleted file mode 100644 index 3de9775ec..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_larvesta.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_leafeon.aif b/sound/direct_sound_samples/cries/cry_not_leafeon.aif deleted file mode 100644 index 142b764db..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_leafeon.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_leavanny.aif b/sound/direct_sound_samples/cries/cry_not_leavanny.aif deleted file mode 100644 index f497b97f8..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_leavanny.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_lickilicky.aif b/sound/direct_sound_samples/cries/cry_not_lickilicky.aif deleted file mode 100644 index 0d733e46d..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_lickilicky.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_liepard.aif b/sound/direct_sound_samples/cries/cry_not_liepard.aif deleted file mode 100644 index 19abf6616..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_liepard.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_lilligant.aif b/sound/direct_sound_samples/cries/cry_not_lilligant.aif deleted file mode 100644 index db39d0564..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_lilligant.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_lillipup.aif b/sound/direct_sound_samples/cries/cry_not_lillipup.aif deleted file mode 100644 index b134ceb26..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_lillipup.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_litwick.aif b/sound/direct_sound_samples/cries/cry_not_litwick.aif deleted file mode 100644 index adec2b8b4..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_litwick.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_lopunny.aif b/sound/direct_sound_samples/cries/cry_not_lopunny.aif deleted file mode 100644 index deb741af7..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_lopunny.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_lucario.aif b/sound/direct_sound_samples/cries/cry_not_lucario.aif deleted file mode 100644 index cf0dd51e2..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_lucario.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_lumineon.aif b/sound/direct_sound_samples/cries/cry_not_lumineon.aif deleted file mode 100644 index c567a5ae9..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_lumineon.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_luxio.aif b/sound/direct_sound_samples/cries/cry_not_luxio.aif deleted file mode 100644 index 4c8db4b01..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_luxio.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_luxray.aif b/sound/direct_sound_samples/cries/cry_not_luxray.aif deleted file mode 100644 index 4103d69d9..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_luxray.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_magmortar.aif b/sound/direct_sound_samples/cries/cry_not_magmortar.aif deleted file mode 100644 index d2c8b371d..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_magmortar.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_magnezone.aif b/sound/direct_sound_samples/cries/cry_not_magnezone.aif deleted file mode 100644 index e8c0a8703..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_magnezone.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_mamoswine.aif b/sound/direct_sound_samples/cries/cry_not_mamoswine.aif deleted file mode 100644 index ba857b2c5..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_mamoswine.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_manaphy.aif b/sound/direct_sound_samples/cries/cry_not_manaphy.aif deleted file mode 100644 index c32be47f8..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_manaphy.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_mandibuzz.aif b/sound/direct_sound_samples/cries/cry_not_mandibuzz.aif deleted file mode 100644 index c319fbef9..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_mandibuzz.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_mantyke.aif b/sound/direct_sound_samples/cries/cry_not_mantyke.aif deleted file mode 100644 index 20392f74d..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_mantyke.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_maractus.aif b/sound/direct_sound_samples/cries/cry_not_maractus.aif deleted file mode 100644 index 8957b9c0d..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_maractus.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_mega_aggron.aiff b/sound/direct_sound_samples/cries/cry_not_mega_aggron.aiff deleted file mode 100644 index b80b7fb69..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_mega_aggron.aiff and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_meloetta.aif b/sound/direct_sound_samples/cries/cry_not_meloetta.aif deleted file mode 100644 index b7571b4e6..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_meloetta.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_mesprit.aif b/sound/direct_sound_samples/cries/cry_not_mesprit.aif deleted file mode 100644 index fc073b203..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_mesprit.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_mienfoo.aif b/sound/direct_sound_samples/cries/cry_not_mienfoo.aif deleted file mode 100644 index 336e56c01..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_mienfoo.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_mienshao.aif b/sound/direct_sound_samples/cries/cry_not_mienshao.aif deleted file mode 100644 index fd1955e2e..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_mienshao.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_mimejr.aif b/sound/direct_sound_samples/cries/cry_not_mimejr.aif deleted file mode 100644 index 16ecd469d..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_mimejr.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_minccino.aif b/sound/direct_sound_samples/cries/cry_not_minccino.aif deleted file mode 100644 index 5d5f04c05..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_minccino.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_mismagius.aif b/sound/direct_sound_samples/cries/cry_not_mismagius.aif deleted file mode 100644 index 91e8810b6..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_mismagius.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_monferno.aif b/sound/direct_sound_samples/cries/cry_not_monferno.aif deleted file mode 100644 index 8747557df..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_monferno.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_mothim.aif b/sound/direct_sound_samples/cries/cry_not_mothim.aif deleted file mode 100644 index 1fedf0148..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_mothim.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_munchlax.aif b/sound/direct_sound_samples/cries/cry_not_munchlax.aif deleted file mode 100644 index 36823b8ee..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_munchlax.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_munna.aif b/sound/direct_sound_samples/cries/cry_not_munna.aif deleted file mode 100644 index 91d250a50..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_munna.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_musharna.aif b/sound/direct_sound_samples/cries/cry_not_musharna.aif deleted file mode 100644 index 00ad3987c..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_musharna.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_oshawott.aif b/sound/direct_sound_samples/cries/cry_not_oshawott.aif deleted file mode 100644 index 195bc3715..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_oshawott.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_pachirisu.aif b/sound/direct_sound_samples/cries/cry_not_pachirisu.aif deleted file mode 100644 index 5fa77ff92..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_pachirisu.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_palkia.aif b/sound/direct_sound_samples/cries/cry_not_palkia.aif deleted file mode 100644 index 01f130f2c..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_palkia.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_palpitoad.aif b/sound/direct_sound_samples/cries/cry_not_palpitoad.aif deleted file mode 100644 index 88d66df2b..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_palpitoad.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_panpour.aif b/sound/direct_sound_samples/cries/cry_not_panpour.aif deleted file mode 100644 index 6d9ec5955..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_panpour.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_pansage.aif b/sound/direct_sound_samples/cries/cry_not_pansage.aif deleted file mode 100644 index 0ce8d1e41..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_pansage.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_pansear.aif b/sound/direct_sound_samples/cries/cry_not_pansear.aif deleted file mode 100644 index e05cd3c0d..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_pansear.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_patrat.aif b/sound/direct_sound_samples/cries/cry_not_patrat.aif deleted file mode 100644 index e7fe9dca4..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_patrat.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_pawniard.aif b/sound/direct_sound_samples/cries/cry_not_pawniard.aif deleted file mode 100644 index de2e461c8..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_pawniard.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_petilil.aif b/sound/direct_sound_samples/cries/cry_not_petilil.aif deleted file mode 100644 index 5dac3f940..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_petilil.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_phione.aif b/sound/direct_sound_samples/cries/cry_not_phione.aif deleted file mode 100644 index d36ba9bff..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_phione.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_pidove.aif b/sound/direct_sound_samples/cries/cry_not_pidove.aif deleted file mode 100644 index ac12816d3..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_pidove.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_pignite.aif b/sound/direct_sound_samples/cries/cry_not_pignite.aif deleted file mode 100644 index 3bacaae2f..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_pignite.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_piplup.aif b/sound/direct_sound_samples/cries/cry_not_piplup.aif deleted file mode 100644 index 0fb595361..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_piplup.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_porygonZ.aif b/sound/direct_sound_samples/cries/cry_not_porygonZ.aif deleted file mode 100644 index 24ac4b665..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_porygonZ.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_prinplup.aif b/sound/direct_sound_samples/cries/cry_not_prinplup.aif deleted file mode 100644 index a07f1b69c..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_prinplup.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_probopass.aif b/sound/direct_sound_samples/cries/cry_not_probopass.aif deleted file mode 100644 index bad3fa291..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_probopass.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_purrloin.aif b/sound/direct_sound_samples/cries/cry_not_purrloin.aif deleted file mode 100644 index 556a183cc..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_purrloin.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_purugly.aif b/sound/direct_sound_samples/cries/cry_not_purugly.aif deleted file mode 100644 index 43df31105..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_purugly.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_rampardos.aif b/sound/direct_sound_samples/cries/cry_not_rampardos.aif deleted file mode 100644 index 9f60a05e0..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_rampardos.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_regigigas.aif b/sound/direct_sound_samples/cries/cry_not_regigigas.aif deleted file mode 100644 index d55c71860..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_regigigas.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_reshiram.aif b/sound/direct_sound_samples/cries/cry_not_reshiram.aif deleted file mode 100644 index 9fae57a03..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_reshiram.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_reuniclus.aif b/sound/direct_sound_samples/cries/cry_not_reuniclus.aif deleted file mode 100644 index bd15d6df0..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_reuniclus.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_rhyperior.aif b/sound/direct_sound_samples/cries/cry_not_rhyperior.aif deleted file mode 100644 index 6c227b3d9..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_rhyperior.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_riolu.aif b/sound/direct_sound_samples/cries/cry_not_riolu.aif deleted file mode 100644 index c9851440a..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_riolu.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_roggenrola.aif b/sound/direct_sound_samples/cries/cry_not_roggenrola.aif deleted file mode 100644 index eaaa9adba..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_roggenrola.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_roserade.aif b/sound/direct_sound_samples/cries/cry_not_roserade.aif deleted file mode 100644 index de25b13c4..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_roserade.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_rotom.aif b/sound/direct_sound_samples/cries/cry_not_rotom.aif deleted file mode 100644 index 730ae2f79..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_rotom.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_rufflet.aif b/sound/direct_sound_samples/cries/cry_not_rufflet.aif deleted file mode 100644 index a4a0004be..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_rufflet.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_samurott.aif b/sound/direct_sound_samples/cries/cry_not_samurott.aif deleted file mode 100644 index 166d3f66f..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_samurott.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_sandile.aif b/sound/direct_sound_samples/cries/cry_not_sandile.aif deleted file mode 100644 index ff2ece02f..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_sandile.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_sawk.aif b/sound/direct_sound_samples/cries/cry_not_sawk.aif deleted file mode 100644 index 8ce69bbb7..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_sawk.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_sawsbuck.aif b/sound/direct_sound_samples/cries/cry_not_sawsbuck.aif deleted file mode 100644 index 83bdff565..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_sawsbuck.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_scolipede.aif b/sound/direct_sound_samples/cries/cry_not_scolipede.aif deleted file mode 100644 index 6d146817d..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_scolipede.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_scrafty.aif b/sound/direct_sound_samples/cries/cry_not_scrafty.aif deleted file mode 100644 index 013ff5923..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_scrafty.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_scraggy.aif b/sound/direct_sound_samples/cries/cry_not_scraggy.aif deleted file mode 100644 index ddae5349f..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_scraggy.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_seismitoad.aif b/sound/direct_sound_samples/cries/cry_not_seismitoad.aif deleted file mode 100644 index e195cd9a1..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_seismitoad.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_serperior.aif b/sound/direct_sound_samples/cries/cry_not_serperior.aif deleted file mode 100644 index 6eaa200c1..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_serperior.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_servine.aif b/sound/direct_sound_samples/cries/cry_not_servine.aif deleted file mode 100644 index a2ae593c3..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_servine.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_sewaddle.aif b/sound/direct_sound_samples/cries/cry_not_sewaddle.aif deleted file mode 100644 index 92890b46e..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_sewaddle.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_shaymin.aif b/sound/direct_sound_samples/cries/cry_not_shaymin.aif deleted file mode 100644 index 6339c75a1..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_shaymin.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_shaymin_sky.aif b/sound/direct_sound_samples/cries/cry_not_shaymin_sky.aif deleted file mode 100644 index 8b2ad38e1..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_shaymin_sky.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_shellos.aif b/sound/direct_sound_samples/cries/cry_not_shellos.aif deleted file mode 100644 index 4f7912574..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_shellos.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_shieldon.aif b/sound/direct_sound_samples/cries/cry_not_shieldon.aif deleted file mode 100644 index fdce76890..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_shieldon.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_shinx.aif b/sound/direct_sound_samples/cries/cry_not_shinx.aif deleted file mode 100644 index 11d665942..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_shinx.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_sigilyph.aif b/sound/direct_sound_samples/cries/cry_not_sigilyph.aif deleted file mode 100644 index 129debe75..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_sigilyph.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_simipour.aif b/sound/direct_sound_samples/cries/cry_not_simipour.aif deleted file mode 100644 index 840dc85e9..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_simipour.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_simisage.aif b/sound/direct_sound_samples/cries/cry_not_simisage.aif deleted file mode 100644 index c10a79966..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_simisage.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_simisear.aif b/sound/direct_sound_samples/cries/cry_not_simisear.aif deleted file mode 100644 index 6cf7856c9..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_simisear.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_skorupi.aif b/sound/direct_sound_samples/cries/cry_not_skorupi.aif deleted file mode 100644 index 5a8b2109c..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_skorupi.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_skuntank.aif b/sound/direct_sound_samples/cries/cry_not_skuntank.aif deleted file mode 100644 index 2a3ef85e0..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_skuntank.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_snivy.aif b/sound/direct_sound_samples/cries/cry_not_snivy.aif deleted file mode 100644 index 6a64c250c..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_snivy.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_snover.aif b/sound/direct_sound_samples/cries/cry_not_snover.aif deleted file mode 100644 index d8e1fe68b..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_snover.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_solosis.aif b/sound/direct_sound_samples/cries/cry_not_solosis.aif deleted file mode 100644 index 5817467c1..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_solosis.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_spiritomb.aif b/sound/direct_sound_samples/cries/cry_not_spiritomb.aif deleted file mode 100644 index e15a4a6c0..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_spiritomb.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_staraptor.aif b/sound/direct_sound_samples/cries/cry_not_staraptor.aif deleted file mode 100644 index c9e0d5110..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_staraptor.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_staravia.aif b/sound/direct_sound_samples/cries/cry_not_staravia.aif deleted file mode 100644 index 1e38f09fe..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_staravia.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_starly.aif b/sound/direct_sound_samples/cries/cry_not_starly.aif deleted file mode 100644 index cb034ce65..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_starly.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_stoutland.aif b/sound/direct_sound_samples/cries/cry_not_stoutland.aif deleted file mode 100644 index 41e29c7e2..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_stoutland.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_stunfisk.aif b/sound/direct_sound_samples/cries/cry_not_stunfisk.aif deleted file mode 100644 index b0e193519..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_stunfisk.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_stunky.aif b/sound/direct_sound_samples/cries/cry_not_stunky.aif deleted file mode 100644 index 7a99108aa..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_stunky.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_swadloon.aif b/sound/direct_sound_samples/cries/cry_not_swadloon.aif deleted file mode 100644 index 65e3ca7a1..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_swadloon.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_swanna.aif b/sound/direct_sound_samples/cries/cry_not_swanna.aif deleted file mode 100644 index 2bd72e615..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_swanna.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_tangrowth.aif b/sound/direct_sound_samples/cries/cry_not_tangrowth.aif deleted file mode 100644 index 4e425f652..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_tangrowth.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_tepig.aif b/sound/direct_sound_samples/cries/cry_not_tepig.aif deleted file mode 100644 index bda1c3b41..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_tepig.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_terrakion.aif b/sound/direct_sound_samples/cries/cry_not_terrakion.aif deleted file mode 100644 index 31fb8fa87..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_terrakion.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_throh.aif b/sound/direct_sound_samples/cries/cry_not_throh.aif deleted file mode 100644 index b6cf0526d..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_throh.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_thundurus.aif b/sound/direct_sound_samples/cries/cry_not_thundurus.aif deleted file mode 100644 index 257329236..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_thundurus.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_thundurus_therian.aif b/sound/direct_sound_samples/cries/cry_not_thundurus_therian.aif deleted file mode 100644 index 8beb2c074..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_thundurus_therian.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_timburr.aif b/sound/direct_sound_samples/cries/cry_not_timburr.aif deleted file mode 100644 index e762e01df..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_timburr.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_tirtouga.aif b/sound/direct_sound_samples/cries/cry_not_tirtouga.aif deleted file mode 100644 index d8e3b40e8..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_tirtouga.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_togekiss.aif b/sound/direct_sound_samples/cries/cry_not_togekiss.aif deleted file mode 100644 index 4ddb5d898..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_togekiss.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_tornadus.aif b/sound/direct_sound_samples/cries/cry_not_tornadus.aif deleted file mode 100644 index 5bf5b4c97..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_tornadus.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_tornadus_therian.aif b/sound/direct_sound_samples/cries/cry_not_tornadus_therian.aif deleted file mode 100644 index 9a4649037..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_tornadus_therian.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_torterra.aif b/sound/direct_sound_samples/cries/cry_not_torterra.aif deleted file mode 100644 index 868780090..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_torterra.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_toxicroak.aif b/sound/direct_sound_samples/cries/cry_not_toxicroak.aif deleted file mode 100644 index 46530915a..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_toxicroak.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_tranquill.aif b/sound/direct_sound_samples/cries/cry_not_tranquill.aif deleted file mode 100644 index 07722aa1d..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_tranquill.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_trubbish.aif b/sound/direct_sound_samples/cries/cry_not_trubbish.aif deleted file mode 100644 index 5d257d863..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_trubbish.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_turtwig.aif b/sound/direct_sound_samples/cries/cry_not_turtwig.aif deleted file mode 100644 index 97c632278..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_turtwig.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_tympole.aif b/sound/direct_sound_samples/cries/cry_not_tympole.aif deleted file mode 100644 index 2d51a776a..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_tympole.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_tynamo.aif b/sound/direct_sound_samples/cries/cry_not_tynamo.aif deleted file mode 100644 index 4917bd3cc..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_tynamo.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_unfezant.aif b/sound/direct_sound_samples/cries/cry_not_unfezant.aif deleted file mode 100644 index 158a82865..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_unfezant.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_uxie.aif b/sound/direct_sound_samples/cries/cry_not_uxie.aif deleted file mode 100644 index cdc22c177..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_uxie.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_vanillish.aif b/sound/direct_sound_samples/cries/cry_not_vanillish.aif deleted file mode 100644 index 804b4c7b1..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_vanillish.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_vanillite.aif b/sound/direct_sound_samples/cries/cry_not_vanillite.aif deleted file mode 100644 index 0e646438d..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_vanillite.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_vanilluxe.aif b/sound/direct_sound_samples/cries/cry_not_vanilluxe.aif deleted file mode 100644 index ea84c62cc..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_vanilluxe.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_venipede.aif b/sound/direct_sound_samples/cries/cry_not_venipede.aif deleted file mode 100644 index d4cb3dd7a..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_venipede.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_vespiquen.aif b/sound/direct_sound_samples/cries/cry_not_vespiquen.aif deleted file mode 100644 index 83bb953d9..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_vespiquen.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_victini.aif b/sound/direct_sound_samples/cries/cry_not_victini.aif deleted file mode 100644 index a9d36b70a..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_victini.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_virizion.aif b/sound/direct_sound_samples/cries/cry_not_virizion.aif deleted file mode 100644 index 9368269c8..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_virizion.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_volcarona.aif b/sound/direct_sound_samples/cries/cry_not_volcarona.aif deleted file mode 100644 index 4ccb17842..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_volcarona.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_vullaby.aif b/sound/direct_sound_samples/cries/cry_not_vullaby.aif deleted file mode 100644 index 7284ef5b3..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_vullaby.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_watchog.aif b/sound/direct_sound_samples/cries/cry_not_watchog.aif deleted file mode 100644 index 45f6984b3..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_watchog.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_weavile.aif b/sound/direct_sound_samples/cries/cry_not_weavile.aif deleted file mode 100644 index 1823c7d9e..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_weavile.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_whimsicott.aif b/sound/direct_sound_samples/cries/cry_not_whimsicott.aif deleted file mode 100644 index 8f837b521..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_whimsicott.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_whirlipede.aif b/sound/direct_sound_samples/cries/cry_not_whirlipede.aif deleted file mode 100644 index c38a67093..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_whirlipede.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_woobat.aif b/sound/direct_sound_samples/cries/cry_not_woobat.aif deleted file mode 100644 index 02f8885ae..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_woobat.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_wormadam.aif b/sound/direct_sound_samples/cries/cry_not_wormadam.aif deleted file mode 100644 index f0fbd5ac5..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_wormadam.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_yanmega.aif b/sound/direct_sound_samples/cries/cry_not_yanmega.aif deleted file mode 100644 index 8242e72c0..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_yanmega.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_zebstrika.aif b/sound/direct_sound_samples/cries/cry_not_zebstrika.aif deleted file mode 100644 index 80e278c09..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_zebstrika.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_zekrom.aif b/sound/direct_sound_samples/cries/cry_not_zekrom.aif deleted file mode 100644 index d4e0cd346..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_zekrom.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_zoroark.aif b/sound/direct_sound_samples/cries/cry_not_zoroark.aif deleted file mode 100644 index c6e689731..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_zoroark.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_zorua.aif b/sound/direct_sound_samples/cries/cry_not_zorua.aif deleted file mode 100644 index 165257242..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_zorua.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_not_zweilous.aif b/sound/direct_sound_samples/cries/cry_not_zweilous.aif deleted file mode 100644 index 66cb04fa0..000000000 Binary files a/sound/direct_sound_samples/cries/cry_not_zweilous.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_numel.aif b/sound/direct_sound_samples/cries/cry_numel.aif deleted file mode 100644 index 55cce5f2c..000000000 Binary files a/sound/direct_sound_samples/cries/cry_numel.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_nuzleaf.aif b/sound/direct_sound_samples/cries/cry_nuzleaf.aif deleted file mode 100644 index d668f3fd3..000000000 Binary files a/sound/direct_sound_samples/cries/cry_nuzleaf.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_octillery.aif b/sound/direct_sound_samples/cries/cry_octillery.aif deleted file mode 100644 index 75ee28ceb..000000000 Binary files a/sound/direct_sound_samples/cries/cry_octillery.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_oddish.aif b/sound/direct_sound_samples/cries/cry_oddish.aif deleted file mode 100644 index 6909a8dad..000000000 Binary files a/sound/direct_sound_samples/cries/cry_oddish.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_omanyte.aif b/sound/direct_sound_samples/cries/cry_omanyte.aif deleted file mode 100644 index 15ec2d1ef..000000000 Binary files a/sound/direct_sound_samples/cries/cry_omanyte.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_omastar.aif b/sound/direct_sound_samples/cries/cry_omastar.aif deleted file mode 100644 index e67d5d7fc..000000000 Binary files a/sound/direct_sound_samples/cries/cry_omastar.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_onix.aif b/sound/direct_sound_samples/cries/cry_onix.aif deleted file mode 100644 index aa8a16505..000000000 Binary files a/sound/direct_sound_samples/cries/cry_onix.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_paras.aif b/sound/direct_sound_samples/cries/cry_paras.aif deleted file mode 100644 index f9d69c21c..000000000 Binary files a/sound/direct_sound_samples/cries/cry_paras.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_parasect.aif b/sound/direct_sound_samples/cries/cry_parasect.aif deleted file mode 100644 index d6d9433e9..000000000 Binary files a/sound/direct_sound_samples/cries/cry_parasect.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_pelipper.aif b/sound/direct_sound_samples/cries/cry_pelipper.aif deleted file mode 100644 index 26718f848..000000000 Binary files a/sound/direct_sound_samples/cries/cry_pelipper.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_persian.aif b/sound/direct_sound_samples/cries/cry_persian.aif deleted file mode 100644 index 40b3a2c56..000000000 Binary files a/sound/direct_sound_samples/cries/cry_persian.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_phanpy.aif b/sound/direct_sound_samples/cries/cry_phanpy.aif deleted file mode 100644 index 2fcab3c82..000000000 Binary files a/sound/direct_sound_samples/cries/cry_phanpy.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_pichu.aif b/sound/direct_sound_samples/cries/cry_pichu.aif deleted file mode 100644 index de47bbab8..000000000 Binary files a/sound/direct_sound_samples/cries/cry_pichu.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_pidgeot.aif b/sound/direct_sound_samples/cries/cry_pidgeot.aif deleted file mode 100644 index af400cdc6..000000000 Binary files a/sound/direct_sound_samples/cries/cry_pidgeot.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_pidgeotto.aif b/sound/direct_sound_samples/cries/cry_pidgeotto.aif deleted file mode 100644 index 7c71c8f3e..000000000 Binary files a/sound/direct_sound_samples/cries/cry_pidgeotto.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_pidgey.aif b/sound/direct_sound_samples/cries/cry_pidgey.aif deleted file mode 100644 index b9c3a5d2a..000000000 Binary files a/sound/direct_sound_samples/cries/cry_pidgey.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_pikachu.aif b/sound/direct_sound_samples/cries/cry_pikachu.aif deleted file mode 100644 index 690bf5e1d..000000000 Binary files a/sound/direct_sound_samples/cries/cry_pikachu.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_piloswine.aif b/sound/direct_sound_samples/cries/cry_piloswine.aif deleted file mode 100644 index b1f34d3b5..000000000 Binary files a/sound/direct_sound_samples/cries/cry_piloswine.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_pineco.aif b/sound/direct_sound_samples/cries/cry_pineco.aif deleted file mode 100644 index 80292bda0..000000000 Binary files a/sound/direct_sound_samples/cries/cry_pineco.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_pinsir.aif b/sound/direct_sound_samples/cries/cry_pinsir.aif deleted file mode 100644 index cf27a11de..000000000 Binary files a/sound/direct_sound_samples/cries/cry_pinsir.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_plusle.aif b/sound/direct_sound_samples/cries/cry_plusle.aif deleted file mode 100644 index d68984263..000000000 Binary files a/sound/direct_sound_samples/cries/cry_plusle.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_politoed.aif b/sound/direct_sound_samples/cries/cry_politoed.aif deleted file mode 100644 index 38b1883b4..000000000 Binary files a/sound/direct_sound_samples/cries/cry_politoed.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_poliwag.aif b/sound/direct_sound_samples/cries/cry_poliwag.aif deleted file mode 100644 index 8467f0540..000000000 Binary files a/sound/direct_sound_samples/cries/cry_poliwag.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_poliwhirl.aif b/sound/direct_sound_samples/cries/cry_poliwhirl.aif deleted file mode 100644 index f0851c693..000000000 Binary files a/sound/direct_sound_samples/cries/cry_poliwhirl.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_poliwrath.aif b/sound/direct_sound_samples/cries/cry_poliwrath.aif deleted file mode 100644 index 8d19f1d86..000000000 Binary files a/sound/direct_sound_samples/cries/cry_poliwrath.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_ponyta.aif b/sound/direct_sound_samples/cries/cry_ponyta.aif deleted file mode 100644 index 46feb123d..000000000 Binary files a/sound/direct_sound_samples/cries/cry_ponyta.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_poochyena.aif b/sound/direct_sound_samples/cries/cry_poochyena.aif deleted file mode 100644 index 3b464ce13..000000000 Binary files a/sound/direct_sound_samples/cries/cry_poochyena.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_porygon.aif b/sound/direct_sound_samples/cries/cry_porygon.aif deleted file mode 100644 index ced70b379..000000000 Binary files a/sound/direct_sound_samples/cries/cry_porygon.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_porygon2.aif b/sound/direct_sound_samples/cries/cry_porygon2.aif deleted file mode 100644 index c08a3caaf..000000000 Binary files a/sound/direct_sound_samples/cries/cry_porygon2.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_primeape.aif b/sound/direct_sound_samples/cries/cry_primeape.aif deleted file mode 100644 index a868b3120..000000000 Binary files a/sound/direct_sound_samples/cries/cry_primeape.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_psyduck.aif b/sound/direct_sound_samples/cries/cry_psyduck.aif deleted file mode 100644 index d2d0612f2..000000000 Binary files a/sound/direct_sound_samples/cries/cry_psyduck.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_pupitar.aif b/sound/direct_sound_samples/cries/cry_pupitar.aif deleted file mode 100644 index 7386636ce..000000000 Binary files a/sound/direct_sound_samples/cries/cry_pupitar.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_quagsire.aif b/sound/direct_sound_samples/cries/cry_quagsire.aif deleted file mode 100644 index 1953d0e42..000000000 Binary files a/sound/direct_sound_samples/cries/cry_quagsire.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_quilava.aif b/sound/direct_sound_samples/cries/cry_quilava.aif deleted file mode 100644 index efe873229..000000000 Binary files a/sound/direct_sound_samples/cries/cry_quilava.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_qwilfish.aif b/sound/direct_sound_samples/cries/cry_qwilfish.aif deleted file mode 100644 index 268c5c89d..000000000 Binary files a/sound/direct_sound_samples/cries/cry_qwilfish.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_raichu.aif b/sound/direct_sound_samples/cries/cry_raichu.aif deleted file mode 100644 index e59ffbad4..000000000 Binary files a/sound/direct_sound_samples/cries/cry_raichu.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_raikou.aif b/sound/direct_sound_samples/cries/cry_raikou.aif deleted file mode 100644 index a57a2365c..000000000 Binary files a/sound/direct_sound_samples/cries/cry_raikou.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_ralts.aif b/sound/direct_sound_samples/cries/cry_ralts.aif deleted file mode 100644 index 0baef5760..000000000 Binary files a/sound/direct_sound_samples/cries/cry_ralts.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_rapidash.aif b/sound/direct_sound_samples/cries/cry_rapidash.aif deleted file mode 100644 index 920f510e4..000000000 Binary files a/sound/direct_sound_samples/cries/cry_rapidash.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_raticate.aif b/sound/direct_sound_samples/cries/cry_raticate.aif deleted file mode 100644 index 01601cab5..000000000 Binary files a/sound/direct_sound_samples/cries/cry_raticate.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_rattata.aif b/sound/direct_sound_samples/cries/cry_rattata.aif deleted file mode 100644 index cb0e1f422..000000000 Binary files a/sound/direct_sound_samples/cries/cry_rattata.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_rayquaza.aif b/sound/direct_sound_samples/cries/cry_rayquaza.aif deleted file mode 100644 index 6115e11d8..000000000 Binary files a/sound/direct_sound_samples/cries/cry_rayquaza.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_regice.aif b/sound/direct_sound_samples/cries/cry_regice.aif deleted file mode 100644 index 6fa23dd73..000000000 Binary files a/sound/direct_sound_samples/cries/cry_regice.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_regirock.aif b/sound/direct_sound_samples/cries/cry_regirock.aif deleted file mode 100644 index ab2a47eb8..000000000 Binary files a/sound/direct_sound_samples/cries/cry_regirock.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_registeel.aif b/sound/direct_sound_samples/cries/cry_registeel.aif deleted file mode 100644 index f5374e5f0..000000000 Binary files a/sound/direct_sound_samples/cries/cry_registeel.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_relicanth.aif b/sound/direct_sound_samples/cries/cry_relicanth.aif deleted file mode 100644 index 60af9cf4e..000000000 Binary files a/sound/direct_sound_samples/cries/cry_relicanth.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_remoraid.aif b/sound/direct_sound_samples/cries/cry_remoraid.aif deleted file mode 100644 index 16d3f1d65..000000000 Binary files a/sound/direct_sound_samples/cries/cry_remoraid.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_rhydon.aif b/sound/direct_sound_samples/cries/cry_rhydon.aif deleted file mode 100644 index cfa709ee9..000000000 Binary files a/sound/direct_sound_samples/cries/cry_rhydon.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_rhyhorn.aif b/sound/direct_sound_samples/cries/cry_rhyhorn.aif deleted file mode 100644 index 47f344ba2..000000000 Binary files a/sound/direct_sound_samples/cries/cry_rhyhorn.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_roselia.aif b/sound/direct_sound_samples/cries/cry_roselia.aif deleted file mode 100644 index 50b60b77b..000000000 Binary files a/sound/direct_sound_samples/cries/cry_roselia.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_sableye.aif b/sound/direct_sound_samples/cries/cry_sableye.aif deleted file mode 100644 index 1b3a9be30..000000000 Binary files a/sound/direct_sound_samples/cries/cry_sableye.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_salamence.aif b/sound/direct_sound_samples/cries/cry_salamence.aif deleted file mode 100644 index d2957809c..000000000 Binary files a/sound/direct_sound_samples/cries/cry_salamence.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_sandshrew.aif b/sound/direct_sound_samples/cries/cry_sandshrew.aif deleted file mode 100644 index 6879be11d..000000000 Binary files a/sound/direct_sound_samples/cries/cry_sandshrew.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_sandslash.aif b/sound/direct_sound_samples/cries/cry_sandslash.aif deleted file mode 100644 index ee4a458ed..000000000 Binary files a/sound/direct_sound_samples/cries/cry_sandslash.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_sceptile.aif b/sound/direct_sound_samples/cries/cry_sceptile.aif deleted file mode 100644 index 7252cb85f..000000000 Binary files a/sound/direct_sound_samples/cries/cry_sceptile.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_scizor.aif b/sound/direct_sound_samples/cries/cry_scizor.aif deleted file mode 100644 index f1f7832ce..000000000 Binary files a/sound/direct_sound_samples/cries/cry_scizor.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_scyther.aif b/sound/direct_sound_samples/cries/cry_scyther.aif deleted file mode 100644 index 2b8cbc104..000000000 Binary files a/sound/direct_sound_samples/cries/cry_scyther.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_seadra.aif b/sound/direct_sound_samples/cries/cry_seadra.aif deleted file mode 100644 index 2f60cce4a..000000000 Binary files a/sound/direct_sound_samples/cries/cry_seadra.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_seaking.aif b/sound/direct_sound_samples/cries/cry_seaking.aif deleted file mode 100644 index e4fc7e70d..000000000 Binary files a/sound/direct_sound_samples/cries/cry_seaking.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_sealeo.aif b/sound/direct_sound_samples/cries/cry_sealeo.aif deleted file mode 100644 index d9ea50026..000000000 Binary files a/sound/direct_sound_samples/cries/cry_sealeo.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_seedot.aif b/sound/direct_sound_samples/cries/cry_seedot.aif deleted file mode 100644 index c37b769f8..000000000 Binary files a/sound/direct_sound_samples/cries/cry_seedot.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_seel.aif b/sound/direct_sound_samples/cries/cry_seel.aif deleted file mode 100644 index 84c4a0a94..000000000 Binary files a/sound/direct_sound_samples/cries/cry_seel.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_sentret.aif b/sound/direct_sound_samples/cries/cry_sentret.aif deleted file mode 100644 index 4aed7cd70..000000000 Binary files a/sound/direct_sound_samples/cries/cry_sentret.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_seviper.aif b/sound/direct_sound_samples/cries/cry_seviper.aif deleted file mode 100644 index 6a15dd6e2..000000000 Binary files a/sound/direct_sound_samples/cries/cry_seviper.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_sharpedo.aif b/sound/direct_sound_samples/cries/cry_sharpedo.aif deleted file mode 100644 index 1b02b56ce..000000000 Binary files a/sound/direct_sound_samples/cries/cry_sharpedo.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_shedinja.aif b/sound/direct_sound_samples/cries/cry_shedinja.aif deleted file mode 100644 index 6d1d565f3..000000000 Binary files a/sound/direct_sound_samples/cries/cry_shedinja.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_shelgon.aif b/sound/direct_sound_samples/cries/cry_shelgon.aif deleted file mode 100644 index 24f234ffe..000000000 Binary files a/sound/direct_sound_samples/cries/cry_shelgon.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_shellder.aif b/sound/direct_sound_samples/cries/cry_shellder.aif deleted file mode 100644 index b2ea85228..000000000 Binary files a/sound/direct_sound_samples/cries/cry_shellder.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_shiftry.aif b/sound/direct_sound_samples/cries/cry_shiftry.aif deleted file mode 100644 index c91ece114..000000000 Binary files a/sound/direct_sound_samples/cries/cry_shiftry.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_shroomish.aif b/sound/direct_sound_samples/cries/cry_shroomish.aif deleted file mode 100644 index 9e944ca20..000000000 Binary files a/sound/direct_sound_samples/cries/cry_shroomish.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_shuckle.aif b/sound/direct_sound_samples/cries/cry_shuckle.aif deleted file mode 100644 index d835d2de6..000000000 Binary files a/sound/direct_sound_samples/cries/cry_shuckle.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_shuppet.aif b/sound/direct_sound_samples/cries/cry_shuppet.aif deleted file mode 100644 index 1cd9a2f14..000000000 Binary files a/sound/direct_sound_samples/cries/cry_shuppet.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_silcoon.aif b/sound/direct_sound_samples/cries/cry_silcoon.aif deleted file mode 100644 index ff48950ad..000000000 Binary files a/sound/direct_sound_samples/cries/cry_silcoon.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_skarmory.aif b/sound/direct_sound_samples/cries/cry_skarmory.aif deleted file mode 100644 index 88d3985a3..000000000 Binary files a/sound/direct_sound_samples/cries/cry_skarmory.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_skiploom.aif b/sound/direct_sound_samples/cries/cry_skiploom.aif deleted file mode 100644 index 201744d12..000000000 Binary files a/sound/direct_sound_samples/cries/cry_skiploom.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_skitty.aif b/sound/direct_sound_samples/cries/cry_skitty.aif deleted file mode 100644 index 7dc4578f4..000000000 Binary files a/sound/direct_sound_samples/cries/cry_skitty.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_slaking.aif b/sound/direct_sound_samples/cries/cry_slaking.aif deleted file mode 100644 index b6a4160f3..000000000 Binary files a/sound/direct_sound_samples/cries/cry_slaking.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_slakoth.aif b/sound/direct_sound_samples/cries/cry_slakoth.aif deleted file mode 100644 index 0e4bbc3c3..000000000 Binary files a/sound/direct_sound_samples/cries/cry_slakoth.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_slowbro.aif b/sound/direct_sound_samples/cries/cry_slowbro.aif deleted file mode 100644 index f74b753d2..000000000 Binary files a/sound/direct_sound_samples/cries/cry_slowbro.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_slowking.aif b/sound/direct_sound_samples/cries/cry_slowking.aif deleted file mode 100644 index 245a42023..000000000 Binary files a/sound/direct_sound_samples/cries/cry_slowking.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_slowpoke.aif b/sound/direct_sound_samples/cries/cry_slowpoke.aif deleted file mode 100644 index 82b05a9a7..000000000 Binary files a/sound/direct_sound_samples/cries/cry_slowpoke.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_slugma.aif b/sound/direct_sound_samples/cries/cry_slugma.aif deleted file mode 100644 index fed42817c..000000000 Binary files a/sound/direct_sound_samples/cries/cry_slugma.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_smeargle.aif b/sound/direct_sound_samples/cries/cry_smeargle.aif deleted file mode 100644 index 00dbedead..000000000 Binary files a/sound/direct_sound_samples/cries/cry_smeargle.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_smoochum.aif b/sound/direct_sound_samples/cries/cry_smoochum.aif deleted file mode 100644 index 4005b4ad4..000000000 Binary files a/sound/direct_sound_samples/cries/cry_smoochum.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_sneasel.aif b/sound/direct_sound_samples/cries/cry_sneasel.aif deleted file mode 100644 index 54242a23f..000000000 Binary files a/sound/direct_sound_samples/cries/cry_sneasel.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_snorlax.aif b/sound/direct_sound_samples/cries/cry_snorlax.aif deleted file mode 100644 index f95128e3a..000000000 Binary files a/sound/direct_sound_samples/cries/cry_snorlax.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_snorunt.aif b/sound/direct_sound_samples/cries/cry_snorunt.aif deleted file mode 100644 index 53b05b229..000000000 Binary files a/sound/direct_sound_samples/cries/cry_snorunt.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_snubbull.aif b/sound/direct_sound_samples/cries/cry_snubbull.aif deleted file mode 100644 index bbba023fd..000000000 Binary files a/sound/direct_sound_samples/cries/cry_snubbull.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_solrock.aif b/sound/direct_sound_samples/cries/cry_solrock.aif deleted file mode 100644 index 64c71f289..000000000 Binary files a/sound/direct_sound_samples/cries/cry_solrock.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_spearow.aif b/sound/direct_sound_samples/cries/cry_spearow.aif deleted file mode 100644 index 7ce86ae29..000000000 Binary files a/sound/direct_sound_samples/cries/cry_spearow.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_spheal.aif b/sound/direct_sound_samples/cries/cry_spheal.aif deleted file mode 100644 index fb6470210..000000000 Binary files a/sound/direct_sound_samples/cries/cry_spheal.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_spinarak.aif b/sound/direct_sound_samples/cries/cry_spinarak.aif deleted file mode 100644 index 3c4c1eff1..000000000 Binary files a/sound/direct_sound_samples/cries/cry_spinarak.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_spinda.aif b/sound/direct_sound_samples/cries/cry_spinda.aif deleted file mode 100644 index 0217573c7..000000000 Binary files a/sound/direct_sound_samples/cries/cry_spinda.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_spoink.aif b/sound/direct_sound_samples/cries/cry_spoink.aif deleted file mode 100644 index 6cc9bf546..000000000 Binary files a/sound/direct_sound_samples/cries/cry_spoink.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_squirtle.aif b/sound/direct_sound_samples/cries/cry_squirtle.aif deleted file mode 100644 index 43a98a53d..000000000 Binary files a/sound/direct_sound_samples/cries/cry_squirtle.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_stantler.aif b/sound/direct_sound_samples/cries/cry_stantler.aif deleted file mode 100644 index 36ba54658..000000000 Binary files a/sound/direct_sound_samples/cries/cry_stantler.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_starmie.aif b/sound/direct_sound_samples/cries/cry_starmie.aif deleted file mode 100644 index 7452a78f9..000000000 Binary files a/sound/direct_sound_samples/cries/cry_starmie.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_staryu.aif b/sound/direct_sound_samples/cries/cry_staryu.aif deleted file mode 100644 index 6ab5584bf..000000000 Binary files a/sound/direct_sound_samples/cries/cry_staryu.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_steelix.aif b/sound/direct_sound_samples/cries/cry_steelix.aif deleted file mode 100644 index aa05e2d4c..000000000 Binary files a/sound/direct_sound_samples/cries/cry_steelix.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_sudowoodo.aif b/sound/direct_sound_samples/cries/cry_sudowoodo.aif deleted file mode 100644 index 1af7e18eb..000000000 Binary files a/sound/direct_sound_samples/cries/cry_sudowoodo.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_suicune.aif b/sound/direct_sound_samples/cries/cry_suicune.aif deleted file mode 100644 index 697732d68..000000000 Binary files a/sound/direct_sound_samples/cries/cry_suicune.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_sunflora.aif b/sound/direct_sound_samples/cries/cry_sunflora.aif deleted file mode 100644 index 126931adc..000000000 Binary files a/sound/direct_sound_samples/cries/cry_sunflora.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_sunkern.aif b/sound/direct_sound_samples/cries/cry_sunkern.aif deleted file mode 100644 index bede3bf95..000000000 Binary files a/sound/direct_sound_samples/cries/cry_sunkern.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_surskit.aif b/sound/direct_sound_samples/cries/cry_surskit.aif deleted file mode 100644 index 438b5b67a..000000000 Binary files a/sound/direct_sound_samples/cries/cry_surskit.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_swablu.aif b/sound/direct_sound_samples/cries/cry_swablu.aif deleted file mode 100644 index 066095f55..000000000 Binary files a/sound/direct_sound_samples/cries/cry_swablu.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_swalot.aif b/sound/direct_sound_samples/cries/cry_swalot.aif deleted file mode 100644 index 518a9bf5a..000000000 Binary files a/sound/direct_sound_samples/cries/cry_swalot.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_swampert.aif b/sound/direct_sound_samples/cries/cry_swampert.aif deleted file mode 100644 index 56bd26405..000000000 Binary files a/sound/direct_sound_samples/cries/cry_swampert.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_swellow.aif b/sound/direct_sound_samples/cries/cry_swellow.aif deleted file mode 100644 index 2b94eb432..000000000 Binary files a/sound/direct_sound_samples/cries/cry_swellow.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_swinub.aif b/sound/direct_sound_samples/cries/cry_swinub.aif deleted file mode 100644 index dc68d62d8..000000000 Binary files a/sound/direct_sound_samples/cries/cry_swinub.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_taillow.aif b/sound/direct_sound_samples/cries/cry_taillow.aif deleted file mode 100644 index 8322a3224..000000000 Binary files a/sound/direct_sound_samples/cries/cry_taillow.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_tangela.aif b/sound/direct_sound_samples/cries/cry_tangela.aif deleted file mode 100644 index c900b426d..000000000 Binary files a/sound/direct_sound_samples/cries/cry_tangela.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_tauros.aif b/sound/direct_sound_samples/cries/cry_tauros.aif deleted file mode 100644 index 84fa9b317..000000000 Binary files a/sound/direct_sound_samples/cries/cry_tauros.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_teddiursa.aif b/sound/direct_sound_samples/cries/cry_teddiursa.aif deleted file mode 100644 index ba5cb5bc3..000000000 Binary files a/sound/direct_sound_samples/cries/cry_teddiursa.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_tentacool.aif b/sound/direct_sound_samples/cries/cry_tentacool.aif deleted file mode 100644 index 332bec4b2..000000000 Binary files a/sound/direct_sound_samples/cries/cry_tentacool.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_tentacruel.aif b/sound/direct_sound_samples/cries/cry_tentacruel.aif deleted file mode 100644 index e8ec1b14c..000000000 Binary files a/sound/direct_sound_samples/cries/cry_tentacruel.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_togepi.aif b/sound/direct_sound_samples/cries/cry_togepi.aif deleted file mode 100644 index 87ef6ef2d..000000000 Binary files a/sound/direct_sound_samples/cries/cry_togepi.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_togetic.aif b/sound/direct_sound_samples/cries/cry_togetic.aif deleted file mode 100644 index 8aa18ac41..000000000 Binary files a/sound/direct_sound_samples/cries/cry_togetic.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_torchic.aif b/sound/direct_sound_samples/cries/cry_torchic.aif deleted file mode 100644 index 185a79499..000000000 Binary files a/sound/direct_sound_samples/cries/cry_torchic.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_torkoal.aif b/sound/direct_sound_samples/cries/cry_torkoal.aif deleted file mode 100644 index 9e56d3810..000000000 Binary files a/sound/direct_sound_samples/cries/cry_torkoal.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_totodile.aif b/sound/direct_sound_samples/cries/cry_totodile.aif deleted file mode 100644 index dbf2179a7..000000000 Binary files a/sound/direct_sound_samples/cries/cry_totodile.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_trapinch.aif b/sound/direct_sound_samples/cries/cry_trapinch.aif deleted file mode 100644 index 01664b72e..000000000 Binary files a/sound/direct_sound_samples/cries/cry_trapinch.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_treecko.aif b/sound/direct_sound_samples/cries/cry_treecko.aif deleted file mode 100644 index a7416e8da..000000000 Binary files a/sound/direct_sound_samples/cries/cry_treecko.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_tropius.aif b/sound/direct_sound_samples/cries/cry_tropius.aif deleted file mode 100644 index bbb52787b..000000000 Binary files a/sound/direct_sound_samples/cries/cry_tropius.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_typhlosion.aif b/sound/direct_sound_samples/cries/cry_typhlosion.aif deleted file mode 100644 index f0238d066..000000000 Binary files a/sound/direct_sound_samples/cries/cry_typhlosion.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_tyranitar.aif b/sound/direct_sound_samples/cries/cry_tyranitar.aif deleted file mode 100644 index 557f61769..000000000 Binary files a/sound/direct_sound_samples/cries/cry_tyranitar.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_tyrogue.aif b/sound/direct_sound_samples/cries/cry_tyrogue.aif deleted file mode 100644 index e5065f58b..000000000 Binary files a/sound/direct_sound_samples/cries/cry_tyrogue.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_umbreon.aif b/sound/direct_sound_samples/cries/cry_umbreon.aif deleted file mode 100644 index 38129b1a7..000000000 Binary files a/sound/direct_sound_samples/cries/cry_umbreon.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_unown.aif b/sound/direct_sound_samples/cries/cry_unown.aif deleted file mode 100644 index 8339ccb6b..000000000 Binary files a/sound/direct_sound_samples/cries/cry_unown.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_ursaring.aif b/sound/direct_sound_samples/cries/cry_ursaring.aif deleted file mode 100644 index fcc748bd1..000000000 Binary files a/sound/direct_sound_samples/cries/cry_ursaring.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_vaporeon.aif b/sound/direct_sound_samples/cries/cry_vaporeon.aif deleted file mode 100644 index 4967cfdeb..000000000 Binary files a/sound/direct_sound_samples/cries/cry_vaporeon.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_venomoth.aif b/sound/direct_sound_samples/cries/cry_venomoth.aif deleted file mode 100644 index bc291ec33..000000000 Binary files a/sound/direct_sound_samples/cries/cry_venomoth.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_venonat.aif b/sound/direct_sound_samples/cries/cry_venonat.aif deleted file mode 100644 index e89d87fa8..000000000 Binary files a/sound/direct_sound_samples/cries/cry_venonat.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_venusaur.aif b/sound/direct_sound_samples/cries/cry_venusaur.aif deleted file mode 100644 index 8a1f69e6e..000000000 Binary files a/sound/direct_sound_samples/cries/cry_venusaur.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_vibrava.aif b/sound/direct_sound_samples/cries/cry_vibrava.aif deleted file mode 100644 index 3e3180219..000000000 Binary files a/sound/direct_sound_samples/cries/cry_vibrava.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_victreebel.aif b/sound/direct_sound_samples/cries/cry_victreebel.aif deleted file mode 100644 index d6e6a4fe9..000000000 Binary files a/sound/direct_sound_samples/cries/cry_victreebel.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_vigoroth.aif b/sound/direct_sound_samples/cries/cry_vigoroth.aif deleted file mode 100644 index fc414f33d..000000000 Binary files a/sound/direct_sound_samples/cries/cry_vigoroth.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_vileplume.aif b/sound/direct_sound_samples/cries/cry_vileplume.aif deleted file mode 100644 index 723eec697..000000000 Binary files a/sound/direct_sound_samples/cries/cry_vileplume.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_volbeat.aif b/sound/direct_sound_samples/cries/cry_volbeat.aif deleted file mode 100644 index 6f765081e..000000000 Binary files a/sound/direct_sound_samples/cries/cry_volbeat.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_voltorb.aif b/sound/direct_sound_samples/cries/cry_voltorb.aif deleted file mode 100644 index 96e3bff31..000000000 Binary files a/sound/direct_sound_samples/cries/cry_voltorb.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_vulpix.aif b/sound/direct_sound_samples/cries/cry_vulpix.aif deleted file mode 100644 index 20da23fb4..000000000 Binary files a/sound/direct_sound_samples/cries/cry_vulpix.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_wailmer.aif b/sound/direct_sound_samples/cries/cry_wailmer.aif deleted file mode 100644 index e8de91333..000000000 Binary files a/sound/direct_sound_samples/cries/cry_wailmer.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_wailord.aif b/sound/direct_sound_samples/cries/cry_wailord.aif deleted file mode 100644 index 2c0468010..000000000 Binary files a/sound/direct_sound_samples/cries/cry_wailord.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_walrein.aif b/sound/direct_sound_samples/cries/cry_walrein.aif deleted file mode 100644 index 91d93f3fb..000000000 Binary files a/sound/direct_sound_samples/cries/cry_walrein.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_wartortle.aif b/sound/direct_sound_samples/cries/cry_wartortle.aif deleted file mode 100644 index 5dab7fd93..000000000 Binary files a/sound/direct_sound_samples/cries/cry_wartortle.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_weedle.aif b/sound/direct_sound_samples/cries/cry_weedle.aif deleted file mode 100644 index 773c2c8ae..000000000 Binary files a/sound/direct_sound_samples/cries/cry_weedle.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_weepinbell.aif b/sound/direct_sound_samples/cries/cry_weepinbell.aif deleted file mode 100644 index cdd61380a..000000000 Binary files a/sound/direct_sound_samples/cries/cry_weepinbell.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_weezing.aif b/sound/direct_sound_samples/cries/cry_weezing.aif deleted file mode 100644 index 2e4a7fe13..000000000 Binary files a/sound/direct_sound_samples/cries/cry_weezing.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_whiscash.aif b/sound/direct_sound_samples/cries/cry_whiscash.aif deleted file mode 100644 index 219737f32..000000000 Binary files a/sound/direct_sound_samples/cries/cry_whiscash.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_whismur.aif b/sound/direct_sound_samples/cries/cry_whismur.aif deleted file mode 100644 index 4da92ca6a..000000000 Binary files a/sound/direct_sound_samples/cries/cry_whismur.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_wigglytuff.aif b/sound/direct_sound_samples/cries/cry_wigglytuff.aif deleted file mode 100644 index 90aa90a23..000000000 Binary files a/sound/direct_sound_samples/cries/cry_wigglytuff.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_wingull.aif b/sound/direct_sound_samples/cries/cry_wingull.aif deleted file mode 100644 index 182ef18e6..000000000 Binary files a/sound/direct_sound_samples/cries/cry_wingull.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_wobbuffet.aif b/sound/direct_sound_samples/cries/cry_wobbuffet.aif deleted file mode 100644 index 70ee1f704..000000000 Binary files a/sound/direct_sound_samples/cries/cry_wobbuffet.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_wooper.aif b/sound/direct_sound_samples/cries/cry_wooper.aif deleted file mode 100644 index 51a6b627e..000000000 Binary files a/sound/direct_sound_samples/cries/cry_wooper.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_wurmple.aif b/sound/direct_sound_samples/cries/cry_wurmple.aif deleted file mode 100644 index 6442a4063..000000000 Binary files a/sound/direct_sound_samples/cries/cry_wurmple.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_wynaut.aif b/sound/direct_sound_samples/cries/cry_wynaut.aif deleted file mode 100644 index 798732c74..000000000 Binary files a/sound/direct_sound_samples/cries/cry_wynaut.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_xatu.aif b/sound/direct_sound_samples/cries/cry_xatu.aif deleted file mode 100644 index ac758fdbf..000000000 Binary files a/sound/direct_sound_samples/cries/cry_xatu.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_yanma.aif b/sound/direct_sound_samples/cries/cry_yanma.aif deleted file mode 100644 index df76534c5..000000000 Binary files a/sound/direct_sound_samples/cries/cry_yanma.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_zangoose.aif b/sound/direct_sound_samples/cries/cry_zangoose.aif deleted file mode 100644 index 3c206532f..000000000 Binary files a/sound/direct_sound_samples/cries/cry_zangoose.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_zapdos.aif b/sound/direct_sound_samples/cries/cry_zapdos.aif deleted file mode 100644 index a8d914d14..000000000 Binary files a/sound/direct_sound_samples/cries/cry_zapdos.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_zigzagoon.aif b/sound/direct_sound_samples/cries/cry_zigzagoon.aif deleted file mode 100644 index 52b9bb4f4..000000000 Binary files a/sound/direct_sound_samples/cries/cry_zigzagoon.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cry_zubat.aif b/sound/direct_sound_samples/cries/cry_zubat.aif deleted file mode 100644 index 45036d072..000000000 Binary files a/sound/direct_sound_samples/cries/cry_zubat.aif and /dev/null differ diff --git a/sound/direct_sound_samples/cries/cryogonal.aif b/sound/direct_sound_samples/cries/cryogonal.aif new file mode 100644 index 000000000..4e4ead6c1 Binary files /dev/null and b/sound/direct_sound_samples/cries/cryogonal.aif differ diff --git a/sound/direct_sound_samples/cries/cubchoo.aif b/sound/direct_sound_samples/cries/cubchoo.aif new file mode 100644 index 000000000..6f739fdd9 Binary files /dev/null and b/sound/direct_sound_samples/cries/cubchoo.aif differ diff --git a/sound/direct_sound_samples/cries/cubone.aif b/sound/direct_sound_samples/cries/cubone.aif new file mode 100644 index 000000000..2c00dd2ea Binary files /dev/null and b/sound/direct_sound_samples/cries/cubone.aif differ diff --git a/sound/direct_sound_samples/cries/cyndaquil.aif b/sound/direct_sound_samples/cries/cyndaquil.aif new file mode 100644 index 000000000..4f0b5481f Binary files /dev/null and b/sound/direct_sound_samples/cries/cyndaquil.aif differ diff --git a/sound/direct_sound_samples/cries/darkrai.aif b/sound/direct_sound_samples/cries/darkrai.aif new file mode 100644 index 000000000..db14a0ad7 Binary files /dev/null and b/sound/direct_sound_samples/cries/darkrai.aif differ diff --git a/sound/direct_sound_samples/cries/darmanitan.aif b/sound/direct_sound_samples/cries/darmanitan.aif new file mode 100644 index 000000000..97efdf8b9 Binary files /dev/null and b/sound/direct_sound_samples/cries/darmanitan.aif differ diff --git a/sound/direct_sound_samples/cries/darumaka.aif b/sound/direct_sound_samples/cries/darumaka.aif new file mode 100644 index 000000000..863f3deb9 Binary files /dev/null and b/sound/direct_sound_samples/cries/darumaka.aif differ diff --git a/sound/direct_sound_samples/cries/deerling.aif b/sound/direct_sound_samples/cries/deerling.aif new file mode 100644 index 000000000..09ace4dc7 Binary files /dev/null and b/sound/direct_sound_samples/cries/deerling.aif differ diff --git a/sound/direct_sound_samples/cries/deino.aif b/sound/direct_sound_samples/cries/deino.aif new file mode 100644 index 000000000..bf3987c29 Binary files /dev/null and b/sound/direct_sound_samples/cries/deino.aif differ diff --git a/sound/direct_sound_samples/cries/delcatty.aif b/sound/direct_sound_samples/cries/delcatty.aif new file mode 100644 index 000000000..a30321a9f Binary files /dev/null and b/sound/direct_sound_samples/cries/delcatty.aif differ diff --git a/sound/direct_sound_samples/cries/delibird.aif b/sound/direct_sound_samples/cries/delibird.aif new file mode 100644 index 000000000..618bca94b Binary files /dev/null and b/sound/direct_sound_samples/cries/delibird.aif differ diff --git a/sound/direct_sound_samples/cries/deoxys.aif b/sound/direct_sound_samples/cries/deoxys.aif new file mode 100644 index 000000000..d39b565a0 Binary files /dev/null and b/sound/direct_sound_samples/cries/deoxys.aif differ diff --git a/sound/direct_sound_samples/cries/dewgong.aif b/sound/direct_sound_samples/cries/dewgong.aif new file mode 100644 index 000000000..52c8b6f9b Binary files /dev/null and b/sound/direct_sound_samples/cries/dewgong.aif differ diff --git a/sound/direct_sound_samples/cries/dewott.aif b/sound/direct_sound_samples/cries/dewott.aif new file mode 100644 index 000000000..4f45de41a Binary files /dev/null and b/sound/direct_sound_samples/cries/dewott.aif differ diff --git a/sound/direct_sound_samples/cries/dialga.aif b/sound/direct_sound_samples/cries/dialga.aif new file mode 100644 index 000000000..3bc128ec2 Binary files /dev/null and b/sound/direct_sound_samples/cries/dialga.aif differ diff --git a/sound/direct_sound_samples/cries/diglett.aif b/sound/direct_sound_samples/cries/diglett.aif new file mode 100644 index 000000000..dac924fb8 Binary files /dev/null and b/sound/direct_sound_samples/cries/diglett.aif differ diff --git a/sound/direct_sound_samples/cries/ditto.aif b/sound/direct_sound_samples/cries/ditto.aif new file mode 100644 index 000000000..b73fcb764 Binary files /dev/null and b/sound/direct_sound_samples/cries/ditto.aif differ diff --git a/sound/direct_sound_samples/cries/dodrio.aif b/sound/direct_sound_samples/cries/dodrio.aif new file mode 100644 index 000000000..222eb7252 Binary files /dev/null and b/sound/direct_sound_samples/cries/dodrio.aif differ diff --git a/sound/direct_sound_samples/cries/doduo.aif b/sound/direct_sound_samples/cries/doduo.aif new file mode 100644 index 000000000..5a3a82527 Binary files /dev/null and b/sound/direct_sound_samples/cries/doduo.aif differ diff --git a/sound/direct_sound_samples/cries/donphan.aif b/sound/direct_sound_samples/cries/donphan.aif new file mode 100644 index 000000000..76f1dfaca Binary files /dev/null and b/sound/direct_sound_samples/cries/donphan.aif differ diff --git a/sound/direct_sound_samples/cries/dragonair.aif b/sound/direct_sound_samples/cries/dragonair.aif new file mode 100644 index 000000000..3e0f81d14 Binary files /dev/null and b/sound/direct_sound_samples/cries/dragonair.aif differ diff --git a/sound/direct_sound_samples/cries/dragonite.aif b/sound/direct_sound_samples/cries/dragonite.aif new file mode 100644 index 000000000..3719c9932 Binary files /dev/null and b/sound/direct_sound_samples/cries/dragonite.aif differ diff --git a/sound/direct_sound_samples/cries/drapion.aif b/sound/direct_sound_samples/cries/drapion.aif new file mode 100644 index 000000000..a5418de2b Binary files /dev/null and b/sound/direct_sound_samples/cries/drapion.aif differ diff --git a/sound/direct_sound_samples/cries/dratini.aif b/sound/direct_sound_samples/cries/dratini.aif new file mode 100644 index 000000000..8de5583f0 Binary files /dev/null and b/sound/direct_sound_samples/cries/dratini.aif differ diff --git a/sound/direct_sound_samples/cries/drifblim.aif b/sound/direct_sound_samples/cries/drifblim.aif new file mode 100644 index 000000000..a1afbdc71 Binary files /dev/null and b/sound/direct_sound_samples/cries/drifblim.aif differ diff --git a/sound/direct_sound_samples/cries/drifloon.aif b/sound/direct_sound_samples/cries/drifloon.aif new file mode 100644 index 000000000..bf5b8b20e Binary files /dev/null and b/sound/direct_sound_samples/cries/drifloon.aif differ diff --git a/sound/direct_sound_samples/cries/drilbur.aif b/sound/direct_sound_samples/cries/drilbur.aif new file mode 100644 index 000000000..8ec6e9095 Binary files /dev/null and b/sound/direct_sound_samples/cries/drilbur.aif differ diff --git a/sound/direct_sound_samples/cries/drowzee.aif b/sound/direct_sound_samples/cries/drowzee.aif new file mode 100644 index 000000000..8b50dbd4a Binary files /dev/null and b/sound/direct_sound_samples/cries/drowzee.aif differ diff --git a/sound/direct_sound_samples/cries/druddigon.aif b/sound/direct_sound_samples/cries/druddigon.aif new file mode 100644 index 000000000..52c25e304 Binary files /dev/null and b/sound/direct_sound_samples/cries/druddigon.aif differ diff --git a/sound/direct_sound_samples/cries/ducklett.aif b/sound/direct_sound_samples/cries/ducklett.aif new file mode 100644 index 000000000..d556d5568 Binary files /dev/null and b/sound/direct_sound_samples/cries/ducklett.aif differ diff --git a/sound/direct_sound_samples/cries/dugtrio.aif b/sound/direct_sound_samples/cries/dugtrio.aif new file mode 100644 index 000000000..875e4638e Binary files /dev/null and b/sound/direct_sound_samples/cries/dugtrio.aif differ diff --git a/sound/direct_sound_samples/cries/dunsparce.aif b/sound/direct_sound_samples/cries/dunsparce.aif new file mode 100644 index 000000000..b2e246eee Binary files /dev/null and b/sound/direct_sound_samples/cries/dunsparce.aif differ diff --git a/sound/direct_sound_samples/cries/duosion.aif b/sound/direct_sound_samples/cries/duosion.aif new file mode 100644 index 000000000..3003a3a00 Binary files /dev/null and b/sound/direct_sound_samples/cries/duosion.aif differ diff --git a/sound/direct_sound_samples/cries/durant.aif b/sound/direct_sound_samples/cries/durant.aif new file mode 100644 index 000000000..d3e32043b Binary files /dev/null and b/sound/direct_sound_samples/cries/durant.aif differ diff --git a/sound/direct_sound_samples/cries/dusclops.aif b/sound/direct_sound_samples/cries/dusclops.aif new file mode 100644 index 000000000..d25405b2b Binary files /dev/null and b/sound/direct_sound_samples/cries/dusclops.aif differ diff --git a/sound/direct_sound_samples/cries/dusknoir.aif b/sound/direct_sound_samples/cries/dusknoir.aif new file mode 100644 index 000000000..7bbc50d16 Binary files /dev/null and b/sound/direct_sound_samples/cries/dusknoir.aif differ diff --git a/sound/direct_sound_samples/cries/duskull.aif b/sound/direct_sound_samples/cries/duskull.aif new file mode 100644 index 000000000..71535909c Binary files /dev/null and b/sound/direct_sound_samples/cries/duskull.aif differ diff --git a/sound/direct_sound_samples/cries/dustox.aif b/sound/direct_sound_samples/cries/dustox.aif new file mode 100644 index 000000000..94f22ae63 Binary files /dev/null and b/sound/direct_sound_samples/cries/dustox.aif differ diff --git a/sound/direct_sound_samples/cries/dwebble.aif b/sound/direct_sound_samples/cries/dwebble.aif new file mode 100644 index 000000000..066772324 Binary files /dev/null and b/sound/direct_sound_samples/cries/dwebble.aif differ diff --git a/sound/direct_sound_samples/cries/eelektrik.aif b/sound/direct_sound_samples/cries/eelektrik.aif new file mode 100644 index 000000000..7e73ba7d1 Binary files /dev/null and b/sound/direct_sound_samples/cries/eelektrik.aif differ diff --git a/sound/direct_sound_samples/cries/eelektross.aif b/sound/direct_sound_samples/cries/eelektross.aif new file mode 100644 index 000000000..efd8a146f Binary files /dev/null and b/sound/direct_sound_samples/cries/eelektross.aif differ diff --git a/sound/direct_sound_samples/cries/eevee.aif b/sound/direct_sound_samples/cries/eevee.aif new file mode 100644 index 000000000..ce8bf61af Binary files /dev/null and b/sound/direct_sound_samples/cries/eevee.aif differ diff --git a/sound/direct_sound_samples/cries/ekans.aif b/sound/direct_sound_samples/cries/ekans.aif new file mode 100644 index 000000000..6d933819d Binary files /dev/null and b/sound/direct_sound_samples/cries/ekans.aif differ diff --git a/sound/direct_sound_samples/cries/electabuzz.aif b/sound/direct_sound_samples/cries/electabuzz.aif new file mode 100644 index 000000000..a57bdf37e Binary files /dev/null and b/sound/direct_sound_samples/cries/electabuzz.aif differ diff --git a/sound/direct_sound_samples/cries/electivire.aif b/sound/direct_sound_samples/cries/electivire.aif new file mode 100644 index 000000000..1cabc6435 Binary files /dev/null and b/sound/direct_sound_samples/cries/electivire.aif differ diff --git a/sound/direct_sound_samples/cries/electrike.aif b/sound/direct_sound_samples/cries/electrike.aif new file mode 100644 index 000000000..d446cd634 Binary files /dev/null and b/sound/direct_sound_samples/cries/electrike.aif differ diff --git a/sound/direct_sound_samples/cries/electrode.aif b/sound/direct_sound_samples/cries/electrode.aif new file mode 100644 index 000000000..19a982d1e Binary files /dev/null and b/sound/direct_sound_samples/cries/electrode.aif differ diff --git a/sound/direct_sound_samples/cries/elekid.aif b/sound/direct_sound_samples/cries/elekid.aif new file mode 100644 index 000000000..4afbde5cc Binary files /dev/null and b/sound/direct_sound_samples/cries/elekid.aif differ diff --git a/sound/direct_sound_samples/cries/elgyem.aif b/sound/direct_sound_samples/cries/elgyem.aif new file mode 100644 index 000000000..4a7ae4e42 Binary files /dev/null and b/sound/direct_sound_samples/cries/elgyem.aif differ diff --git a/sound/direct_sound_samples/cries/emboar.aif b/sound/direct_sound_samples/cries/emboar.aif new file mode 100644 index 000000000..68b4bd7ef Binary files /dev/null and b/sound/direct_sound_samples/cries/emboar.aif differ diff --git a/sound/direct_sound_samples/cries/emolga.aif b/sound/direct_sound_samples/cries/emolga.aif new file mode 100644 index 000000000..25aba1ea8 Binary files /dev/null and b/sound/direct_sound_samples/cries/emolga.aif differ diff --git a/sound/direct_sound_samples/cries/empoleon.aif b/sound/direct_sound_samples/cries/empoleon.aif new file mode 100644 index 000000000..26648ca34 Binary files /dev/null and b/sound/direct_sound_samples/cries/empoleon.aif differ diff --git a/sound/direct_sound_samples/cries/entei.aif b/sound/direct_sound_samples/cries/entei.aif new file mode 100644 index 000000000..63fdcc783 Binary files /dev/null and b/sound/direct_sound_samples/cries/entei.aif differ diff --git a/sound/direct_sound_samples/cries/escavalier.aif b/sound/direct_sound_samples/cries/escavalier.aif new file mode 100644 index 000000000..55ee1ef58 Binary files /dev/null and b/sound/direct_sound_samples/cries/escavalier.aif differ diff --git a/sound/direct_sound_samples/cries/espeon.aif b/sound/direct_sound_samples/cries/espeon.aif new file mode 100644 index 000000000..51f96c911 Binary files /dev/null and b/sound/direct_sound_samples/cries/espeon.aif differ diff --git a/sound/direct_sound_samples/cries/excadrill.aif b/sound/direct_sound_samples/cries/excadrill.aif new file mode 100644 index 000000000..7709bee7d Binary files /dev/null and b/sound/direct_sound_samples/cries/excadrill.aif differ diff --git a/sound/direct_sound_samples/cries/exeggcute.aif b/sound/direct_sound_samples/cries/exeggcute.aif new file mode 100644 index 000000000..384b99909 Binary files /dev/null and b/sound/direct_sound_samples/cries/exeggcute.aif differ diff --git a/sound/direct_sound_samples/cries/exeggutor.aif b/sound/direct_sound_samples/cries/exeggutor.aif new file mode 100644 index 000000000..15ddbbdfa Binary files /dev/null and b/sound/direct_sound_samples/cries/exeggutor.aif differ diff --git a/sound/direct_sound_samples/cries/exploud.aif b/sound/direct_sound_samples/cries/exploud.aif new file mode 100644 index 000000000..7b97db232 Binary files /dev/null and b/sound/direct_sound_samples/cries/exploud.aif differ diff --git a/sound/direct_sound_samples/cries/farfetchd.aif b/sound/direct_sound_samples/cries/farfetchd.aif new file mode 100644 index 000000000..d3838c676 Binary files /dev/null and b/sound/direct_sound_samples/cries/farfetchd.aif differ diff --git a/sound/direct_sound_samples/cries/fearow.aif b/sound/direct_sound_samples/cries/fearow.aif new file mode 100644 index 000000000..f111ca15a Binary files /dev/null and b/sound/direct_sound_samples/cries/fearow.aif differ diff --git a/sound/direct_sound_samples/cries/feebas.aif b/sound/direct_sound_samples/cries/feebas.aif new file mode 100644 index 000000000..7cc5452a4 Binary files /dev/null and b/sound/direct_sound_samples/cries/feebas.aif differ diff --git a/sound/direct_sound_samples/cries/feraligatr.aif b/sound/direct_sound_samples/cries/feraligatr.aif new file mode 100644 index 000000000..070e204c3 Binary files /dev/null and b/sound/direct_sound_samples/cries/feraligatr.aif differ diff --git a/sound/direct_sound_samples/cries/ferroseed.aif b/sound/direct_sound_samples/cries/ferroseed.aif new file mode 100644 index 000000000..4073bf6ff Binary files /dev/null and b/sound/direct_sound_samples/cries/ferroseed.aif differ diff --git a/sound/direct_sound_samples/cries/ferrothorn.aif b/sound/direct_sound_samples/cries/ferrothorn.aif new file mode 100644 index 000000000..e041923fc Binary files /dev/null and b/sound/direct_sound_samples/cries/ferrothorn.aif differ diff --git a/sound/direct_sound_samples/cries/finneon.aif b/sound/direct_sound_samples/cries/finneon.aif new file mode 100644 index 000000000..d6eb52466 Binary files /dev/null and b/sound/direct_sound_samples/cries/finneon.aif differ diff --git a/sound/direct_sound_samples/cries/flaaffy.aif b/sound/direct_sound_samples/cries/flaaffy.aif new file mode 100644 index 000000000..a9f809d53 Binary files /dev/null and b/sound/direct_sound_samples/cries/flaaffy.aif differ diff --git a/sound/direct_sound_samples/cries/flareon.aif b/sound/direct_sound_samples/cries/flareon.aif new file mode 100644 index 000000000..d8e70213d Binary files /dev/null and b/sound/direct_sound_samples/cries/flareon.aif differ diff --git a/sound/direct_sound_samples/cries/floatzel.aif b/sound/direct_sound_samples/cries/floatzel.aif new file mode 100644 index 000000000..60424b367 Binary files /dev/null and b/sound/direct_sound_samples/cries/floatzel.aif differ diff --git a/sound/direct_sound_samples/cries/flygon.aif b/sound/direct_sound_samples/cries/flygon.aif new file mode 100644 index 000000000..06abfcf26 Binary files /dev/null and b/sound/direct_sound_samples/cries/flygon.aif differ diff --git a/sound/direct_sound_samples/cries/foongus.aif b/sound/direct_sound_samples/cries/foongus.aif new file mode 100644 index 000000000..7d32598b5 Binary files /dev/null and b/sound/direct_sound_samples/cries/foongus.aif differ diff --git a/sound/direct_sound_samples/cries/forretress.aif b/sound/direct_sound_samples/cries/forretress.aif new file mode 100644 index 000000000..4fae6d037 Binary files /dev/null and b/sound/direct_sound_samples/cries/forretress.aif differ diff --git a/sound/direct_sound_samples/cries/fraxure.aif b/sound/direct_sound_samples/cries/fraxure.aif new file mode 100644 index 000000000..43fcf4221 Binary files /dev/null and b/sound/direct_sound_samples/cries/fraxure.aif differ diff --git a/sound/direct_sound_samples/cries/frillish.aif b/sound/direct_sound_samples/cries/frillish.aif new file mode 100644 index 000000000..b63a21f47 Binary files /dev/null and b/sound/direct_sound_samples/cries/frillish.aif differ diff --git a/sound/direct_sound_samples/cries/froslass.aif b/sound/direct_sound_samples/cries/froslass.aif new file mode 100644 index 000000000..2c6a0be00 Binary files /dev/null and b/sound/direct_sound_samples/cries/froslass.aif differ diff --git a/sound/direct_sound_samples/cries/furret.aif b/sound/direct_sound_samples/cries/furret.aif new file mode 100644 index 000000000..6ce107b10 Binary files /dev/null and b/sound/direct_sound_samples/cries/furret.aif differ diff --git a/sound/direct_sound_samples/cries/gabite.aif b/sound/direct_sound_samples/cries/gabite.aif new file mode 100644 index 000000000..17226eb28 Binary files /dev/null and b/sound/direct_sound_samples/cries/gabite.aif differ diff --git a/sound/direct_sound_samples/cries/gallade.aif b/sound/direct_sound_samples/cries/gallade.aif new file mode 100644 index 000000000..7de776bd1 Binary files /dev/null and b/sound/direct_sound_samples/cries/gallade.aif differ diff --git a/sound/direct_sound_samples/cries/galvantula.aif b/sound/direct_sound_samples/cries/galvantula.aif new file mode 100644 index 000000000..f2989d840 Binary files /dev/null and b/sound/direct_sound_samples/cries/galvantula.aif differ diff --git a/sound/direct_sound_samples/cries/garbodor.aif b/sound/direct_sound_samples/cries/garbodor.aif new file mode 100644 index 000000000..28f95184a Binary files /dev/null and b/sound/direct_sound_samples/cries/garbodor.aif differ diff --git a/sound/direct_sound_samples/cries/garchomp.aif b/sound/direct_sound_samples/cries/garchomp.aif new file mode 100644 index 000000000..a5165a733 Binary files /dev/null and b/sound/direct_sound_samples/cries/garchomp.aif differ diff --git a/sound/direct_sound_samples/cries/gardevoir.aif b/sound/direct_sound_samples/cries/gardevoir.aif new file mode 100644 index 000000000..f7cd7d523 Binary files /dev/null and b/sound/direct_sound_samples/cries/gardevoir.aif differ diff --git a/sound/direct_sound_samples/cries/gastly.aif b/sound/direct_sound_samples/cries/gastly.aif new file mode 100644 index 000000000..8dd90bff4 Binary files /dev/null and b/sound/direct_sound_samples/cries/gastly.aif differ diff --git a/sound/direct_sound_samples/cries/gastrodon.aif b/sound/direct_sound_samples/cries/gastrodon.aif new file mode 100644 index 000000000..7c33ebd99 Binary files /dev/null and b/sound/direct_sound_samples/cries/gastrodon.aif differ diff --git a/sound/direct_sound_samples/cries/genesect.aif b/sound/direct_sound_samples/cries/genesect.aif new file mode 100644 index 000000000..4c0e306be Binary files /dev/null and b/sound/direct_sound_samples/cries/genesect.aif differ diff --git a/sound/direct_sound_samples/cries/gengar.aif b/sound/direct_sound_samples/cries/gengar.aif new file mode 100644 index 000000000..0f7a59c33 Binary files /dev/null and b/sound/direct_sound_samples/cries/gengar.aif differ diff --git a/sound/direct_sound_samples/cries/geodude.aif b/sound/direct_sound_samples/cries/geodude.aif new file mode 100644 index 000000000..6c8e1779f Binary files /dev/null and b/sound/direct_sound_samples/cries/geodude.aif differ diff --git a/sound/direct_sound_samples/cries/gible.aif b/sound/direct_sound_samples/cries/gible.aif new file mode 100644 index 000000000..47b8635e9 Binary files /dev/null and b/sound/direct_sound_samples/cries/gible.aif differ diff --git a/sound/direct_sound_samples/cries/gigalith.aif b/sound/direct_sound_samples/cries/gigalith.aif new file mode 100644 index 000000000..98cffe443 Binary files /dev/null and b/sound/direct_sound_samples/cries/gigalith.aif differ diff --git a/sound/direct_sound_samples/cries/girafarig.aif b/sound/direct_sound_samples/cries/girafarig.aif new file mode 100644 index 000000000..ff56ab97c Binary files /dev/null and b/sound/direct_sound_samples/cries/girafarig.aif differ diff --git a/sound/direct_sound_samples/cries/giratina.aif b/sound/direct_sound_samples/cries/giratina.aif new file mode 100644 index 000000000..105a24de0 Binary files /dev/null and b/sound/direct_sound_samples/cries/giratina.aif differ diff --git a/sound/direct_sound_samples/cries/glaceon.aif b/sound/direct_sound_samples/cries/glaceon.aif new file mode 100644 index 000000000..fc7cc9f89 Binary files /dev/null and b/sound/direct_sound_samples/cries/glaceon.aif differ diff --git a/sound/direct_sound_samples/cries/glalie.aif b/sound/direct_sound_samples/cries/glalie.aif new file mode 100644 index 000000000..233515b6a Binary files /dev/null and b/sound/direct_sound_samples/cries/glalie.aif differ diff --git a/sound/direct_sound_samples/cries/glameow.aif b/sound/direct_sound_samples/cries/glameow.aif new file mode 100644 index 000000000..ad1d87353 Binary files /dev/null and b/sound/direct_sound_samples/cries/glameow.aif differ diff --git a/sound/direct_sound_samples/cries/gligar.aif b/sound/direct_sound_samples/cries/gligar.aif new file mode 100644 index 000000000..4908fb6b0 Binary files /dev/null and b/sound/direct_sound_samples/cries/gligar.aif differ diff --git a/sound/direct_sound_samples/cries/gliscor.aif b/sound/direct_sound_samples/cries/gliscor.aif new file mode 100644 index 000000000..ccd116c29 Binary files /dev/null and b/sound/direct_sound_samples/cries/gliscor.aif differ diff --git a/sound/direct_sound_samples/cries/gloom.aif b/sound/direct_sound_samples/cries/gloom.aif new file mode 100644 index 000000000..d15e3cca7 Binary files /dev/null and b/sound/direct_sound_samples/cries/gloom.aif differ diff --git a/sound/direct_sound_samples/cries/golbat.aif b/sound/direct_sound_samples/cries/golbat.aif new file mode 100644 index 000000000..b08da62f5 Binary files /dev/null and b/sound/direct_sound_samples/cries/golbat.aif differ diff --git a/sound/direct_sound_samples/cries/goldeen.aif b/sound/direct_sound_samples/cries/goldeen.aif new file mode 100644 index 000000000..2c93ba759 Binary files /dev/null and b/sound/direct_sound_samples/cries/goldeen.aif differ diff --git a/sound/direct_sound_samples/cries/golduck.aif b/sound/direct_sound_samples/cries/golduck.aif new file mode 100644 index 000000000..68645c9df Binary files /dev/null and b/sound/direct_sound_samples/cries/golduck.aif differ diff --git a/sound/direct_sound_samples/cries/golem.aif b/sound/direct_sound_samples/cries/golem.aif new file mode 100644 index 000000000..06451cdf1 Binary files /dev/null and b/sound/direct_sound_samples/cries/golem.aif differ diff --git a/sound/direct_sound_samples/cries/golett.aif b/sound/direct_sound_samples/cries/golett.aif new file mode 100644 index 000000000..3610df2a5 Binary files /dev/null and b/sound/direct_sound_samples/cries/golett.aif differ diff --git a/sound/direct_sound_samples/cries/golurk.aif b/sound/direct_sound_samples/cries/golurk.aif new file mode 100644 index 000000000..b9bd6914b Binary files /dev/null and b/sound/direct_sound_samples/cries/golurk.aif differ diff --git a/sound/direct_sound_samples/cries/gorebyss.aif b/sound/direct_sound_samples/cries/gorebyss.aif new file mode 100644 index 000000000..48277537a Binary files /dev/null and b/sound/direct_sound_samples/cries/gorebyss.aif differ diff --git a/sound/direct_sound_samples/cries/gothita.aif b/sound/direct_sound_samples/cries/gothita.aif new file mode 100644 index 000000000..78e9b1880 Binary files /dev/null and b/sound/direct_sound_samples/cries/gothita.aif differ diff --git a/sound/direct_sound_samples/cries/gothitelle.aif b/sound/direct_sound_samples/cries/gothitelle.aif new file mode 100644 index 000000000..f7f120207 Binary files /dev/null and b/sound/direct_sound_samples/cries/gothitelle.aif differ diff --git a/sound/direct_sound_samples/cries/gothorita.aif b/sound/direct_sound_samples/cries/gothorita.aif new file mode 100644 index 000000000..10ea224c6 Binary files /dev/null and b/sound/direct_sound_samples/cries/gothorita.aif differ diff --git a/sound/direct_sound_samples/cries/granbull.aif b/sound/direct_sound_samples/cries/granbull.aif new file mode 100644 index 000000000..6c4563fb3 Binary files /dev/null and b/sound/direct_sound_samples/cries/granbull.aif differ diff --git a/sound/direct_sound_samples/cries/graveler.aif b/sound/direct_sound_samples/cries/graveler.aif new file mode 100644 index 000000000..84828f10f Binary files /dev/null and b/sound/direct_sound_samples/cries/graveler.aif differ diff --git a/sound/direct_sound_samples/cries/grimer.aif b/sound/direct_sound_samples/cries/grimer.aif new file mode 100644 index 000000000..160cfe766 Binary files /dev/null and b/sound/direct_sound_samples/cries/grimer.aif differ diff --git a/sound/direct_sound_samples/cries/grotle.aif b/sound/direct_sound_samples/cries/grotle.aif new file mode 100644 index 000000000..71a2d7d1a Binary files /dev/null and b/sound/direct_sound_samples/cries/grotle.aif differ diff --git a/sound/direct_sound_samples/cries/groudon.aif b/sound/direct_sound_samples/cries/groudon.aif new file mode 100644 index 000000000..f8056c54b Binary files /dev/null and b/sound/direct_sound_samples/cries/groudon.aif differ diff --git a/sound/direct_sound_samples/cries/grovyle.aif b/sound/direct_sound_samples/cries/grovyle.aif new file mode 100644 index 000000000..7015e6430 Binary files /dev/null and b/sound/direct_sound_samples/cries/grovyle.aif differ diff --git a/sound/direct_sound_samples/cries/growlithe.aif b/sound/direct_sound_samples/cries/growlithe.aif new file mode 100644 index 000000000..1f98002d9 Binary files /dev/null and b/sound/direct_sound_samples/cries/growlithe.aif differ diff --git a/sound/direct_sound_samples/cries/grumpig.aif b/sound/direct_sound_samples/cries/grumpig.aif new file mode 100644 index 000000000..009cf0525 Binary files /dev/null and b/sound/direct_sound_samples/cries/grumpig.aif differ diff --git a/sound/direct_sound_samples/cries/gulpin.aif b/sound/direct_sound_samples/cries/gulpin.aif new file mode 100644 index 000000000..47a26e9b4 Binary files /dev/null and b/sound/direct_sound_samples/cries/gulpin.aif differ diff --git a/sound/direct_sound_samples/cries/gurdurr.aif b/sound/direct_sound_samples/cries/gurdurr.aif new file mode 100644 index 000000000..086b02012 Binary files /dev/null and b/sound/direct_sound_samples/cries/gurdurr.aif differ diff --git a/sound/direct_sound_samples/cries/gyarados.aif b/sound/direct_sound_samples/cries/gyarados.aif new file mode 100644 index 000000000..8747ee1f2 Binary files /dev/null and b/sound/direct_sound_samples/cries/gyarados.aif differ diff --git a/sound/direct_sound_samples/cries/happiny.aif b/sound/direct_sound_samples/cries/happiny.aif new file mode 100644 index 000000000..90d8ccb01 Binary files /dev/null and b/sound/direct_sound_samples/cries/happiny.aif differ diff --git a/sound/direct_sound_samples/cries/hariyama.aif b/sound/direct_sound_samples/cries/hariyama.aif new file mode 100644 index 000000000..3455304fb Binary files /dev/null and b/sound/direct_sound_samples/cries/hariyama.aif differ diff --git a/sound/direct_sound_samples/cries/haunter.aif b/sound/direct_sound_samples/cries/haunter.aif new file mode 100644 index 000000000..83dd20697 Binary files /dev/null and b/sound/direct_sound_samples/cries/haunter.aif differ diff --git a/sound/direct_sound_samples/cries/haxorus.aif b/sound/direct_sound_samples/cries/haxorus.aif new file mode 100644 index 000000000..7ac169415 Binary files /dev/null and b/sound/direct_sound_samples/cries/haxorus.aif differ diff --git a/sound/direct_sound_samples/cries/heatmor.aif b/sound/direct_sound_samples/cries/heatmor.aif new file mode 100644 index 000000000..6fff3da9d Binary files /dev/null and b/sound/direct_sound_samples/cries/heatmor.aif differ diff --git a/sound/direct_sound_samples/cries/heatran.aif b/sound/direct_sound_samples/cries/heatran.aif new file mode 100644 index 000000000..d6bab9fbb Binary files /dev/null and b/sound/direct_sound_samples/cries/heatran.aif differ diff --git a/sound/direct_sound_samples/cries/heracross.aif b/sound/direct_sound_samples/cries/heracross.aif new file mode 100644 index 000000000..e5347faf2 Binary files /dev/null and b/sound/direct_sound_samples/cries/heracross.aif differ diff --git a/sound/direct_sound_samples/cries/herdier.aif b/sound/direct_sound_samples/cries/herdier.aif new file mode 100644 index 000000000..5e863c94c Binary files /dev/null and b/sound/direct_sound_samples/cries/herdier.aif differ diff --git a/sound/direct_sound_samples/cries/hippopotas.aif b/sound/direct_sound_samples/cries/hippopotas.aif new file mode 100644 index 000000000..83deb1c61 Binary files /dev/null and b/sound/direct_sound_samples/cries/hippopotas.aif differ diff --git a/sound/direct_sound_samples/cries/hippowdon.aif b/sound/direct_sound_samples/cries/hippowdon.aif new file mode 100644 index 000000000..42f2860c8 Binary files /dev/null and b/sound/direct_sound_samples/cries/hippowdon.aif differ diff --git a/sound/direct_sound_samples/cries/hitmonchan.aif b/sound/direct_sound_samples/cries/hitmonchan.aif new file mode 100644 index 000000000..a0b974db9 Binary files /dev/null and b/sound/direct_sound_samples/cries/hitmonchan.aif differ diff --git a/sound/direct_sound_samples/cries/hitmonlee.aif b/sound/direct_sound_samples/cries/hitmonlee.aif new file mode 100644 index 000000000..5fda33b99 Binary files /dev/null and b/sound/direct_sound_samples/cries/hitmonlee.aif differ diff --git a/sound/direct_sound_samples/cries/hitmontop.aif b/sound/direct_sound_samples/cries/hitmontop.aif new file mode 100644 index 000000000..57f6101c9 Binary files /dev/null and b/sound/direct_sound_samples/cries/hitmontop.aif differ diff --git a/sound/direct_sound_samples/cries/ho_oh.aif b/sound/direct_sound_samples/cries/ho_oh.aif new file mode 100644 index 000000000..0c561242a Binary files /dev/null and b/sound/direct_sound_samples/cries/ho_oh.aif differ diff --git a/sound/direct_sound_samples/cries/honchkrow.aif b/sound/direct_sound_samples/cries/honchkrow.aif new file mode 100644 index 000000000..424689f0d Binary files /dev/null and b/sound/direct_sound_samples/cries/honchkrow.aif differ diff --git a/sound/direct_sound_samples/cries/hoothoot.aif b/sound/direct_sound_samples/cries/hoothoot.aif new file mode 100644 index 000000000..46dcbdddf Binary files /dev/null and b/sound/direct_sound_samples/cries/hoothoot.aif differ diff --git a/sound/direct_sound_samples/cries/hoppip.aif b/sound/direct_sound_samples/cries/hoppip.aif new file mode 100644 index 000000000..9eba0a749 Binary files /dev/null and b/sound/direct_sound_samples/cries/hoppip.aif differ diff --git a/sound/direct_sound_samples/cries/horsea.aif b/sound/direct_sound_samples/cries/horsea.aif new file mode 100644 index 000000000..7382a8a69 Binary files /dev/null and b/sound/direct_sound_samples/cries/horsea.aif differ diff --git a/sound/direct_sound_samples/cries/houndoom.aif b/sound/direct_sound_samples/cries/houndoom.aif new file mode 100644 index 000000000..a9c4d2d12 Binary files /dev/null and b/sound/direct_sound_samples/cries/houndoom.aif differ diff --git a/sound/direct_sound_samples/cries/houndour.aif b/sound/direct_sound_samples/cries/houndour.aif new file mode 100644 index 000000000..b366e0d06 Binary files /dev/null and b/sound/direct_sound_samples/cries/houndour.aif differ diff --git a/sound/direct_sound_samples/cries/huntail.aif b/sound/direct_sound_samples/cries/huntail.aif new file mode 100644 index 000000000..2b930a3eb Binary files /dev/null and b/sound/direct_sound_samples/cries/huntail.aif differ diff --git a/sound/direct_sound_samples/cries/hydreigon.aif b/sound/direct_sound_samples/cries/hydreigon.aif new file mode 100644 index 000000000..66342c066 Binary files /dev/null and b/sound/direct_sound_samples/cries/hydreigon.aif differ diff --git a/sound/direct_sound_samples/cries/hypno.aif b/sound/direct_sound_samples/cries/hypno.aif new file mode 100644 index 000000000..8569a4f98 Binary files /dev/null and b/sound/direct_sound_samples/cries/hypno.aif differ diff --git a/sound/direct_sound_samples/cries/igglybuff.aif b/sound/direct_sound_samples/cries/igglybuff.aif new file mode 100644 index 000000000..3a8d6e81e Binary files /dev/null and b/sound/direct_sound_samples/cries/igglybuff.aif differ diff --git a/sound/direct_sound_samples/cries/illumise.aif b/sound/direct_sound_samples/cries/illumise.aif new file mode 100644 index 000000000..350288991 Binary files /dev/null and b/sound/direct_sound_samples/cries/illumise.aif differ diff --git a/sound/direct_sound_samples/cries/infernape.aif b/sound/direct_sound_samples/cries/infernape.aif new file mode 100644 index 000000000..b36008eee Binary files /dev/null and b/sound/direct_sound_samples/cries/infernape.aif differ diff --git a/sound/direct_sound_samples/cries/ivysaur.aif b/sound/direct_sound_samples/cries/ivysaur.aif new file mode 100644 index 000000000..3d998bf67 Binary files /dev/null and b/sound/direct_sound_samples/cries/ivysaur.aif differ diff --git a/sound/direct_sound_samples/cries/jellicent.aif b/sound/direct_sound_samples/cries/jellicent.aif new file mode 100644 index 000000000..3664a9d41 Binary files /dev/null and b/sound/direct_sound_samples/cries/jellicent.aif differ diff --git a/sound/direct_sound_samples/cries/jigglypuff.aif b/sound/direct_sound_samples/cries/jigglypuff.aif new file mode 100644 index 000000000..d42f2dbdb Binary files /dev/null and b/sound/direct_sound_samples/cries/jigglypuff.aif differ diff --git a/sound/direct_sound_samples/cries/jirachi.aif b/sound/direct_sound_samples/cries/jirachi.aif new file mode 100644 index 000000000..40f3a76c1 Binary files /dev/null and b/sound/direct_sound_samples/cries/jirachi.aif differ diff --git a/sound/direct_sound_samples/cries/jolteon.aif b/sound/direct_sound_samples/cries/jolteon.aif new file mode 100644 index 000000000..be9c81d62 Binary files /dev/null and b/sound/direct_sound_samples/cries/jolteon.aif differ diff --git a/sound/direct_sound_samples/cries/joltik.aif b/sound/direct_sound_samples/cries/joltik.aif new file mode 100644 index 000000000..0c6caea6e Binary files /dev/null and b/sound/direct_sound_samples/cries/joltik.aif differ diff --git a/sound/direct_sound_samples/cries/jumpluff.aif b/sound/direct_sound_samples/cries/jumpluff.aif new file mode 100644 index 000000000..69b4a7207 Binary files /dev/null and b/sound/direct_sound_samples/cries/jumpluff.aif differ diff --git a/sound/direct_sound_samples/cries/jynx.aif b/sound/direct_sound_samples/cries/jynx.aif new file mode 100644 index 000000000..41630677b Binary files /dev/null and b/sound/direct_sound_samples/cries/jynx.aif differ diff --git a/sound/direct_sound_samples/cries/kabuto.aif b/sound/direct_sound_samples/cries/kabuto.aif new file mode 100644 index 000000000..aad4f3266 Binary files /dev/null and b/sound/direct_sound_samples/cries/kabuto.aif differ diff --git a/sound/direct_sound_samples/cries/kabutops.aif b/sound/direct_sound_samples/cries/kabutops.aif new file mode 100644 index 000000000..015bacaca Binary files /dev/null and b/sound/direct_sound_samples/cries/kabutops.aif differ diff --git a/sound/direct_sound_samples/cries/kadabra.aif b/sound/direct_sound_samples/cries/kadabra.aif new file mode 100644 index 000000000..4c847cb4e Binary files /dev/null and b/sound/direct_sound_samples/cries/kadabra.aif differ diff --git a/sound/direct_sound_samples/cries/kakuna.aif b/sound/direct_sound_samples/cries/kakuna.aif new file mode 100644 index 000000000..088b51965 Binary files /dev/null and b/sound/direct_sound_samples/cries/kakuna.aif differ diff --git a/sound/direct_sound_samples/cries/kangaskhan.aif b/sound/direct_sound_samples/cries/kangaskhan.aif new file mode 100644 index 000000000..1e5763953 Binary files /dev/null and b/sound/direct_sound_samples/cries/kangaskhan.aif differ diff --git a/sound/direct_sound_samples/cries/karrablast.aif b/sound/direct_sound_samples/cries/karrablast.aif new file mode 100644 index 000000000..7b22594e0 Binary files /dev/null and b/sound/direct_sound_samples/cries/karrablast.aif differ diff --git a/sound/direct_sound_samples/cries/kecleon.aif b/sound/direct_sound_samples/cries/kecleon.aif new file mode 100644 index 000000000..b6dd7e91f Binary files /dev/null and b/sound/direct_sound_samples/cries/kecleon.aif differ diff --git a/sound/direct_sound_samples/cries/keldeo.aif b/sound/direct_sound_samples/cries/keldeo.aif new file mode 100644 index 000000000..1a4d63fc8 Binary files /dev/null and b/sound/direct_sound_samples/cries/keldeo.aif differ diff --git a/sound/direct_sound_samples/cries/kingdra.aif b/sound/direct_sound_samples/cries/kingdra.aif new file mode 100644 index 000000000..2d68f6a6f Binary files /dev/null and b/sound/direct_sound_samples/cries/kingdra.aif differ diff --git a/sound/direct_sound_samples/cries/kingler.aif b/sound/direct_sound_samples/cries/kingler.aif new file mode 100644 index 000000000..752b66065 Binary files /dev/null and b/sound/direct_sound_samples/cries/kingler.aif differ diff --git a/sound/direct_sound_samples/cries/kirlia.aif b/sound/direct_sound_samples/cries/kirlia.aif new file mode 100644 index 000000000..0ef923020 Binary files /dev/null and b/sound/direct_sound_samples/cries/kirlia.aif differ diff --git a/sound/direct_sound_samples/cries/klang.aif b/sound/direct_sound_samples/cries/klang.aif new file mode 100644 index 000000000..462187f3e Binary files /dev/null and b/sound/direct_sound_samples/cries/klang.aif differ diff --git a/sound/direct_sound_samples/cries/klink.aif b/sound/direct_sound_samples/cries/klink.aif new file mode 100644 index 000000000..a3a78f58d Binary files /dev/null and b/sound/direct_sound_samples/cries/klink.aif differ diff --git a/sound/direct_sound_samples/cries/klinklang.aif b/sound/direct_sound_samples/cries/klinklang.aif new file mode 100644 index 000000000..2f2edf0f5 Binary files /dev/null and b/sound/direct_sound_samples/cries/klinklang.aif differ diff --git a/sound/direct_sound_samples/cries/koffing.aif b/sound/direct_sound_samples/cries/koffing.aif new file mode 100644 index 000000000..6def9ad0c Binary files /dev/null and b/sound/direct_sound_samples/cries/koffing.aif differ diff --git a/sound/direct_sound_samples/cries/krabby.aif b/sound/direct_sound_samples/cries/krabby.aif new file mode 100644 index 000000000..033e148f3 Binary files /dev/null and b/sound/direct_sound_samples/cries/krabby.aif differ diff --git a/sound/direct_sound_samples/cries/kricketot.aif b/sound/direct_sound_samples/cries/kricketot.aif new file mode 100644 index 000000000..c441b00cd Binary files /dev/null and b/sound/direct_sound_samples/cries/kricketot.aif differ diff --git a/sound/direct_sound_samples/cries/kricketune.aif b/sound/direct_sound_samples/cries/kricketune.aif new file mode 100644 index 000000000..a11390f3f Binary files /dev/null and b/sound/direct_sound_samples/cries/kricketune.aif differ diff --git a/sound/direct_sound_samples/cries/krokorok.aif b/sound/direct_sound_samples/cries/krokorok.aif new file mode 100644 index 000000000..d8f34f86a Binary files /dev/null and b/sound/direct_sound_samples/cries/krokorok.aif differ diff --git a/sound/direct_sound_samples/cries/krookodile.aif b/sound/direct_sound_samples/cries/krookodile.aif new file mode 100644 index 000000000..e8cd8277e Binary files /dev/null and b/sound/direct_sound_samples/cries/krookodile.aif differ diff --git a/sound/direct_sound_samples/cries/kyogre.aif b/sound/direct_sound_samples/cries/kyogre.aif new file mode 100644 index 000000000..57790d75f Binary files /dev/null and b/sound/direct_sound_samples/cries/kyogre.aif differ diff --git a/sound/direct_sound_samples/cries/kyurem.aif b/sound/direct_sound_samples/cries/kyurem.aif new file mode 100644 index 000000000..2b09fee15 Binary files /dev/null and b/sound/direct_sound_samples/cries/kyurem.aif differ diff --git a/sound/direct_sound_samples/cries/kyurem_black.aif b/sound/direct_sound_samples/cries/kyurem_black.aif new file mode 100644 index 000000000..f5bd0cb4e Binary files /dev/null and b/sound/direct_sound_samples/cries/kyurem_black.aif differ diff --git a/sound/direct_sound_samples/cries/kyurem_white.aif b/sound/direct_sound_samples/cries/kyurem_white.aif new file mode 100644 index 000000000..a9d7a5e58 Binary files /dev/null and b/sound/direct_sound_samples/cries/kyurem_white.aif differ diff --git a/sound/direct_sound_samples/cries/lairon.aif b/sound/direct_sound_samples/cries/lairon.aif new file mode 100644 index 000000000..b1cf60b8a Binary files /dev/null and b/sound/direct_sound_samples/cries/lairon.aif differ diff --git a/sound/direct_sound_samples/cries/lampent.aif b/sound/direct_sound_samples/cries/lampent.aif new file mode 100644 index 000000000..2037c0bb2 Binary files /dev/null and b/sound/direct_sound_samples/cries/lampent.aif differ diff --git a/sound/direct_sound_samples/cries/landorus.aif b/sound/direct_sound_samples/cries/landorus.aif new file mode 100644 index 000000000..f0937509f Binary files /dev/null and b/sound/direct_sound_samples/cries/landorus.aif differ diff --git a/sound/direct_sound_samples/cries/landorus_therian.aif b/sound/direct_sound_samples/cries/landorus_therian.aif new file mode 100644 index 000000000..a790c8ecf Binary files /dev/null and b/sound/direct_sound_samples/cries/landorus_therian.aif differ diff --git a/sound/direct_sound_samples/cries/lanturn.aif b/sound/direct_sound_samples/cries/lanturn.aif new file mode 100644 index 000000000..11405a96d Binary files /dev/null and b/sound/direct_sound_samples/cries/lanturn.aif differ diff --git a/sound/direct_sound_samples/cries/lapras.aif b/sound/direct_sound_samples/cries/lapras.aif new file mode 100644 index 000000000..0725bcecb Binary files /dev/null and b/sound/direct_sound_samples/cries/lapras.aif differ diff --git a/sound/direct_sound_samples/cries/larvesta.aif b/sound/direct_sound_samples/cries/larvesta.aif new file mode 100644 index 000000000..6822dca90 Binary files /dev/null and b/sound/direct_sound_samples/cries/larvesta.aif differ diff --git a/sound/direct_sound_samples/cries/larvitar.aif b/sound/direct_sound_samples/cries/larvitar.aif new file mode 100644 index 000000000..45ad2c048 Binary files /dev/null and b/sound/direct_sound_samples/cries/larvitar.aif differ diff --git a/sound/direct_sound_samples/cries/latias.aif b/sound/direct_sound_samples/cries/latias.aif new file mode 100644 index 000000000..546fe1597 Binary files /dev/null and b/sound/direct_sound_samples/cries/latias.aif differ diff --git a/sound/direct_sound_samples/cries/latios.aif b/sound/direct_sound_samples/cries/latios.aif new file mode 100644 index 000000000..f86a56fd8 Binary files /dev/null and b/sound/direct_sound_samples/cries/latios.aif differ diff --git a/sound/direct_sound_samples/cries/leafeon.aif b/sound/direct_sound_samples/cries/leafeon.aif new file mode 100644 index 000000000..048bfc817 Binary files /dev/null and b/sound/direct_sound_samples/cries/leafeon.aif differ diff --git a/sound/direct_sound_samples/cries/leavanny.aif b/sound/direct_sound_samples/cries/leavanny.aif new file mode 100644 index 000000000..c16544878 Binary files /dev/null and b/sound/direct_sound_samples/cries/leavanny.aif differ diff --git a/sound/direct_sound_samples/cries/ledian.aif b/sound/direct_sound_samples/cries/ledian.aif new file mode 100644 index 000000000..d659df613 Binary files /dev/null and b/sound/direct_sound_samples/cries/ledian.aif differ diff --git a/sound/direct_sound_samples/cries/ledyba.aif b/sound/direct_sound_samples/cries/ledyba.aif new file mode 100644 index 000000000..44e882cbd Binary files /dev/null and b/sound/direct_sound_samples/cries/ledyba.aif differ diff --git a/sound/direct_sound_samples/cries/lickilicky.aif b/sound/direct_sound_samples/cries/lickilicky.aif new file mode 100644 index 000000000..61b2c0f38 Binary files /dev/null and b/sound/direct_sound_samples/cries/lickilicky.aif differ diff --git a/sound/direct_sound_samples/cries/lickitung.aif b/sound/direct_sound_samples/cries/lickitung.aif new file mode 100644 index 000000000..0f4e697e5 Binary files /dev/null and b/sound/direct_sound_samples/cries/lickitung.aif differ diff --git a/sound/direct_sound_samples/cries/liepard.aif b/sound/direct_sound_samples/cries/liepard.aif new file mode 100644 index 000000000..1f97b7e1a Binary files /dev/null and b/sound/direct_sound_samples/cries/liepard.aif differ diff --git a/sound/direct_sound_samples/cries/lileep.aif b/sound/direct_sound_samples/cries/lileep.aif new file mode 100644 index 000000000..a178e72bf Binary files /dev/null and b/sound/direct_sound_samples/cries/lileep.aif differ diff --git a/sound/direct_sound_samples/cries/lilligant.aif b/sound/direct_sound_samples/cries/lilligant.aif new file mode 100644 index 000000000..fd940814e Binary files /dev/null and b/sound/direct_sound_samples/cries/lilligant.aif differ diff --git a/sound/direct_sound_samples/cries/lillipup.aif b/sound/direct_sound_samples/cries/lillipup.aif new file mode 100644 index 000000000..e7c8bc6ba Binary files /dev/null and b/sound/direct_sound_samples/cries/lillipup.aif differ diff --git a/sound/direct_sound_samples/cries/linoone.aif b/sound/direct_sound_samples/cries/linoone.aif new file mode 100644 index 000000000..326eca324 Binary files /dev/null and b/sound/direct_sound_samples/cries/linoone.aif differ diff --git a/sound/direct_sound_samples/cries/litwick.aif b/sound/direct_sound_samples/cries/litwick.aif new file mode 100644 index 000000000..930ca829e Binary files /dev/null and b/sound/direct_sound_samples/cries/litwick.aif differ diff --git a/sound/direct_sound_samples/cries/lombre.aif b/sound/direct_sound_samples/cries/lombre.aif new file mode 100644 index 000000000..04f7b6e77 Binary files /dev/null and b/sound/direct_sound_samples/cries/lombre.aif differ diff --git a/sound/direct_sound_samples/cries/lopunny.aif b/sound/direct_sound_samples/cries/lopunny.aif new file mode 100644 index 000000000..1db6d7641 Binary files /dev/null and b/sound/direct_sound_samples/cries/lopunny.aif differ diff --git a/sound/direct_sound_samples/cries/lotad.aif b/sound/direct_sound_samples/cries/lotad.aif new file mode 100644 index 000000000..a8071ef96 Binary files /dev/null and b/sound/direct_sound_samples/cries/lotad.aif differ diff --git a/sound/direct_sound_samples/cries/loudred.aif b/sound/direct_sound_samples/cries/loudred.aif new file mode 100644 index 000000000..2ac4687cf Binary files /dev/null and b/sound/direct_sound_samples/cries/loudred.aif differ diff --git a/sound/direct_sound_samples/cries/lucario.aif b/sound/direct_sound_samples/cries/lucario.aif new file mode 100644 index 000000000..fece38421 Binary files /dev/null and b/sound/direct_sound_samples/cries/lucario.aif differ diff --git a/sound/direct_sound_samples/cries/ludicolo.aif b/sound/direct_sound_samples/cries/ludicolo.aif new file mode 100644 index 000000000..a4e773e90 Binary files /dev/null and b/sound/direct_sound_samples/cries/ludicolo.aif differ diff --git a/sound/direct_sound_samples/cries/lugia.aif b/sound/direct_sound_samples/cries/lugia.aif new file mode 100644 index 000000000..6c96ba141 Binary files /dev/null and b/sound/direct_sound_samples/cries/lugia.aif differ diff --git a/sound/direct_sound_samples/cries/lumineon.aif b/sound/direct_sound_samples/cries/lumineon.aif new file mode 100644 index 000000000..a6a2cca2c Binary files /dev/null and b/sound/direct_sound_samples/cries/lumineon.aif differ diff --git a/sound/direct_sound_samples/cries/lunatone.aif b/sound/direct_sound_samples/cries/lunatone.aif new file mode 100644 index 000000000..468e60bc9 Binary files /dev/null and b/sound/direct_sound_samples/cries/lunatone.aif differ diff --git a/sound/direct_sound_samples/cries/luvdisc.aif b/sound/direct_sound_samples/cries/luvdisc.aif new file mode 100644 index 000000000..72aa538f1 Binary files /dev/null and b/sound/direct_sound_samples/cries/luvdisc.aif differ diff --git a/sound/direct_sound_samples/cries/luxio.aif b/sound/direct_sound_samples/cries/luxio.aif new file mode 100644 index 000000000..50019c217 Binary files /dev/null and b/sound/direct_sound_samples/cries/luxio.aif differ diff --git a/sound/direct_sound_samples/cries/luxray.aif b/sound/direct_sound_samples/cries/luxray.aif new file mode 100644 index 000000000..2401fe11e Binary files /dev/null and b/sound/direct_sound_samples/cries/luxray.aif differ diff --git a/sound/direct_sound_samples/cries/machamp.aif b/sound/direct_sound_samples/cries/machamp.aif new file mode 100644 index 000000000..7337dc341 Binary files /dev/null and b/sound/direct_sound_samples/cries/machamp.aif differ diff --git a/sound/direct_sound_samples/cries/machoke.aif b/sound/direct_sound_samples/cries/machoke.aif new file mode 100644 index 000000000..6b590cdd0 Binary files /dev/null and b/sound/direct_sound_samples/cries/machoke.aif differ diff --git a/sound/direct_sound_samples/cries/machop.aif b/sound/direct_sound_samples/cries/machop.aif new file mode 100644 index 000000000..28e749a3a Binary files /dev/null and b/sound/direct_sound_samples/cries/machop.aif differ diff --git a/sound/direct_sound_samples/cries/magby.aif b/sound/direct_sound_samples/cries/magby.aif new file mode 100644 index 000000000..0b6a5c8cf Binary files /dev/null and b/sound/direct_sound_samples/cries/magby.aif differ diff --git a/sound/direct_sound_samples/cries/magcargo.aif b/sound/direct_sound_samples/cries/magcargo.aif new file mode 100644 index 000000000..10c2a3451 Binary files /dev/null and b/sound/direct_sound_samples/cries/magcargo.aif differ diff --git a/sound/direct_sound_samples/cries/magikarp.aif b/sound/direct_sound_samples/cries/magikarp.aif new file mode 100644 index 000000000..f5f9ce213 Binary files /dev/null and b/sound/direct_sound_samples/cries/magikarp.aif differ diff --git a/sound/direct_sound_samples/cries/magmar.aif b/sound/direct_sound_samples/cries/magmar.aif new file mode 100644 index 000000000..1dfa93acd Binary files /dev/null and b/sound/direct_sound_samples/cries/magmar.aif differ diff --git a/sound/direct_sound_samples/cries/magmortar.aif b/sound/direct_sound_samples/cries/magmortar.aif new file mode 100644 index 000000000..3c1916ab3 Binary files /dev/null and b/sound/direct_sound_samples/cries/magmortar.aif differ diff --git a/sound/direct_sound_samples/cries/magnemite.aif b/sound/direct_sound_samples/cries/magnemite.aif new file mode 100644 index 000000000..52de6ab69 Binary files /dev/null and b/sound/direct_sound_samples/cries/magnemite.aif differ diff --git a/sound/direct_sound_samples/cries/magneton.aif b/sound/direct_sound_samples/cries/magneton.aif new file mode 100644 index 000000000..e9ab131cf Binary files /dev/null and b/sound/direct_sound_samples/cries/magneton.aif differ diff --git a/sound/direct_sound_samples/cries/magnezone.aif b/sound/direct_sound_samples/cries/magnezone.aif new file mode 100644 index 000000000..db1a6b5f0 Binary files /dev/null and b/sound/direct_sound_samples/cries/magnezone.aif differ diff --git a/sound/direct_sound_samples/cries/makuhita.aif b/sound/direct_sound_samples/cries/makuhita.aif new file mode 100644 index 000000000..8445adf5d Binary files /dev/null and b/sound/direct_sound_samples/cries/makuhita.aif differ diff --git a/sound/direct_sound_samples/cries/mamoswine.aif b/sound/direct_sound_samples/cries/mamoswine.aif new file mode 100644 index 000000000..034df6a61 Binary files /dev/null and b/sound/direct_sound_samples/cries/mamoswine.aif differ diff --git a/sound/direct_sound_samples/cries/manaphy.aif b/sound/direct_sound_samples/cries/manaphy.aif new file mode 100644 index 000000000..d7f80902b Binary files /dev/null and b/sound/direct_sound_samples/cries/manaphy.aif differ diff --git a/sound/direct_sound_samples/cries/mandibuzz.aif b/sound/direct_sound_samples/cries/mandibuzz.aif new file mode 100644 index 000000000..9911fa2c6 Binary files /dev/null and b/sound/direct_sound_samples/cries/mandibuzz.aif differ diff --git a/sound/direct_sound_samples/cries/manectric.aif b/sound/direct_sound_samples/cries/manectric.aif new file mode 100644 index 000000000..a96712010 Binary files /dev/null and b/sound/direct_sound_samples/cries/manectric.aif differ diff --git a/sound/direct_sound_samples/cries/mankey.aif b/sound/direct_sound_samples/cries/mankey.aif new file mode 100644 index 000000000..3a94289ac Binary files /dev/null and b/sound/direct_sound_samples/cries/mankey.aif differ diff --git a/sound/direct_sound_samples/cries/mantine.aif b/sound/direct_sound_samples/cries/mantine.aif new file mode 100644 index 000000000..62c3b4096 Binary files /dev/null and b/sound/direct_sound_samples/cries/mantine.aif differ diff --git a/sound/direct_sound_samples/cries/mantyke.aif b/sound/direct_sound_samples/cries/mantyke.aif new file mode 100644 index 000000000..bbb805e7e Binary files /dev/null and b/sound/direct_sound_samples/cries/mantyke.aif differ diff --git a/sound/direct_sound_samples/cries/maractus.aif b/sound/direct_sound_samples/cries/maractus.aif new file mode 100644 index 000000000..bf98f2c74 Binary files /dev/null and b/sound/direct_sound_samples/cries/maractus.aif differ diff --git a/sound/direct_sound_samples/cries/mareep.aif b/sound/direct_sound_samples/cries/mareep.aif new file mode 100644 index 000000000..f47b41701 Binary files /dev/null and b/sound/direct_sound_samples/cries/mareep.aif differ diff --git a/sound/direct_sound_samples/cries/marill.aif b/sound/direct_sound_samples/cries/marill.aif new file mode 100644 index 000000000..2483f62db Binary files /dev/null and b/sound/direct_sound_samples/cries/marill.aif differ diff --git a/sound/direct_sound_samples/cries/marowak.aif b/sound/direct_sound_samples/cries/marowak.aif new file mode 100644 index 000000000..a8567b32d Binary files /dev/null and b/sound/direct_sound_samples/cries/marowak.aif differ diff --git a/sound/direct_sound_samples/cries/marshtomp.aif b/sound/direct_sound_samples/cries/marshtomp.aif new file mode 100644 index 000000000..11ea04d0c Binary files /dev/null and b/sound/direct_sound_samples/cries/marshtomp.aif differ diff --git a/sound/direct_sound_samples/cries/masquerain.aif b/sound/direct_sound_samples/cries/masquerain.aif new file mode 100644 index 000000000..34f079f15 Binary files /dev/null and b/sound/direct_sound_samples/cries/masquerain.aif differ diff --git a/sound/direct_sound_samples/cries/mawile.aif b/sound/direct_sound_samples/cries/mawile.aif new file mode 100644 index 000000000..e14dd5a4e Binary files /dev/null and b/sound/direct_sound_samples/cries/mawile.aif differ diff --git a/sound/direct_sound_samples/cries/medicham.aif b/sound/direct_sound_samples/cries/medicham.aif new file mode 100644 index 000000000..d081dc900 Binary files /dev/null and b/sound/direct_sound_samples/cries/medicham.aif differ diff --git a/sound/direct_sound_samples/cries/meditite.aif b/sound/direct_sound_samples/cries/meditite.aif new file mode 100644 index 000000000..a82eb8422 Binary files /dev/null and b/sound/direct_sound_samples/cries/meditite.aif differ diff --git a/sound/direct_sound_samples/cries/meganium.aif b/sound/direct_sound_samples/cries/meganium.aif new file mode 100644 index 000000000..b06ad52c2 Binary files /dev/null and b/sound/direct_sound_samples/cries/meganium.aif differ diff --git a/sound/direct_sound_samples/cries/meloetta.aif b/sound/direct_sound_samples/cries/meloetta.aif new file mode 100644 index 000000000..9d2e0a254 Binary files /dev/null and b/sound/direct_sound_samples/cries/meloetta.aif differ diff --git a/sound/direct_sound_samples/cries/meowth.aif b/sound/direct_sound_samples/cries/meowth.aif new file mode 100644 index 000000000..9ba028cfb Binary files /dev/null and b/sound/direct_sound_samples/cries/meowth.aif differ diff --git a/sound/direct_sound_samples/cries/mesprit.aif b/sound/direct_sound_samples/cries/mesprit.aif new file mode 100644 index 000000000..4996d3f4b Binary files /dev/null and b/sound/direct_sound_samples/cries/mesprit.aif differ diff --git a/sound/direct_sound_samples/cries/metagross.aif b/sound/direct_sound_samples/cries/metagross.aif new file mode 100644 index 000000000..f4a0f99ac Binary files /dev/null and b/sound/direct_sound_samples/cries/metagross.aif differ diff --git a/sound/direct_sound_samples/cries/metang.aif b/sound/direct_sound_samples/cries/metang.aif new file mode 100644 index 000000000..df249ec54 Binary files /dev/null and b/sound/direct_sound_samples/cries/metang.aif differ diff --git a/sound/direct_sound_samples/cries/metapod.aif b/sound/direct_sound_samples/cries/metapod.aif new file mode 100644 index 000000000..de04d69de Binary files /dev/null and b/sound/direct_sound_samples/cries/metapod.aif differ diff --git a/sound/direct_sound_samples/cries/mew.aif b/sound/direct_sound_samples/cries/mew.aif new file mode 100644 index 000000000..166a0a8e9 Binary files /dev/null and b/sound/direct_sound_samples/cries/mew.aif differ diff --git a/sound/direct_sound_samples/cries/mewtwo.aif b/sound/direct_sound_samples/cries/mewtwo.aif new file mode 100644 index 000000000..c5a5309ba Binary files /dev/null and b/sound/direct_sound_samples/cries/mewtwo.aif differ diff --git a/sound/direct_sound_samples/cries/mienfoo.aif b/sound/direct_sound_samples/cries/mienfoo.aif new file mode 100644 index 000000000..3e826b31b Binary files /dev/null and b/sound/direct_sound_samples/cries/mienfoo.aif differ diff --git a/sound/direct_sound_samples/cries/mienshao.aif b/sound/direct_sound_samples/cries/mienshao.aif new file mode 100644 index 000000000..3f9199c7a Binary files /dev/null and b/sound/direct_sound_samples/cries/mienshao.aif differ diff --git a/sound/direct_sound_samples/cries/mightyena.aif b/sound/direct_sound_samples/cries/mightyena.aif new file mode 100644 index 000000000..7c7f74d1f Binary files /dev/null and b/sound/direct_sound_samples/cries/mightyena.aif differ diff --git a/sound/direct_sound_samples/cries/milotic.aif b/sound/direct_sound_samples/cries/milotic.aif new file mode 100644 index 000000000..be1e64eac Binary files /dev/null and b/sound/direct_sound_samples/cries/milotic.aif differ diff --git a/sound/direct_sound_samples/cries/miltank.aif b/sound/direct_sound_samples/cries/miltank.aif new file mode 100644 index 000000000..db64e8867 Binary files /dev/null and b/sound/direct_sound_samples/cries/miltank.aif differ diff --git a/sound/direct_sound_samples/cries/mime_jr.aif b/sound/direct_sound_samples/cries/mime_jr.aif new file mode 100644 index 000000000..1b12debbc Binary files /dev/null and b/sound/direct_sound_samples/cries/mime_jr.aif differ diff --git a/sound/direct_sound_samples/cries/minccino.aif b/sound/direct_sound_samples/cries/minccino.aif new file mode 100644 index 000000000..9299615ce Binary files /dev/null and b/sound/direct_sound_samples/cries/minccino.aif differ diff --git a/sound/direct_sound_samples/cries/minun.aif b/sound/direct_sound_samples/cries/minun.aif new file mode 100644 index 000000000..fe1a72aac Binary files /dev/null and b/sound/direct_sound_samples/cries/minun.aif differ diff --git a/sound/direct_sound_samples/cries/misdreavus.aif b/sound/direct_sound_samples/cries/misdreavus.aif new file mode 100644 index 000000000..a501b547b Binary files /dev/null and b/sound/direct_sound_samples/cries/misdreavus.aif differ diff --git a/sound/direct_sound_samples/cries/mismagius.aif b/sound/direct_sound_samples/cries/mismagius.aif new file mode 100644 index 000000000..f010b4931 Binary files /dev/null and b/sound/direct_sound_samples/cries/mismagius.aif differ diff --git a/sound/direct_sound_samples/cries/moltres.aif b/sound/direct_sound_samples/cries/moltres.aif new file mode 100644 index 000000000..5549bf5cb Binary files /dev/null and b/sound/direct_sound_samples/cries/moltres.aif differ diff --git a/sound/direct_sound_samples/cries/monferno.aif b/sound/direct_sound_samples/cries/monferno.aif new file mode 100644 index 000000000..8b8d67050 Binary files /dev/null and b/sound/direct_sound_samples/cries/monferno.aif differ diff --git a/sound/direct_sound_samples/cries/mothim.aif b/sound/direct_sound_samples/cries/mothim.aif new file mode 100644 index 000000000..82a42bce3 Binary files /dev/null and b/sound/direct_sound_samples/cries/mothim.aif differ diff --git a/sound/direct_sound_samples/cries/mr_mime.aif b/sound/direct_sound_samples/cries/mr_mime.aif new file mode 100644 index 000000000..ca89f4bc2 Binary files /dev/null and b/sound/direct_sound_samples/cries/mr_mime.aif differ diff --git a/sound/direct_sound_samples/cries/mudkip.aif b/sound/direct_sound_samples/cries/mudkip.aif new file mode 100644 index 000000000..adbdda290 Binary files /dev/null and b/sound/direct_sound_samples/cries/mudkip.aif differ diff --git a/sound/direct_sound_samples/cries/muk.aif b/sound/direct_sound_samples/cries/muk.aif new file mode 100644 index 000000000..557bb84ec Binary files /dev/null and b/sound/direct_sound_samples/cries/muk.aif differ diff --git a/sound/direct_sound_samples/cries/munchlax.aif b/sound/direct_sound_samples/cries/munchlax.aif new file mode 100644 index 000000000..befbcdb58 Binary files /dev/null and b/sound/direct_sound_samples/cries/munchlax.aif differ diff --git a/sound/direct_sound_samples/cries/munna.aif b/sound/direct_sound_samples/cries/munna.aif new file mode 100644 index 000000000..923f95182 Binary files /dev/null and b/sound/direct_sound_samples/cries/munna.aif differ diff --git a/sound/direct_sound_samples/cries/murkrow.aif b/sound/direct_sound_samples/cries/murkrow.aif new file mode 100644 index 000000000..ab42b84a9 Binary files /dev/null and b/sound/direct_sound_samples/cries/murkrow.aif differ diff --git a/sound/direct_sound_samples/cries/musharna.aif b/sound/direct_sound_samples/cries/musharna.aif new file mode 100644 index 000000000..406f56576 Binary files /dev/null and b/sound/direct_sound_samples/cries/musharna.aif differ diff --git a/sound/direct_sound_samples/cries/natu.aif b/sound/direct_sound_samples/cries/natu.aif new file mode 100644 index 000000000..a492cc5d3 Binary files /dev/null and b/sound/direct_sound_samples/cries/natu.aif differ diff --git a/sound/direct_sound_samples/cries/nidoking.aif b/sound/direct_sound_samples/cries/nidoking.aif new file mode 100644 index 000000000..43fadf989 Binary files /dev/null and b/sound/direct_sound_samples/cries/nidoking.aif differ diff --git a/sound/direct_sound_samples/cries/nidoqueen.aif b/sound/direct_sound_samples/cries/nidoqueen.aif new file mode 100644 index 000000000..6f1c4ef16 Binary files /dev/null and b/sound/direct_sound_samples/cries/nidoqueen.aif differ diff --git a/sound/direct_sound_samples/cries/nidoran_f.aif b/sound/direct_sound_samples/cries/nidoran_f.aif new file mode 100644 index 000000000..a8ecf4b4a Binary files /dev/null and b/sound/direct_sound_samples/cries/nidoran_f.aif differ diff --git a/sound/direct_sound_samples/cries/nidoran_m.aif b/sound/direct_sound_samples/cries/nidoran_m.aif new file mode 100644 index 000000000..bb2de057e Binary files /dev/null and b/sound/direct_sound_samples/cries/nidoran_m.aif differ diff --git a/sound/direct_sound_samples/cries/nidorina.aif b/sound/direct_sound_samples/cries/nidorina.aif new file mode 100644 index 000000000..ce5690991 Binary files /dev/null and b/sound/direct_sound_samples/cries/nidorina.aif differ diff --git a/sound/direct_sound_samples/cries/nidorino.aif b/sound/direct_sound_samples/cries/nidorino.aif new file mode 100644 index 000000000..dcc1629e4 Binary files /dev/null and b/sound/direct_sound_samples/cries/nidorino.aif differ diff --git a/sound/direct_sound_samples/cries/nincada.aif b/sound/direct_sound_samples/cries/nincada.aif new file mode 100644 index 000000000..0897f56df Binary files /dev/null and b/sound/direct_sound_samples/cries/nincada.aif differ diff --git a/sound/direct_sound_samples/cries/ninetales.aif b/sound/direct_sound_samples/cries/ninetales.aif new file mode 100644 index 000000000..aa31af7a8 Binary files /dev/null and b/sound/direct_sound_samples/cries/ninetales.aif differ diff --git a/sound/direct_sound_samples/cries/ninjask.aif b/sound/direct_sound_samples/cries/ninjask.aif new file mode 100644 index 000000000..f5b32b13e Binary files /dev/null and b/sound/direct_sound_samples/cries/ninjask.aif differ diff --git a/sound/direct_sound_samples/cries/noctowl.aif b/sound/direct_sound_samples/cries/noctowl.aif new file mode 100644 index 000000000..9cb1b3165 Binary files /dev/null and b/sound/direct_sound_samples/cries/noctowl.aif differ diff --git a/sound/direct_sound_samples/cries/nosepass.aif b/sound/direct_sound_samples/cries/nosepass.aif new file mode 100644 index 000000000..f45dc7578 Binary files /dev/null and b/sound/direct_sound_samples/cries/nosepass.aif differ diff --git a/sound/direct_sound_samples/cries/numel.aif b/sound/direct_sound_samples/cries/numel.aif new file mode 100644 index 000000000..e81623531 Binary files /dev/null and b/sound/direct_sound_samples/cries/numel.aif differ diff --git a/sound/direct_sound_samples/cries/nuzleaf.aif b/sound/direct_sound_samples/cries/nuzleaf.aif new file mode 100644 index 000000000..275b4d178 Binary files /dev/null and b/sound/direct_sound_samples/cries/nuzleaf.aif differ diff --git a/sound/direct_sound_samples/cries/octillery.aif b/sound/direct_sound_samples/cries/octillery.aif new file mode 100644 index 000000000..f52b7978e Binary files /dev/null and b/sound/direct_sound_samples/cries/octillery.aif differ diff --git a/sound/direct_sound_samples/cries/oddish.aif b/sound/direct_sound_samples/cries/oddish.aif new file mode 100644 index 000000000..2c9902bb2 Binary files /dev/null and b/sound/direct_sound_samples/cries/oddish.aif differ diff --git a/sound/direct_sound_samples/cries/omanyte.aif b/sound/direct_sound_samples/cries/omanyte.aif new file mode 100644 index 000000000..7ee0a8e3f Binary files /dev/null and b/sound/direct_sound_samples/cries/omanyte.aif differ diff --git a/sound/direct_sound_samples/cries/omastar.aif b/sound/direct_sound_samples/cries/omastar.aif new file mode 100644 index 000000000..4c110a3fa Binary files /dev/null and b/sound/direct_sound_samples/cries/omastar.aif differ diff --git a/sound/direct_sound_samples/cries/onix.aif b/sound/direct_sound_samples/cries/onix.aif new file mode 100644 index 000000000..2f7c050e8 Binary files /dev/null and b/sound/direct_sound_samples/cries/onix.aif differ diff --git a/sound/direct_sound_samples/cries/oshawott.aif b/sound/direct_sound_samples/cries/oshawott.aif new file mode 100644 index 000000000..6e78b950d Binary files /dev/null and b/sound/direct_sound_samples/cries/oshawott.aif differ diff --git a/sound/direct_sound_samples/cries/pachirisu.aif b/sound/direct_sound_samples/cries/pachirisu.aif new file mode 100644 index 000000000..7f540482d Binary files /dev/null and b/sound/direct_sound_samples/cries/pachirisu.aif differ diff --git a/sound/direct_sound_samples/cries/palkia.aif b/sound/direct_sound_samples/cries/palkia.aif new file mode 100644 index 000000000..e755ceace Binary files /dev/null and b/sound/direct_sound_samples/cries/palkia.aif differ diff --git a/sound/direct_sound_samples/cries/palpitoad.aif b/sound/direct_sound_samples/cries/palpitoad.aif new file mode 100644 index 000000000..637965880 Binary files /dev/null and b/sound/direct_sound_samples/cries/palpitoad.aif differ diff --git a/sound/direct_sound_samples/cries/panpour.aif b/sound/direct_sound_samples/cries/panpour.aif new file mode 100644 index 000000000..ba8b78d04 Binary files /dev/null and b/sound/direct_sound_samples/cries/panpour.aif differ diff --git a/sound/direct_sound_samples/cries/pansage.aif b/sound/direct_sound_samples/cries/pansage.aif new file mode 100644 index 000000000..b380d2fb0 Binary files /dev/null and b/sound/direct_sound_samples/cries/pansage.aif differ diff --git a/sound/direct_sound_samples/cries/pansear.aif b/sound/direct_sound_samples/cries/pansear.aif new file mode 100644 index 000000000..f8409cb13 Binary files /dev/null and b/sound/direct_sound_samples/cries/pansear.aif differ diff --git a/sound/direct_sound_samples/cries/paras.aif b/sound/direct_sound_samples/cries/paras.aif new file mode 100644 index 000000000..a865d25b6 Binary files /dev/null and b/sound/direct_sound_samples/cries/paras.aif differ diff --git a/sound/direct_sound_samples/cries/parasect.aif b/sound/direct_sound_samples/cries/parasect.aif new file mode 100644 index 000000000..0e3338a60 Binary files /dev/null and b/sound/direct_sound_samples/cries/parasect.aif differ diff --git a/sound/direct_sound_samples/cries/patrat.aif b/sound/direct_sound_samples/cries/patrat.aif new file mode 100644 index 000000000..37015b78d Binary files /dev/null and b/sound/direct_sound_samples/cries/patrat.aif differ diff --git a/sound/direct_sound_samples/cries/pawniard.aif b/sound/direct_sound_samples/cries/pawniard.aif new file mode 100644 index 000000000..bb41ae40f Binary files /dev/null and b/sound/direct_sound_samples/cries/pawniard.aif differ diff --git a/sound/direct_sound_samples/cries/pelipper.aif b/sound/direct_sound_samples/cries/pelipper.aif new file mode 100644 index 000000000..efe9f28ec Binary files /dev/null and b/sound/direct_sound_samples/cries/pelipper.aif differ diff --git a/sound/direct_sound_samples/cries/persian.aif b/sound/direct_sound_samples/cries/persian.aif new file mode 100644 index 000000000..2b46dffd2 Binary files /dev/null and b/sound/direct_sound_samples/cries/persian.aif differ diff --git a/sound/direct_sound_samples/cries/petilil.aif b/sound/direct_sound_samples/cries/petilil.aif new file mode 100644 index 000000000..05a9cd783 Binary files /dev/null and b/sound/direct_sound_samples/cries/petilil.aif differ diff --git a/sound/direct_sound_samples/cries/phanpy.aif b/sound/direct_sound_samples/cries/phanpy.aif new file mode 100644 index 000000000..6f95e2907 Binary files /dev/null and b/sound/direct_sound_samples/cries/phanpy.aif differ diff --git a/sound/direct_sound_samples/cries/phione.aif b/sound/direct_sound_samples/cries/phione.aif new file mode 100644 index 000000000..ee295292d Binary files /dev/null and b/sound/direct_sound_samples/cries/phione.aif differ diff --git a/sound/direct_sound_samples/cries/pichu.aif b/sound/direct_sound_samples/cries/pichu.aif new file mode 100644 index 000000000..6ef7547f9 Binary files /dev/null and b/sound/direct_sound_samples/cries/pichu.aif differ diff --git a/sound/direct_sound_samples/cries/pidgeot.aif b/sound/direct_sound_samples/cries/pidgeot.aif new file mode 100644 index 000000000..2e29607ad Binary files /dev/null and b/sound/direct_sound_samples/cries/pidgeot.aif differ diff --git a/sound/direct_sound_samples/cries/pidgeotto.aif b/sound/direct_sound_samples/cries/pidgeotto.aif new file mode 100644 index 000000000..102e3afb5 Binary files /dev/null and b/sound/direct_sound_samples/cries/pidgeotto.aif differ diff --git a/sound/direct_sound_samples/cries/pidgey.aif b/sound/direct_sound_samples/cries/pidgey.aif new file mode 100644 index 000000000..14d8284b9 Binary files /dev/null and b/sound/direct_sound_samples/cries/pidgey.aif differ diff --git a/sound/direct_sound_samples/cries/pidove.aif b/sound/direct_sound_samples/cries/pidove.aif new file mode 100644 index 000000000..1459e7c08 Binary files /dev/null and b/sound/direct_sound_samples/cries/pidove.aif differ diff --git a/sound/direct_sound_samples/cries/pignite.aif b/sound/direct_sound_samples/cries/pignite.aif new file mode 100644 index 000000000..73c005364 Binary files /dev/null and b/sound/direct_sound_samples/cries/pignite.aif differ diff --git a/sound/direct_sound_samples/cries/pikachu.aif b/sound/direct_sound_samples/cries/pikachu.aif new file mode 100644 index 000000000..30c770165 Binary files /dev/null and b/sound/direct_sound_samples/cries/pikachu.aif differ diff --git a/sound/direct_sound_samples/cries/piloswine.aif b/sound/direct_sound_samples/cries/piloswine.aif new file mode 100644 index 000000000..6b6fd0a2d Binary files /dev/null and b/sound/direct_sound_samples/cries/piloswine.aif differ diff --git a/sound/direct_sound_samples/cries/pineco.aif b/sound/direct_sound_samples/cries/pineco.aif new file mode 100644 index 000000000..6f02c1369 Binary files /dev/null and b/sound/direct_sound_samples/cries/pineco.aif differ diff --git a/sound/direct_sound_samples/cries/pinsir.aif b/sound/direct_sound_samples/cries/pinsir.aif new file mode 100644 index 000000000..995999b68 Binary files /dev/null and b/sound/direct_sound_samples/cries/pinsir.aif differ diff --git a/sound/direct_sound_samples/cries/piplup.aif b/sound/direct_sound_samples/cries/piplup.aif new file mode 100644 index 000000000..1f7da9b20 Binary files /dev/null and b/sound/direct_sound_samples/cries/piplup.aif differ diff --git a/sound/direct_sound_samples/cries/plusle.aif b/sound/direct_sound_samples/cries/plusle.aif new file mode 100644 index 000000000..2c023697f Binary files /dev/null and b/sound/direct_sound_samples/cries/plusle.aif differ diff --git a/sound/direct_sound_samples/cries/politoed.aif b/sound/direct_sound_samples/cries/politoed.aif new file mode 100644 index 000000000..75e7f20ef Binary files /dev/null and b/sound/direct_sound_samples/cries/politoed.aif differ diff --git a/sound/direct_sound_samples/cries/poliwag.aif b/sound/direct_sound_samples/cries/poliwag.aif new file mode 100644 index 000000000..f4ee16174 Binary files /dev/null and b/sound/direct_sound_samples/cries/poliwag.aif differ diff --git a/sound/direct_sound_samples/cries/poliwhirl.aif b/sound/direct_sound_samples/cries/poliwhirl.aif new file mode 100644 index 000000000..31ffeb044 Binary files /dev/null and b/sound/direct_sound_samples/cries/poliwhirl.aif differ diff --git a/sound/direct_sound_samples/cries/poliwrath.aif b/sound/direct_sound_samples/cries/poliwrath.aif new file mode 100644 index 000000000..ba1aac528 Binary files /dev/null and b/sound/direct_sound_samples/cries/poliwrath.aif differ diff --git a/sound/direct_sound_samples/cries/ponyta.aif b/sound/direct_sound_samples/cries/ponyta.aif new file mode 100644 index 000000000..121dbb394 Binary files /dev/null and b/sound/direct_sound_samples/cries/ponyta.aif differ diff --git a/sound/direct_sound_samples/cries/poochyena.aif b/sound/direct_sound_samples/cries/poochyena.aif new file mode 100644 index 000000000..d7bad7c90 Binary files /dev/null and b/sound/direct_sound_samples/cries/poochyena.aif differ diff --git a/sound/direct_sound_samples/cries/porygon.aif b/sound/direct_sound_samples/cries/porygon.aif new file mode 100644 index 000000000..9179a9d75 Binary files /dev/null and b/sound/direct_sound_samples/cries/porygon.aif differ diff --git a/sound/direct_sound_samples/cries/porygon2.aif b/sound/direct_sound_samples/cries/porygon2.aif new file mode 100644 index 000000000..2e6ae0b1f Binary files /dev/null and b/sound/direct_sound_samples/cries/porygon2.aif differ diff --git a/sound/direct_sound_samples/cries/porygon_z.aif b/sound/direct_sound_samples/cries/porygon_z.aif new file mode 100644 index 000000000..d969b5f1d Binary files /dev/null and b/sound/direct_sound_samples/cries/porygon_z.aif differ diff --git a/sound/direct_sound_samples/cries/primeape.aif b/sound/direct_sound_samples/cries/primeape.aif new file mode 100644 index 000000000..ef53c2146 Binary files /dev/null and b/sound/direct_sound_samples/cries/primeape.aif differ diff --git a/sound/direct_sound_samples/cries/prinplup.aif b/sound/direct_sound_samples/cries/prinplup.aif new file mode 100644 index 000000000..2550fd01c Binary files /dev/null and b/sound/direct_sound_samples/cries/prinplup.aif differ diff --git a/sound/direct_sound_samples/cries/probopass.aif b/sound/direct_sound_samples/cries/probopass.aif new file mode 100644 index 000000000..a8307da81 Binary files /dev/null and b/sound/direct_sound_samples/cries/probopass.aif differ diff --git a/sound/direct_sound_samples/cries/psyduck.aif b/sound/direct_sound_samples/cries/psyduck.aif new file mode 100644 index 000000000..881b55b60 Binary files /dev/null and b/sound/direct_sound_samples/cries/psyduck.aif differ diff --git a/sound/direct_sound_samples/cries/pupitar.aif b/sound/direct_sound_samples/cries/pupitar.aif new file mode 100644 index 000000000..dbbe3bbaf Binary files /dev/null and b/sound/direct_sound_samples/cries/pupitar.aif differ diff --git a/sound/direct_sound_samples/cries/purrloin.aif b/sound/direct_sound_samples/cries/purrloin.aif new file mode 100644 index 000000000..85cde5c7b Binary files /dev/null and b/sound/direct_sound_samples/cries/purrloin.aif differ diff --git a/sound/direct_sound_samples/cries/purugly.aif b/sound/direct_sound_samples/cries/purugly.aif new file mode 100644 index 000000000..d06f74fa5 Binary files /dev/null and b/sound/direct_sound_samples/cries/purugly.aif differ diff --git a/sound/direct_sound_samples/cries/quagsire.aif b/sound/direct_sound_samples/cries/quagsire.aif new file mode 100644 index 000000000..84330f4de Binary files /dev/null and b/sound/direct_sound_samples/cries/quagsire.aif differ diff --git a/sound/direct_sound_samples/cries/quilava.aif b/sound/direct_sound_samples/cries/quilava.aif new file mode 100644 index 000000000..7b3e35ffb Binary files /dev/null and b/sound/direct_sound_samples/cries/quilava.aif differ diff --git a/sound/direct_sound_samples/cries/qwilfish.aif b/sound/direct_sound_samples/cries/qwilfish.aif new file mode 100644 index 000000000..59d4c6db4 Binary files /dev/null and b/sound/direct_sound_samples/cries/qwilfish.aif differ diff --git a/sound/direct_sound_samples/cries/raichu.aif b/sound/direct_sound_samples/cries/raichu.aif new file mode 100644 index 000000000..b8ed0d4b3 Binary files /dev/null and b/sound/direct_sound_samples/cries/raichu.aif differ diff --git a/sound/direct_sound_samples/cries/raikou.aif b/sound/direct_sound_samples/cries/raikou.aif new file mode 100644 index 000000000..941cfca0f Binary files /dev/null and b/sound/direct_sound_samples/cries/raikou.aif differ diff --git a/sound/direct_sound_samples/cries/ralts.aif b/sound/direct_sound_samples/cries/ralts.aif new file mode 100644 index 000000000..de75400e1 Binary files /dev/null and b/sound/direct_sound_samples/cries/ralts.aif differ diff --git a/sound/direct_sound_samples/cries/rampardos.aif b/sound/direct_sound_samples/cries/rampardos.aif new file mode 100644 index 000000000..7134c57dd Binary files /dev/null and b/sound/direct_sound_samples/cries/rampardos.aif differ diff --git a/sound/direct_sound_samples/cries/rapidash.aif b/sound/direct_sound_samples/cries/rapidash.aif new file mode 100644 index 000000000..2dd536735 Binary files /dev/null and b/sound/direct_sound_samples/cries/rapidash.aif differ diff --git a/sound/direct_sound_samples/cries/raticate.aif b/sound/direct_sound_samples/cries/raticate.aif new file mode 100644 index 000000000..f7d605502 Binary files /dev/null and b/sound/direct_sound_samples/cries/raticate.aif differ diff --git a/sound/direct_sound_samples/cries/rattata.aif b/sound/direct_sound_samples/cries/rattata.aif new file mode 100644 index 000000000..73d2a718b Binary files /dev/null and b/sound/direct_sound_samples/cries/rattata.aif differ diff --git a/sound/direct_sound_samples/cries/rayquaza.aif b/sound/direct_sound_samples/cries/rayquaza.aif new file mode 100644 index 000000000..41fb48561 Binary files /dev/null and b/sound/direct_sound_samples/cries/rayquaza.aif differ diff --git a/sound/direct_sound_samples/cries/regice.aif b/sound/direct_sound_samples/cries/regice.aif new file mode 100644 index 000000000..488f06aa6 Binary files /dev/null and b/sound/direct_sound_samples/cries/regice.aif differ diff --git a/sound/direct_sound_samples/cries/regigigas.aif b/sound/direct_sound_samples/cries/regigigas.aif new file mode 100644 index 000000000..87ba6eda5 Binary files /dev/null and b/sound/direct_sound_samples/cries/regigigas.aif differ diff --git a/sound/direct_sound_samples/cries/regirock.aif b/sound/direct_sound_samples/cries/regirock.aif new file mode 100644 index 000000000..7540aa586 Binary files /dev/null and b/sound/direct_sound_samples/cries/regirock.aif differ diff --git a/sound/direct_sound_samples/cries/registeel.aif b/sound/direct_sound_samples/cries/registeel.aif new file mode 100644 index 000000000..95e783ff4 Binary files /dev/null and b/sound/direct_sound_samples/cries/registeel.aif differ diff --git a/sound/direct_sound_samples/cries/relicanth.aif b/sound/direct_sound_samples/cries/relicanth.aif new file mode 100644 index 000000000..6af29ea3d Binary files /dev/null and b/sound/direct_sound_samples/cries/relicanth.aif differ diff --git a/sound/direct_sound_samples/cries/remoraid.aif b/sound/direct_sound_samples/cries/remoraid.aif new file mode 100644 index 000000000..5016ec781 Binary files /dev/null and b/sound/direct_sound_samples/cries/remoraid.aif differ diff --git a/sound/direct_sound_samples/cries/reshiram.aif b/sound/direct_sound_samples/cries/reshiram.aif new file mode 100644 index 000000000..e8e187d65 Binary files /dev/null and b/sound/direct_sound_samples/cries/reshiram.aif differ diff --git a/sound/direct_sound_samples/cries/reuniclus.aif b/sound/direct_sound_samples/cries/reuniclus.aif new file mode 100644 index 000000000..677130d8b Binary files /dev/null and b/sound/direct_sound_samples/cries/reuniclus.aif differ diff --git a/sound/direct_sound_samples/cries/rhydon.aif b/sound/direct_sound_samples/cries/rhydon.aif new file mode 100644 index 000000000..7e862c560 Binary files /dev/null and b/sound/direct_sound_samples/cries/rhydon.aif differ diff --git a/sound/direct_sound_samples/cries/rhyhorn.aif b/sound/direct_sound_samples/cries/rhyhorn.aif new file mode 100644 index 000000000..f1eac45f0 Binary files /dev/null and b/sound/direct_sound_samples/cries/rhyhorn.aif differ diff --git a/sound/direct_sound_samples/cries/rhyperior.aif b/sound/direct_sound_samples/cries/rhyperior.aif new file mode 100644 index 000000000..1cc41c14c Binary files /dev/null and b/sound/direct_sound_samples/cries/rhyperior.aif differ diff --git a/sound/direct_sound_samples/cries/riolu.aif b/sound/direct_sound_samples/cries/riolu.aif new file mode 100644 index 000000000..c8fcaf034 Binary files /dev/null and b/sound/direct_sound_samples/cries/riolu.aif differ diff --git a/sound/direct_sound_samples/cries/roggenrola.aif b/sound/direct_sound_samples/cries/roggenrola.aif new file mode 100644 index 000000000..9ce801a0b Binary files /dev/null and b/sound/direct_sound_samples/cries/roggenrola.aif differ diff --git a/sound/direct_sound_samples/cries/roselia.aif b/sound/direct_sound_samples/cries/roselia.aif new file mode 100644 index 000000000..146771f8c Binary files /dev/null and b/sound/direct_sound_samples/cries/roselia.aif differ diff --git a/sound/direct_sound_samples/cries/roserade.aif b/sound/direct_sound_samples/cries/roserade.aif new file mode 100644 index 000000000..00a9430f2 Binary files /dev/null and b/sound/direct_sound_samples/cries/roserade.aif differ diff --git a/sound/direct_sound_samples/cries/rotom.aif b/sound/direct_sound_samples/cries/rotom.aif new file mode 100644 index 000000000..41468228d Binary files /dev/null and b/sound/direct_sound_samples/cries/rotom.aif differ diff --git a/sound/direct_sound_samples/cries/rufflet.aif b/sound/direct_sound_samples/cries/rufflet.aif new file mode 100644 index 000000000..5d59c04ea Binary files /dev/null and b/sound/direct_sound_samples/cries/rufflet.aif differ diff --git a/sound/direct_sound_samples/cries/sableye.aif b/sound/direct_sound_samples/cries/sableye.aif new file mode 100644 index 000000000..fb31e329d Binary files /dev/null and b/sound/direct_sound_samples/cries/sableye.aif differ diff --git a/sound/direct_sound_samples/cries/salamence.aif b/sound/direct_sound_samples/cries/salamence.aif new file mode 100644 index 000000000..6a2d63ca5 Binary files /dev/null and b/sound/direct_sound_samples/cries/salamence.aif differ diff --git a/sound/direct_sound_samples/cries/samurott.aif b/sound/direct_sound_samples/cries/samurott.aif new file mode 100644 index 000000000..96691f645 Binary files /dev/null and b/sound/direct_sound_samples/cries/samurott.aif differ diff --git a/sound/direct_sound_samples/cries/sandile.aif b/sound/direct_sound_samples/cries/sandile.aif new file mode 100644 index 000000000..2718b0238 Binary files /dev/null and b/sound/direct_sound_samples/cries/sandile.aif differ diff --git a/sound/direct_sound_samples/cries/sandshrew.aif b/sound/direct_sound_samples/cries/sandshrew.aif new file mode 100644 index 000000000..b9a73351b Binary files /dev/null and b/sound/direct_sound_samples/cries/sandshrew.aif differ diff --git a/sound/direct_sound_samples/cries/sandslash.aif b/sound/direct_sound_samples/cries/sandslash.aif new file mode 100644 index 000000000..29950ff0c Binary files /dev/null and b/sound/direct_sound_samples/cries/sandslash.aif differ diff --git a/sound/direct_sound_samples/cries/sawk.aif b/sound/direct_sound_samples/cries/sawk.aif new file mode 100644 index 000000000..5ae99e1cf Binary files /dev/null and b/sound/direct_sound_samples/cries/sawk.aif differ diff --git a/sound/direct_sound_samples/cries/sawsbuck.aif b/sound/direct_sound_samples/cries/sawsbuck.aif new file mode 100644 index 000000000..8204786ee Binary files /dev/null and b/sound/direct_sound_samples/cries/sawsbuck.aif differ diff --git a/sound/direct_sound_samples/cries/sceptile.aif b/sound/direct_sound_samples/cries/sceptile.aif new file mode 100644 index 000000000..6c8820d17 Binary files /dev/null and b/sound/direct_sound_samples/cries/sceptile.aif differ diff --git a/sound/direct_sound_samples/cries/scizor.aif b/sound/direct_sound_samples/cries/scizor.aif new file mode 100644 index 000000000..87305f608 Binary files /dev/null and b/sound/direct_sound_samples/cries/scizor.aif differ diff --git a/sound/direct_sound_samples/cries/scolipede.aif b/sound/direct_sound_samples/cries/scolipede.aif new file mode 100644 index 000000000..687402d8c Binary files /dev/null and b/sound/direct_sound_samples/cries/scolipede.aif differ diff --git a/sound/direct_sound_samples/cries/scrafty.aif b/sound/direct_sound_samples/cries/scrafty.aif new file mode 100644 index 000000000..974fb0e13 Binary files /dev/null and b/sound/direct_sound_samples/cries/scrafty.aif differ diff --git a/sound/direct_sound_samples/cries/scraggy.aif b/sound/direct_sound_samples/cries/scraggy.aif new file mode 100644 index 000000000..3c024a8f4 Binary files /dev/null and b/sound/direct_sound_samples/cries/scraggy.aif differ diff --git a/sound/direct_sound_samples/cries/scyther.aif b/sound/direct_sound_samples/cries/scyther.aif new file mode 100644 index 000000000..441612854 Binary files /dev/null and b/sound/direct_sound_samples/cries/scyther.aif differ diff --git a/sound/direct_sound_samples/cries/seadra.aif b/sound/direct_sound_samples/cries/seadra.aif new file mode 100644 index 000000000..68bbc8745 Binary files /dev/null and b/sound/direct_sound_samples/cries/seadra.aif differ diff --git a/sound/direct_sound_samples/cries/seaking.aif b/sound/direct_sound_samples/cries/seaking.aif new file mode 100644 index 000000000..e4d56b9b0 Binary files /dev/null and b/sound/direct_sound_samples/cries/seaking.aif differ diff --git a/sound/direct_sound_samples/cries/sealeo.aif b/sound/direct_sound_samples/cries/sealeo.aif new file mode 100644 index 000000000..9cb4058c8 Binary files /dev/null and b/sound/direct_sound_samples/cries/sealeo.aif differ diff --git a/sound/direct_sound_samples/cries/seedot.aif b/sound/direct_sound_samples/cries/seedot.aif new file mode 100644 index 000000000..410e98328 Binary files /dev/null and b/sound/direct_sound_samples/cries/seedot.aif differ diff --git a/sound/direct_sound_samples/cries/seel.aif b/sound/direct_sound_samples/cries/seel.aif new file mode 100644 index 000000000..927a8fd6c Binary files /dev/null and b/sound/direct_sound_samples/cries/seel.aif differ diff --git a/sound/direct_sound_samples/cries/seismitoad.aif b/sound/direct_sound_samples/cries/seismitoad.aif new file mode 100644 index 000000000..2a88a1e77 Binary files /dev/null and b/sound/direct_sound_samples/cries/seismitoad.aif differ diff --git a/sound/direct_sound_samples/cries/sentret.aif b/sound/direct_sound_samples/cries/sentret.aif new file mode 100644 index 000000000..91b5fc456 Binary files /dev/null and b/sound/direct_sound_samples/cries/sentret.aif differ diff --git a/sound/direct_sound_samples/cries/serperior.aif b/sound/direct_sound_samples/cries/serperior.aif new file mode 100644 index 000000000..a14fa9f22 Binary files /dev/null and b/sound/direct_sound_samples/cries/serperior.aif differ diff --git a/sound/direct_sound_samples/cries/servine.aif b/sound/direct_sound_samples/cries/servine.aif new file mode 100644 index 000000000..dbe5c1063 Binary files /dev/null and b/sound/direct_sound_samples/cries/servine.aif differ diff --git a/sound/direct_sound_samples/cries/seviper.aif b/sound/direct_sound_samples/cries/seviper.aif new file mode 100644 index 000000000..32b069f06 Binary files /dev/null and b/sound/direct_sound_samples/cries/seviper.aif differ diff --git a/sound/direct_sound_samples/cries/sewaddle.aif b/sound/direct_sound_samples/cries/sewaddle.aif new file mode 100644 index 000000000..58ac18802 Binary files /dev/null and b/sound/direct_sound_samples/cries/sewaddle.aif differ diff --git a/sound/direct_sound_samples/cries/sharpedo.aif b/sound/direct_sound_samples/cries/sharpedo.aif new file mode 100644 index 000000000..2f01fa058 Binary files /dev/null and b/sound/direct_sound_samples/cries/sharpedo.aif differ diff --git a/sound/direct_sound_samples/cries/shaymin.aif b/sound/direct_sound_samples/cries/shaymin.aif new file mode 100644 index 000000000..f26ff7178 Binary files /dev/null and b/sound/direct_sound_samples/cries/shaymin.aif differ diff --git a/sound/direct_sound_samples/cries/shaymin_sky.aif b/sound/direct_sound_samples/cries/shaymin_sky.aif new file mode 100644 index 000000000..bd1cb0ed0 Binary files /dev/null and b/sound/direct_sound_samples/cries/shaymin_sky.aif differ diff --git a/sound/direct_sound_samples/cries/shedinja.aif b/sound/direct_sound_samples/cries/shedinja.aif new file mode 100644 index 000000000..ad19071a6 Binary files /dev/null and b/sound/direct_sound_samples/cries/shedinja.aif differ diff --git a/sound/direct_sound_samples/cries/shelgon.aif b/sound/direct_sound_samples/cries/shelgon.aif new file mode 100644 index 000000000..8df317b3a Binary files /dev/null and b/sound/direct_sound_samples/cries/shelgon.aif differ diff --git a/sound/direct_sound_samples/cries/shellder.aif b/sound/direct_sound_samples/cries/shellder.aif new file mode 100644 index 000000000..51513ae6a Binary files /dev/null and b/sound/direct_sound_samples/cries/shellder.aif differ diff --git a/sound/direct_sound_samples/cries/shellos.aif b/sound/direct_sound_samples/cries/shellos.aif new file mode 100644 index 000000000..2f6f095d0 Binary files /dev/null and b/sound/direct_sound_samples/cries/shellos.aif differ diff --git a/sound/direct_sound_samples/cries/shelmet.aif b/sound/direct_sound_samples/cries/shelmet.aif new file mode 100644 index 000000000..13bf69e3e Binary files /dev/null and b/sound/direct_sound_samples/cries/shelmet.aif differ diff --git a/sound/direct_sound_samples/cries/shieldon.aif b/sound/direct_sound_samples/cries/shieldon.aif new file mode 100644 index 000000000..44b564ccf Binary files /dev/null and b/sound/direct_sound_samples/cries/shieldon.aif differ diff --git a/sound/direct_sound_samples/cries/shiftry.aif b/sound/direct_sound_samples/cries/shiftry.aif new file mode 100644 index 000000000..970d5ef11 Binary files /dev/null and b/sound/direct_sound_samples/cries/shiftry.aif differ diff --git a/sound/direct_sound_samples/cries/shinx.aif b/sound/direct_sound_samples/cries/shinx.aif new file mode 100644 index 000000000..fcdae1cb7 Binary files /dev/null and b/sound/direct_sound_samples/cries/shinx.aif differ diff --git a/sound/direct_sound_samples/cries/shroomish.aif b/sound/direct_sound_samples/cries/shroomish.aif new file mode 100644 index 000000000..587cf6188 Binary files /dev/null and b/sound/direct_sound_samples/cries/shroomish.aif differ diff --git a/sound/direct_sound_samples/cries/shuckle.aif b/sound/direct_sound_samples/cries/shuckle.aif new file mode 100644 index 000000000..0844390f9 Binary files /dev/null and b/sound/direct_sound_samples/cries/shuckle.aif differ diff --git a/sound/direct_sound_samples/cries/shuppet.aif b/sound/direct_sound_samples/cries/shuppet.aif new file mode 100644 index 000000000..642123c46 Binary files /dev/null and b/sound/direct_sound_samples/cries/shuppet.aif differ diff --git a/sound/direct_sound_samples/cries/sigilyph.aif b/sound/direct_sound_samples/cries/sigilyph.aif new file mode 100644 index 000000000..544ebccd6 Binary files /dev/null and b/sound/direct_sound_samples/cries/sigilyph.aif differ diff --git a/sound/direct_sound_samples/cries/silcoon.aif b/sound/direct_sound_samples/cries/silcoon.aif new file mode 100644 index 000000000..b00697830 Binary files /dev/null and b/sound/direct_sound_samples/cries/silcoon.aif differ diff --git a/sound/direct_sound_samples/cries/simipour.aif b/sound/direct_sound_samples/cries/simipour.aif new file mode 100644 index 000000000..77640cd8b Binary files /dev/null and b/sound/direct_sound_samples/cries/simipour.aif differ diff --git a/sound/direct_sound_samples/cries/simisage.aif b/sound/direct_sound_samples/cries/simisage.aif new file mode 100644 index 000000000..078e69957 Binary files /dev/null and b/sound/direct_sound_samples/cries/simisage.aif differ diff --git a/sound/direct_sound_samples/cries/simisear.aif b/sound/direct_sound_samples/cries/simisear.aif new file mode 100644 index 000000000..2a767ae0f Binary files /dev/null and b/sound/direct_sound_samples/cries/simisear.aif differ diff --git a/sound/direct_sound_samples/cries/skarmory.aif b/sound/direct_sound_samples/cries/skarmory.aif new file mode 100644 index 000000000..10d365037 Binary files /dev/null and b/sound/direct_sound_samples/cries/skarmory.aif differ diff --git a/sound/direct_sound_samples/cries/skiploom.aif b/sound/direct_sound_samples/cries/skiploom.aif new file mode 100644 index 000000000..04c3a438e Binary files /dev/null and b/sound/direct_sound_samples/cries/skiploom.aif differ diff --git a/sound/direct_sound_samples/cries/skitty.aif b/sound/direct_sound_samples/cries/skitty.aif new file mode 100644 index 000000000..f200d7fae Binary files /dev/null and b/sound/direct_sound_samples/cries/skitty.aif differ diff --git a/sound/direct_sound_samples/cries/skorupi.aif b/sound/direct_sound_samples/cries/skorupi.aif new file mode 100644 index 000000000..22e22b6d4 Binary files /dev/null and b/sound/direct_sound_samples/cries/skorupi.aif differ diff --git a/sound/direct_sound_samples/cries/skuntank.aif b/sound/direct_sound_samples/cries/skuntank.aif new file mode 100644 index 000000000..90a00511e Binary files /dev/null and b/sound/direct_sound_samples/cries/skuntank.aif differ diff --git a/sound/direct_sound_samples/cries/slaking.aif b/sound/direct_sound_samples/cries/slaking.aif new file mode 100644 index 000000000..287b5a3b6 Binary files /dev/null and b/sound/direct_sound_samples/cries/slaking.aif differ diff --git a/sound/direct_sound_samples/cries/slakoth.aif b/sound/direct_sound_samples/cries/slakoth.aif new file mode 100644 index 000000000..67bc28459 Binary files /dev/null and b/sound/direct_sound_samples/cries/slakoth.aif differ diff --git a/sound/direct_sound_samples/cries/slowbro.aif b/sound/direct_sound_samples/cries/slowbro.aif new file mode 100644 index 000000000..b7d382189 Binary files /dev/null and b/sound/direct_sound_samples/cries/slowbro.aif differ diff --git a/sound/direct_sound_samples/cries/slowking.aif b/sound/direct_sound_samples/cries/slowking.aif new file mode 100644 index 000000000..20008c627 Binary files /dev/null and b/sound/direct_sound_samples/cries/slowking.aif differ diff --git a/sound/direct_sound_samples/cries/slowpoke.aif b/sound/direct_sound_samples/cries/slowpoke.aif new file mode 100644 index 000000000..ab7f5d6bc Binary files /dev/null and b/sound/direct_sound_samples/cries/slowpoke.aif differ diff --git a/sound/direct_sound_samples/cries/slugma.aif b/sound/direct_sound_samples/cries/slugma.aif new file mode 100644 index 000000000..d89032e4d Binary files /dev/null and b/sound/direct_sound_samples/cries/slugma.aif differ diff --git a/sound/direct_sound_samples/cries/smeargle.aif b/sound/direct_sound_samples/cries/smeargle.aif new file mode 100644 index 000000000..f59d7bb8a Binary files /dev/null and b/sound/direct_sound_samples/cries/smeargle.aif differ diff --git a/sound/direct_sound_samples/cries/smoochum.aif b/sound/direct_sound_samples/cries/smoochum.aif new file mode 100644 index 000000000..90253fcc3 Binary files /dev/null and b/sound/direct_sound_samples/cries/smoochum.aif differ diff --git a/sound/direct_sound_samples/cries/sneasel.aif b/sound/direct_sound_samples/cries/sneasel.aif new file mode 100644 index 000000000..ba0e84c04 Binary files /dev/null and b/sound/direct_sound_samples/cries/sneasel.aif differ diff --git a/sound/direct_sound_samples/cries/snivy.aif b/sound/direct_sound_samples/cries/snivy.aif new file mode 100644 index 000000000..fac1d4afd Binary files /dev/null and b/sound/direct_sound_samples/cries/snivy.aif differ diff --git a/sound/direct_sound_samples/cries/snorlax.aif b/sound/direct_sound_samples/cries/snorlax.aif new file mode 100644 index 000000000..d099fbf70 Binary files /dev/null and b/sound/direct_sound_samples/cries/snorlax.aif differ diff --git a/sound/direct_sound_samples/cries/snorunt.aif b/sound/direct_sound_samples/cries/snorunt.aif new file mode 100644 index 000000000..1c29a200d Binary files /dev/null and b/sound/direct_sound_samples/cries/snorunt.aif differ diff --git a/sound/direct_sound_samples/cries/snover.aif b/sound/direct_sound_samples/cries/snover.aif new file mode 100644 index 000000000..bd4f1a415 Binary files /dev/null and b/sound/direct_sound_samples/cries/snover.aif differ diff --git a/sound/direct_sound_samples/cries/snubbull.aif b/sound/direct_sound_samples/cries/snubbull.aif new file mode 100644 index 000000000..ff2e104b9 Binary files /dev/null and b/sound/direct_sound_samples/cries/snubbull.aif differ diff --git a/sound/direct_sound_samples/cries/solosis.aif b/sound/direct_sound_samples/cries/solosis.aif new file mode 100644 index 000000000..fa095e378 Binary files /dev/null and b/sound/direct_sound_samples/cries/solosis.aif differ diff --git a/sound/direct_sound_samples/cries/solrock.aif b/sound/direct_sound_samples/cries/solrock.aif new file mode 100644 index 000000000..2dc614c92 Binary files /dev/null and b/sound/direct_sound_samples/cries/solrock.aif differ diff --git a/sound/direct_sound_samples/cries/spearow.aif b/sound/direct_sound_samples/cries/spearow.aif new file mode 100644 index 000000000..beb87568e Binary files /dev/null and b/sound/direct_sound_samples/cries/spearow.aif differ diff --git a/sound/direct_sound_samples/cries/spheal.aif b/sound/direct_sound_samples/cries/spheal.aif new file mode 100644 index 000000000..eee9b636c Binary files /dev/null and b/sound/direct_sound_samples/cries/spheal.aif differ diff --git a/sound/direct_sound_samples/cries/spinarak.aif b/sound/direct_sound_samples/cries/spinarak.aif new file mode 100644 index 000000000..880e81df6 Binary files /dev/null and b/sound/direct_sound_samples/cries/spinarak.aif differ diff --git a/sound/direct_sound_samples/cries/spinda.aif b/sound/direct_sound_samples/cries/spinda.aif new file mode 100644 index 000000000..e5984de5b Binary files /dev/null and b/sound/direct_sound_samples/cries/spinda.aif differ diff --git a/sound/direct_sound_samples/cries/spiritomb.aif b/sound/direct_sound_samples/cries/spiritomb.aif new file mode 100644 index 000000000..2f5621b7c Binary files /dev/null and b/sound/direct_sound_samples/cries/spiritomb.aif differ diff --git a/sound/direct_sound_samples/cries/spoink.aif b/sound/direct_sound_samples/cries/spoink.aif new file mode 100644 index 000000000..af9e1a1eb Binary files /dev/null and b/sound/direct_sound_samples/cries/spoink.aif differ diff --git a/sound/direct_sound_samples/cries/squirtle.aif b/sound/direct_sound_samples/cries/squirtle.aif new file mode 100644 index 000000000..e570bc183 Binary files /dev/null and b/sound/direct_sound_samples/cries/squirtle.aif differ diff --git a/sound/direct_sound_samples/cries/stantler.aif b/sound/direct_sound_samples/cries/stantler.aif new file mode 100644 index 000000000..502840a83 Binary files /dev/null and b/sound/direct_sound_samples/cries/stantler.aif differ diff --git a/sound/direct_sound_samples/cries/staraptor.aif b/sound/direct_sound_samples/cries/staraptor.aif new file mode 100644 index 000000000..764a9d663 Binary files /dev/null and b/sound/direct_sound_samples/cries/staraptor.aif differ diff --git a/sound/direct_sound_samples/cries/staravia.aif b/sound/direct_sound_samples/cries/staravia.aif new file mode 100644 index 000000000..3326b3300 Binary files /dev/null and b/sound/direct_sound_samples/cries/staravia.aif differ diff --git a/sound/direct_sound_samples/cries/starly.aif b/sound/direct_sound_samples/cries/starly.aif new file mode 100644 index 000000000..00457fe6a Binary files /dev/null and b/sound/direct_sound_samples/cries/starly.aif differ diff --git a/sound/direct_sound_samples/cries/starmie.aif b/sound/direct_sound_samples/cries/starmie.aif new file mode 100644 index 000000000..3dea58cec Binary files /dev/null and b/sound/direct_sound_samples/cries/starmie.aif differ diff --git a/sound/direct_sound_samples/cries/staryu.aif b/sound/direct_sound_samples/cries/staryu.aif new file mode 100644 index 000000000..60b416a1c Binary files /dev/null and b/sound/direct_sound_samples/cries/staryu.aif differ diff --git a/sound/direct_sound_samples/cries/steelix.aif b/sound/direct_sound_samples/cries/steelix.aif new file mode 100644 index 000000000..75836d143 Binary files /dev/null and b/sound/direct_sound_samples/cries/steelix.aif differ diff --git a/sound/direct_sound_samples/cries/stoutland.aif b/sound/direct_sound_samples/cries/stoutland.aif new file mode 100644 index 000000000..0f8ff740c Binary files /dev/null and b/sound/direct_sound_samples/cries/stoutland.aif differ diff --git a/sound/direct_sound_samples/cries/stunfisk.aif b/sound/direct_sound_samples/cries/stunfisk.aif new file mode 100644 index 000000000..309dd54c9 Binary files /dev/null and b/sound/direct_sound_samples/cries/stunfisk.aif differ diff --git a/sound/direct_sound_samples/cries/stunky.aif b/sound/direct_sound_samples/cries/stunky.aif new file mode 100644 index 000000000..41923bd96 Binary files /dev/null and b/sound/direct_sound_samples/cries/stunky.aif differ diff --git a/sound/direct_sound_samples/cries/sudowoodo.aif b/sound/direct_sound_samples/cries/sudowoodo.aif new file mode 100644 index 000000000..c81a09531 Binary files /dev/null and b/sound/direct_sound_samples/cries/sudowoodo.aif differ diff --git a/sound/direct_sound_samples/cries/suicune.aif b/sound/direct_sound_samples/cries/suicune.aif new file mode 100644 index 000000000..863d4aded Binary files /dev/null and b/sound/direct_sound_samples/cries/suicune.aif differ diff --git a/sound/direct_sound_samples/cries/sunflora.aif b/sound/direct_sound_samples/cries/sunflora.aif new file mode 100644 index 000000000..c14458082 Binary files /dev/null and b/sound/direct_sound_samples/cries/sunflora.aif differ diff --git a/sound/direct_sound_samples/cries/sunkern.aif b/sound/direct_sound_samples/cries/sunkern.aif new file mode 100644 index 000000000..54ab4fba5 Binary files /dev/null and b/sound/direct_sound_samples/cries/sunkern.aif differ diff --git a/sound/direct_sound_samples/cries/surskit.aif b/sound/direct_sound_samples/cries/surskit.aif new file mode 100644 index 000000000..9898e58f1 Binary files /dev/null and b/sound/direct_sound_samples/cries/surskit.aif differ diff --git a/sound/direct_sound_samples/cries/swablu.aif b/sound/direct_sound_samples/cries/swablu.aif new file mode 100644 index 000000000..75e1555b7 Binary files /dev/null and b/sound/direct_sound_samples/cries/swablu.aif differ diff --git a/sound/direct_sound_samples/cries/swadloon.aif b/sound/direct_sound_samples/cries/swadloon.aif new file mode 100644 index 000000000..d5b3a25c6 Binary files /dev/null and b/sound/direct_sound_samples/cries/swadloon.aif differ diff --git a/sound/direct_sound_samples/cries/swalot.aif b/sound/direct_sound_samples/cries/swalot.aif new file mode 100644 index 000000000..45c0b0b85 Binary files /dev/null and b/sound/direct_sound_samples/cries/swalot.aif differ diff --git a/sound/direct_sound_samples/cries/swampert.aif b/sound/direct_sound_samples/cries/swampert.aif new file mode 100644 index 000000000..613e75261 Binary files /dev/null and b/sound/direct_sound_samples/cries/swampert.aif differ diff --git a/sound/direct_sound_samples/cries/swanna.aif b/sound/direct_sound_samples/cries/swanna.aif new file mode 100644 index 000000000..ac9fe12ae Binary files /dev/null and b/sound/direct_sound_samples/cries/swanna.aif differ diff --git a/sound/direct_sound_samples/cries/swellow.aif b/sound/direct_sound_samples/cries/swellow.aif new file mode 100644 index 000000000..9ddeec705 Binary files /dev/null and b/sound/direct_sound_samples/cries/swellow.aif differ diff --git a/sound/direct_sound_samples/cries/swinub.aif b/sound/direct_sound_samples/cries/swinub.aif new file mode 100644 index 000000000..375f1b60a Binary files /dev/null and b/sound/direct_sound_samples/cries/swinub.aif differ diff --git a/sound/direct_sound_samples/cries/swoobat.aif b/sound/direct_sound_samples/cries/swoobat.aif new file mode 100644 index 000000000..4b15334b5 Binary files /dev/null and b/sound/direct_sound_samples/cries/swoobat.aif differ diff --git a/sound/direct_sound_samples/cries/taillow.aif b/sound/direct_sound_samples/cries/taillow.aif new file mode 100644 index 000000000..9cbf5bcd6 Binary files /dev/null and b/sound/direct_sound_samples/cries/taillow.aif differ diff --git a/sound/direct_sound_samples/cries/tangela.aif b/sound/direct_sound_samples/cries/tangela.aif new file mode 100644 index 000000000..a3962027c Binary files /dev/null and b/sound/direct_sound_samples/cries/tangela.aif differ diff --git a/sound/direct_sound_samples/cries/tangrowth.aif b/sound/direct_sound_samples/cries/tangrowth.aif new file mode 100644 index 000000000..0f3ca5490 Binary files /dev/null and b/sound/direct_sound_samples/cries/tangrowth.aif differ diff --git a/sound/direct_sound_samples/cries/tauros.aif b/sound/direct_sound_samples/cries/tauros.aif new file mode 100644 index 000000000..fb79a648a Binary files /dev/null and b/sound/direct_sound_samples/cries/tauros.aif differ diff --git a/sound/direct_sound_samples/cries/teddiursa.aif b/sound/direct_sound_samples/cries/teddiursa.aif new file mode 100644 index 000000000..dc99db734 Binary files /dev/null and b/sound/direct_sound_samples/cries/teddiursa.aif differ diff --git a/sound/direct_sound_samples/cries/tentacool.aif b/sound/direct_sound_samples/cries/tentacool.aif new file mode 100644 index 000000000..f3b32c741 Binary files /dev/null and b/sound/direct_sound_samples/cries/tentacool.aif differ diff --git a/sound/direct_sound_samples/cries/tentacruel.aif b/sound/direct_sound_samples/cries/tentacruel.aif new file mode 100644 index 000000000..13b91bbd3 Binary files /dev/null and b/sound/direct_sound_samples/cries/tentacruel.aif differ diff --git a/sound/direct_sound_samples/cries/tepig.aif b/sound/direct_sound_samples/cries/tepig.aif new file mode 100644 index 000000000..63b19c40b Binary files /dev/null and b/sound/direct_sound_samples/cries/tepig.aif differ diff --git a/sound/direct_sound_samples/cries/terrakion.aif b/sound/direct_sound_samples/cries/terrakion.aif new file mode 100644 index 000000000..dcae3a465 Binary files /dev/null and b/sound/direct_sound_samples/cries/terrakion.aif differ diff --git a/sound/direct_sound_samples/cries/throh.aif b/sound/direct_sound_samples/cries/throh.aif new file mode 100644 index 000000000..5192e50ac Binary files /dev/null and b/sound/direct_sound_samples/cries/throh.aif differ diff --git a/sound/direct_sound_samples/cries/thundurus.aif b/sound/direct_sound_samples/cries/thundurus.aif new file mode 100644 index 000000000..75a1af958 Binary files /dev/null and b/sound/direct_sound_samples/cries/thundurus.aif differ diff --git a/sound/direct_sound_samples/cries/thundurus_therian.aif b/sound/direct_sound_samples/cries/thundurus_therian.aif new file mode 100644 index 000000000..318201f1b Binary files /dev/null and b/sound/direct_sound_samples/cries/thundurus_therian.aif differ diff --git a/sound/direct_sound_samples/cries/timburr.aif b/sound/direct_sound_samples/cries/timburr.aif new file mode 100644 index 000000000..1374144d5 Binary files /dev/null and b/sound/direct_sound_samples/cries/timburr.aif differ diff --git a/sound/direct_sound_samples/cries/tirtouga.aif b/sound/direct_sound_samples/cries/tirtouga.aif new file mode 100644 index 000000000..0df1a695a Binary files /dev/null and b/sound/direct_sound_samples/cries/tirtouga.aif differ diff --git a/sound/direct_sound_samples/cries/togekiss.aif b/sound/direct_sound_samples/cries/togekiss.aif new file mode 100644 index 000000000..a365ddd94 Binary files /dev/null and b/sound/direct_sound_samples/cries/togekiss.aif differ diff --git a/sound/direct_sound_samples/cries/togepi.aif b/sound/direct_sound_samples/cries/togepi.aif new file mode 100644 index 000000000..351fea00f Binary files /dev/null and b/sound/direct_sound_samples/cries/togepi.aif differ diff --git a/sound/direct_sound_samples/cries/togetic.aif b/sound/direct_sound_samples/cries/togetic.aif new file mode 100644 index 000000000..6fd29b73d Binary files /dev/null and b/sound/direct_sound_samples/cries/togetic.aif differ diff --git a/sound/direct_sound_samples/cries/torchic.aif b/sound/direct_sound_samples/cries/torchic.aif new file mode 100644 index 000000000..0f39232bf Binary files /dev/null and b/sound/direct_sound_samples/cries/torchic.aif differ diff --git a/sound/direct_sound_samples/cries/torkoal.aif b/sound/direct_sound_samples/cries/torkoal.aif new file mode 100644 index 000000000..cfdcd3971 Binary files /dev/null and b/sound/direct_sound_samples/cries/torkoal.aif differ diff --git a/sound/direct_sound_samples/cries/tornadus.aif b/sound/direct_sound_samples/cries/tornadus.aif new file mode 100644 index 000000000..17107f6e2 Binary files /dev/null and b/sound/direct_sound_samples/cries/tornadus.aif differ diff --git a/sound/direct_sound_samples/cries/tornadus_therian.aif b/sound/direct_sound_samples/cries/tornadus_therian.aif new file mode 100644 index 000000000..ff5993e96 Binary files /dev/null and b/sound/direct_sound_samples/cries/tornadus_therian.aif differ diff --git a/sound/direct_sound_samples/cries/torterra.aif b/sound/direct_sound_samples/cries/torterra.aif new file mode 100644 index 000000000..3f0960d9a Binary files /dev/null and b/sound/direct_sound_samples/cries/torterra.aif differ diff --git a/sound/direct_sound_samples/cries/totodile.aif b/sound/direct_sound_samples/cries/totodile.aif new file mode 100644 index 000000000..d87de7d52 Binary files /dev/null and b/sound/direct_sound_samples/cries/totodile.aif differ diff --git a/sound/direct_sound_samples/cries/toxicroak.aif b/sound/direct_sound_samples/cries/toxicroak.aif new file mode 100644 index 000000000..676e53276 Binary files /dev/null and b/sound/direct_sound_samples/cries/toxicroak.aif differ diff --git a/sound/direct_sound_samples/cries/tranquill.aif b/sound/direct_sound_samples/cries/tranquill.aif new file mode 100644 index 000000000..f5c652fb1 Binary files /dev/null and b/sound/direct_sound_samples/cries/tranquill.aif differ diff --git a/sound/direct_sound_samples/cries/trapinch.aif b/sound/direct_sound_samples/cries/trapinch.aif new file mode 100644 index 000000000..03e1b1a94 Binary files /dev/null and b/sound/direct_sound_samples/cries/trapinch.aif differ diff --git a/sound/direct_sound_samples/cries/treecko.aif b/sound/direct_sound_samples/cries/treecko.aif new file mode 100644 index 000000000..5ee12d7b9 Binary files /dev/null and b/sound/direct_sound_samples/cries/treecko.aif differ diff --git a/sound/direct_sound_samples/cries/tropius.aif b/sound/direct_sound_samples/cries/tropius.aif new file mode 100644 index 000000000..17359795e Binary files /dev/null and b/sound/direct_sound_samples/cries/tropius.aif differ diff --git a/sound/direct_sound_samples/cries/trubbish.aif b/sound/direct_sound_samples/cries/trubbish.aif new file mode 100644 index 000000000..321f1baa1 Binary files /dev/null and b/sound/direct_sound_samples/cries/trubbish.aif differ diff --git a/sound/direct_sound_samples/cries/turtwig.aif b/sound/direct_sound_samples/cries/turtwig.aif new file mode 100644 index 000000000..3de56621b Binary files /dev/null and b/sound/direct_sound_samples/cries/turtwig.aif differ diff --git a/sound/direct_sound_samples/cries/tympole.aif b/sound/direct_sound_samples/cries/tympole.aif new file mode 100644 index 000000000..774317ffb Binary files /dev/null and b/sound/direct_sound_samples/cries/tympole.aif differ diff --git a/sound/direct_sound_samples/cries/tynamo.aif b/sound/direct_sound_samples/cries/tynamo.aif new file mode 100644 index 000000000..bbb08cfdc Binary files /dev/null and b/sound/direct_sound_samples/cries/tynamo.aif differ diff --git a/sound/direct_sound_samples/cries/typhlosion.aif b/sound/direct_sound_samples/cries/typhlosion.aif new file mode 100644 index 000000000..c0f4f7de3 Binary files /dev/null and b/sound/direct_sound_samples/cries/typhlosion.aif differ diff --git a/sound/direct_sound_samples/cries/tyranitar.aif b/sound/direct_sound_samples/cries/tyranitar.aif new file mode 100644 index 000000000..54fcd8796 Binary files /dev/null and b/sound/direct_sound_samples/cries/tyranitar.aif differ diff --git a/sound/direct_sound_samples/cries/tyrogue.aif b/sound/direct_sound_samples/cries/tyrogue.aif new file mode 100644 index 000000000..5cbb4792f Binary files /dev/null and b/sound/direct_sound_samples/cries/tyrogue.aif differ diff --git a/sound/direct_sound_samples/cries/umbreon.aif b/sound/direct_sound_samples/cries/umbreon.aif new file mode 100644 index 000000000..b28a8602a Binary files /dev/null and b/sound/direct_sound_samples/cries/umbreon.aif differ diff --git a/sound/direct_sound_samples/cries/cry_not_aegislash.aif b/sound/direct_sound_samples/cries/uncomp_aegislash.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_aegislash.aif rename to sound/direct_sound_samples/cries/uncomp_aegislash.aif diff --git a/sound/direct_sound_samples/cries/cry_not_alcremie.aif b/sound/direct_sound_samples/cries/uncomp_alcremie.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_alcremie.aif rename to sound/direct_sound_samples/cries/uncomp_alcremie.aif diff --git a/sound/direct_sound_samples/cries/cry_not_amaura.aif b/sound/direct_sound_samples/cries/uncomp_amaura.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_amaura.aif rename to sound/direct_sound_samples/cries/uncomp_amaura.aif diff --git a/sound/direct_sound_samples/cries/cry_not_appletun.aif b/sound/direct_sound_samples/cries/uncomp_appletun.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_appletun.aif rename to sound/direct_sound_samples/cries/uncomp_appletun.aif diff --git a/sound/direct_sound_samples/cries/cry_not_applin.aif b/sound/direct_sound_samples/cries/uncomp_applin.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_applin.aif rename to sound/direct_sound_samples/cries/uncomp_applin.aif diff --git a/sound/direct_sound_samples/cries/cry_not_araquanid.aif b/sound/direct_sound_samples/cries/uncomp_araquanid.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_araquanid.aif rename to sound/direct_sound_samples/cries/uncomp_araquanid.aif diff --git a/sound/direct_sound_samples/cries/cry_not_arctovish.aif b/sound/direct_sound_samples/cries/uncomp_arctovish.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_arctovish.aif rename to sound/direct_sound_samples/cries/uncomp_arctovish.aif diff --git a/sound/direct_sound_samples/cries/cry_not_arctozolt.aif b/sound/direct_sound_samples/cries/uncomp_arctozolt.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_arctozolt.aif rename to sound/direct_sound_samples/cries/uncomp_arctozolt.aif diff --git a/sound/direct_sound_samples/cries/cry_not_aromatisse.aif b/sound/direct_sound_samples/cries/uncomp_aromatisse.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_aromatisse.aif rename to sound/direct_sound_samples/cries/uncomp_aromatisse.aif diff --git a/sound/direct_sound_samples/cries/cry_not_arrokuda.aif b/sound/direct_sound_samples/cries/uncomp_arrokuda.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_arrokuda.aif rename to sound/direct_sound_samples/cries/uncomp_arrokuda.aif diff --git a/sound/direct_sound_samples/cries/cry_not_aurorus.aif b/sound/direct_sound_samples/cries/uncomp_aurorus.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_aurorus.aif rename to sound/direct_sound_samples/cries/uncomp_aurorus.aif diff --git a/sound/direct_sound_samples/cries/cry_not_avalugg.aif b/sound/direct_sound_samples/cries/uncomp_avalugg.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_avalugg.aif rename to sound/direct_sound_samples/cries/uncomp_avalugg.aif diff --git a/sound/direct_sound_samples/cries/cry_not_barbaracle.aif b/sound/direct_sound_samples/cries/uncomp_barbaracle.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_barbaracle.aif rename to sound/direct_sound_samples/cries/uncomp_barbaracle.aif diff --git a/sound/direct_sound_samples/cries/cry_not_barraskewda.aif b/sound/direct_sound_samples/cries/uncomp_barraskewda.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_barraskewda.aif rename to sound/direct_sound_samples/cries/uncomp_barraskewda.aif diff --git a/sound/direct_sound_samples/cries/cry_not_bergmite.aif b/sound/direct_sound_samples/cries/uncomp_bergmite.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_bergmite.aif rename to sound/direct_sound_samples/cries/uncomp_bergmite.aif diff --git a/sound/direct_sound_samples/cries/cry_not_bewear.aif b/sound/direct_sound_samples/cries/uncomp_bewear.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_bewear.aif rename to sound/direct_sound_samples/cries/uncomp_bewear.aif diff --git a/sound/direct_sound_samples/cries/cry_not_binacle.aif b/sound/direct_sound_samples/cries/uncomp_binacle.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_binacle.aif rename to sound/direct_sound_samples/cries/uncomp_binacle.aif diff --git a/sound/direct_sound_samples/cries/cry_not_blacephalon.aif b/sound/direct_sound_samples/cries/uncomp_blacephalon.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_blacephalon.aif rename to sound/direct_sound_samples/cries/uncomp_blacephalon.aif diff --git a/sound/direct_sound_samples/cries/cry_not_blipbug.aif b/sound/direct_sound_samples/cries/uncomp_blipbug.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_blipbug.aif rename to sound/direct_sound_samples/cries/uncomp_blipbug.aif diff --git a/sound/direct_sound_samples/cries/cry_not_boltund.aif b/sound/direct_sound_samples/cries/uncomp_boltund.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_boltund.aif rename to sound/direct_sound_samples/cries/uncomp_boltund.aif diff --git a/sound/direct_sound_samples/cries/cry_not_bounsweet.aif b/sound/direct_sound_samples/cries/uncomp_bounsweet.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_bounsweet.aif rename to sound/direct_sound_samples/cries/uncomp_bounsweet.aif diff --git a/sound/direct_sound_samples/cries/cry_not_braixen.aif b/sound/direct_sound_samples/cries/uncomp_braixen.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_braixen.aif rename to sound/direct_sound_samples/cries/uncomp_braixen.aif diff --git a/sound/direct_sound_samples/cries/cry_not_brionne.aif b/sound/direct_sound_samples/cries/uncomp_brionne.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_brionne.aif rename to sound/direct_sound_samples/cries/uncomp_brionne.aif diff --git a/sound/direct_sound_samples/cries/cry_not_bruxish.aif b/sound/direct_sound_samples/cries/uncomp_bruxish.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_bruxish.aif rename to sound/direct_sound_samples/cries/uncomp_bruxish.aif diff --git a/sound/direct_sound_samples/cries/cry_not_bunnelby.aif b/sound/direct_sound_samples/cries/uncomp_bunnelby.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_bunnelby.aif rename to sound/direct_sound_samples/cries/uncomp_bunnelby.aif diff --git a/sound/direct_sound_samples/cries/cry_not_buzzwole.aif b/sound/direct_sound_samples/cries/uncomp_buzzwole.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_buzzwole.aif rename to sound/direct_sound_samples/cries/uncomp_buzzwole.aif diff --git a/sound/direct_sound_samples/cries/cry_not_calyrex.aif b/sound/direct_sound_samples/cries/uncomp_calyrex.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_calyrex.aif rename to sound/direct_sound_samples/cries/uncomp_calyrex.aif diff --git a/sound/direct_sound_samples/cries/cry_not_calyrex_ice_rider.aif b/sound/direct_sound_samples/cries/uncomp_calyrex_ice_rider.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_calyrex_ice_rider.aif rename to sound/direct_sound_samples/cries/uncomp_calyrex_ice_rider.aif diff --git a/sound/direct_sound_samples/cries/cry_not_calyrex_shadow_rider.aif b/sound/direct_sound_samples/cries/uncomp_calyrex_shadow_rider.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_calyrex_shadow_rider.aif rename to sound/direct_sound_samples/cries/uncomp_calyrex_shadow_rider.aif diff --git a/sound/direct_sound_samples/cries/cry_not_carbink.aif b/sound/direct_sound_samples/cries/uncomp_carbink.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_carbink.aif rename to sound/direct_sound_samples/cries/uncomp_carbink.aif diff --git a/sound/direct_sound_samples/cries/cry_not_carkol.aif b/sound/direct_sound_samples/cries/uncomp_carkol.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_carkol.aif rename to sound/direct_sound_samples/cries/uncomp_carkol.aif diff --git a/sound/direct_sound_samples/cries/cry_not_celesteela.aif b/sound/direct_sound_samples/cries/uncomp_celesteela.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_celesteela.aif rename to sound/direct_sound_samples/cries/uncomp_celesteela.aif diff --git a/sound/direct_sound_samples/cries/cry_not_centiskorch.aif b/sound/direct_sound_samples/cries/uncomp_centiskorch.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_centiskorch.aif rename to sound/direct_sound_samples/cries/uncomp_centiskorch.aif diff --git a/sound/direct_sound_samples/cries/cry_not_charjabug.aif b/sound/direct_sound_samples/cries/uncomp_charjabug.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_charjabug.aif rename to sound/direct_sound_samples/cries/uncomp_charjabug.aif diff --git a/sound/direct_sound_samples/cries/cry_not_chesnaught.aif b/sound/direct_sound_samples/cries/uncomp_chesnaught.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_chesnaught.aif rename to sound/direct_sound_samples/cries/uncomp_chesnaught.aif diff --git a/sound/direct_sound_samples/cries/cry_not_chespin.aif b/sound/direct_sound_samples/cries/uncomp_chespin.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_chespin.aif rename to sound/direct_sound_samples/cries/uncomp_chespin.aif diff --git a/sound/direct_sound_samples/cries/cry_not_chewtle.aif b/sound/direct_sound_samples/cries/uncomp_chewtle.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_chewtle.aif rename to sound/direct_sound_samples/cries/uncomp_chewtle.aif diff --git a/sound/direct_sound_samples/cries/cry_not_cinderace.aif b/sound/direct_sound_samples/cries/uncomp_cinderace.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_cinderace.aif rename to sound/direct_sound_samples/cries/uncomp_cinderace.aif diff --git a/sound/direct_sound_samples/cries/cry_not_clauncher.aif b/sound/direct_sound_samples/cries/uncomp_clauncher.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_clauncher.aif rename to sound/direct_sound_samples/cries/uncomp_clauncher.aif diff --git a/sound/direct_sound_samples/cries/cry_not_clawitzer.aif b/sound/direct_sound_samples/cries/uncomp_clawitzer.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_clawitzer.aif rename to sound/direct_sound_samples/cries/uncomp_clawitzer.aif diff --git a/sound/direct_sound_samples/cries/cry_not_clobbopus.aif b/sound/direct_sound_samples/cries/uncomp_clobbopus.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_clobbopus.aif rename to sound/direct_sound_samples/cries/uncomp_clobbopus.aif diff --git a/sound/direct_sound_samples/cries/cry_not_coalossal.aif b/sound/direct_sound_samples/cries/uncomp_coalossal.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_coalossal.aif rename to sound/direct_sound_samples/cries/uncomp_coalossal.aif diff --git a/sound/direct_sound_samples/cries/cry_not_comfey.aif b/sound/direct_sound_samples/cries/uncomp_comfey.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_comfey.aif rename to sound/direct_sound_samples/cries/uncomp_comfey.aif diff --git a/sound/direct_sound_samples/cries/cry_not_copperajah.aif b/sound/direct_sound_samples/cries/uncomp_copperajah.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_copperajah.aif rename to sound/direct_sound_samples/cries/uncomp_copperajah.aif diff --git a/sound/direct_sound_samples/cries/cry_not_corviknight.aif b/sound/direct_sound_samples/cries/uncomp_corviknight.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_corviknight.aif rename to sound/direct_sound_samples/cries/uncomp_corviknight.aif diff --git a/sound/direct_sound_samples/cries/cry_not_corvisquire.aif b/sound/direct_sound_samples/cries/uncomp_corvisquire.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_corvisquire.aif rename to sound/direct_sound_samples/cries/uncomp_corvisquire.aif diff --git a/sound/direct_sound_samples/cries/cry_not_cosmoem.aif b/sound/direct_sound_samples/cries/uncomp_cosmoem.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_cosmoem.aif rename to sound/direct_sound_samples/cries/uncomp_cosmoem.aif diff --git a/sound/direct_sound_samples/cries/cry_not_cosmog.aif b/sound/direct_sound_samples/cries/uncomp_cosmog.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_cosmog.aif rename to sound/direct_sound_samples/cries/uncomp_cosmog.aif diff --git a/sound/direct_sound_samples/cries/cry_not_cottonee.aif b/sound/direct_sound_samples/cries/uncomp_cottonee.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_cottonee.aif rename to sound/direct_sound_samples/cries/uncomp_cottonee.aif diff --git a/sound/direct_sound_samples/cries/cry_not_crabominable.aif b/sound/direct_sound_samples/cries/uncomp_crabominable.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_crabominable.aif rename to sound/direct_sound_samples/cries/uncomp_crabominable.aif diff --git a/sound/direct_sound_samples/cries/cry_not_crabrawler.aif b/sound/direct_sound_samples/cries/uncomp_crabrawler.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_crabrawler.aif rename to sound/direct_sound_samples/cries/uncomp_crabrawler.aif diff --git a/sound/direct_sound_samples/cries/cry_not_cramorant.aif b/sound/direct_sound_samples/cries/uncomp_cramorant.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_cramorant.aif rename to sound/direct_sound_samples/cries/uncomp_cramorant.aif diff --git a/sound/direct_sound_samples/cries/cry_not_cufant.aif b/sound/direct_sound_samples/cries/uncomp_cufant.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_cufant.aif rename to sound/direct_sound_samples/cries/uncomp_cufant.aif diff --git a/sound/direct_sound_samples/cries/cry_not_cursola.aif b/sound/direct_sound_samples/cries/uncomp_cursola.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_cursola.aif rename to sound/direct_sound_samples/cries/uncomp_cursola.aif diff --git a/sound/direct_sound_samples/cries/cry_not_cutiefly.aif b/sound/direct_sound_samples/cries/uncomp_cutiefly.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_cutiefly.aif rename to sound/direct_sound_samples/cries/uncomp_cutiefly.aif diff --git a/sound/direct_sound_samples/cries/cry_not_dartrix.aif b/sound/direct_sound_samples/cries/uncomp_dartrix.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_dartrix.aif rename to sound/direct_sound_samples/cries/uncomp_dartrix.aif diff --git a/sound/direct_sound_samples/cries/cry_not_decidueye.aif b/sound/direct_sound_samples/cries/uncomp_decidueye.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_decidueye.aif rename to sound/direct_sound_samples/cries/uncomp_decidueye.aif diff --git a/sound/direct_sound_samples/cries/cry_not_dedenne.aif b/sound/direct_sound_samples/cries/uncomp_dedenne.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_dedenne.aif rename to sound/direct_sound_samples/cries/uncomp_dedenne.aif diff --git a/sound/direct_sound_samples/cries/cry_not_delphox.aif b/sound/direct_sound_samples/cries/uncomp_delphox.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_delphox.aif rename to sound/direct_sound_samples/cries/uncomp_delphox.aif diff --git a/sound/direct_sound_samples/cries/cry_not_dewpider.aif b/sound/direct_sound_samples/cries/uncomp_dewpider.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_dewpider.aif rename to sound/direct_sound_samples/cries/uncomp_dewpider.aif diff --git a/sound/direct_sound_samples/cries/cry_not_dhelmise.aif b/sound/direct_sound_samples/cries/uncomp_dhelmise.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_dhelmise.aif rename to sound/direct_sound_samples/cries/uncomp_dhelmise.aif diff --git a/sound/direct_sound_samples/cries/cry_not_diancie.aif b/sound/direct_sound_samples/cries/uncomp_diancie.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_diancie.aif rename to sound/direct_sound_samples/cries/uncomp_diancie.aif diff --git a/sound/direct_sound_samples/cries/cry_not_diggersby.aif b/sound/direct_sound_samples/cries/uncomp_diggersby.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_diggersby.aif rename to sound/direct_sound_samples/cries/uncomp_diggersby.aif diff --git a/sound/direct_sound_samples/cries/cry_not_dottler.aif b/sound/direct_sound_samples/cries/uncomp_dottler.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_dottler.aif rename to sound/direct_sound_samples/cries/uncomp_dottler.aif diff --git a/sound/direct_sound_samples/cries/cry_not_doublade.aif b/sound/direct_sound_samples/cries/uncomp_doublade.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_doublade.aif rename to sound/direct_sound_samples/cries/uncomp_doublade.aif diff --git a/sound/direct_sound_samples/cries/cry_not_dracovish.aif b/sound/direct_sound_samples/cries/uncomp_dracovish.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_dracovish.aif rename to sound/direct_sound_samples/cries/uncomp_dracovish.aif diff --git a/sound/direct_sound_samples/cries/cry_not_dracozolt.aif b/sound/direct_sound_samples/cries/uncomp_dracozolt.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_dracozolt.aif rename to sound/direct_sound_samples/cries/uncomp_dracozolt.aif diff --git a/sound/direct_sound_samples/cries/cry_not_dragalge.aif b/sound/direct_sound_samples/cries/uncomp_dragalge.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_dragalge.aif rename to sound/direct_sound_samples/cries/uncomp_dragalge.aif diff --git a/sound/direct_sound_samples/cries/cry_not_dragapult.aif b/sound/direct_sound_samples/cries/uncomp_dragapult.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_dragapult.aif rename to sound/direct_sound_samples/cries/uncomp_dragapult.aif diff --git a/sound/direct_sound_samples/cries/cry_not_drakloak.aif b/sound/direct_sound_samples/cries/uncomp_drakloak.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_drakloak.aif rename to sound/direct_sound_samples/cries/uncomp_drakloak.aif diff --git a/sound/direct_sound_samples/cries/cry_not_drampa.aif b/sound/direct_sound_samples/cries/uncomp_drampa.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_drampa.aif rename to sound/direct_sound_samples/cries/uncomp_drampa.aif diff --git a/sound/direct_sound_samples/cries/cry_not_drednaw.aif b/sound/direct_sound_samples/cries/uncomp_drednaw.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_drednaw.aif rename to sound/direct_sound_samples/cries/uncomp_drednaw.aif diff --git a/sound/direct_sound_samples/cries/cry_not_dreepy.aif b/sound/direct_sound_samples/cries/uncomp_dreepy.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_dreepy.aif rename to sound/direct_sound_samples/cries/uncomp_dreepy.aif diff --git a/sound/direct_sound_samples/cries/cry_not_drizzile.aif b/sound/direct_sound_samples/cries/uncomp_drizzile.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_drizzile.aif rename to sound/direct_sound_samples/cries/uncomp_drizzile.aif diff --git a/sound/direct_sound_samples/cries/cry_not_dubwool.aif b/sound/direct_sound_samples/cries/uncomp_dubwool.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_dubwool.aif rename to sound/direct_sound_samples/cries/uncomp_dubwool.aif diff --git a/sound/direct_sound_samples/cries/cry_not_duraludon.aif b/sound/direct_sound_samples/cries/uncomp_duraludon.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_duraludon.aif rename to sound/direct_sound_samples/cries/uncomp_duraludon.aif diff --git a/sound/direct_sound_samples/cries/cry_not_eiscue.aif b/sound/direct_sound_samples/cries/uncomp_eiscue.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_eiscue.aif rename to sound/direct_sound_samples/cries/uncomp_eiscue.aif diff --git a/sound/direct_sound_samples/cries/cry_not_eiscue_noice_face.aif b/sound/direct_sound_samples/cries/uncomp_eiscue_noice_face.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_eiscue_noice_face.aif rename to sound/direct_sound_samples/cries/uncomp_eiscue_noice_face.aif diff --git a/sound/direct_sound_samples/cries/cry_not_eldegoss.aif b/sound/direct_sound_samples/cries/uncomp_eldegoss.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_eldegoss.aif rename to sound/direct_sound_samples/cries/uncomp_eldegoss.aif diff --git a/sound/direct_sound_samples/cries/cry_not_elgyem.aif b/sound/direct_sound_samples/cries/uncomp_elgyem.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_elgyem.aif rename to sound/direct_sound_samples/cries/uncomp_elgyem.aif diff --git a/sound/direct_sound_samples/cries/cry_not_espurr.aif b/sound/direct_sound_samples/cries/uncomp_espurr.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_espurr.aif rename to sound/direct_sound_samples/cries/uncomp_espurr.aif diff --git a/sound/direct_sound_samples/cries/cry_not_eternatus.aif b/sound/direct_sound_samples/cries/uncomp_eternatus.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_eternatus.aif rename to sound/direct_sound_samples/cries/uncomp_eternatus.aif diff --git a/sound/direct_sound_samples/cries/cry_not_eternatus_eternamax.aif b/sound/direct_sound_samples/cries/uncomp_eternatus_eternamax.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_eternatus_eternamax.aif rename to sound/direct_sound_samples/cries/uncomp_eternatus_eternamax.aif diff --git a/sound/direct_sound_samples/cries/cry_not_falinks.aif b/sound/direct_sound_samples/cries/uncomp_falinks.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_falinks.aif rename to sound/direct_sound_samples/cries/uncomp_falinks.aif diff --git a/sound/direct_sound_samples/cries/cry_not_fennekin.aif b/sound/direct_sound_samples/cries/uncomp_fennekin.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_fennekin.aif rename to sound/direct_sound_samples/cries/uncomp_fennekin.aif diff --git a/sound/direct_sound_samples/cries/cry_not_flabebe.aif b/sound/direct_sound_samples/cries/uncomp_flabebe.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_flabebe.aif rename to sound/direct_sound_samples/cries/uncomp_flabebe.aif diff --git a/sound/direct_sound_samples/cries/cry_not_flapple.aif b/sound/direct_sound_samples/cries/uncomp_flapple.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_flapple.aif rename to sound/direct_sound_samples/cries/uncomp_flapple.aif diff --git a/sound/direct_sound_samples/cries/cry_not_fletchinder.aif b/sound/direct_sound_samples/cries/uncomp_fletchinder.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_fletchinder.aif rename to sound/direct_sound_samples/cries/uncomp_fletchinder.aif diff --git a/sound/direct_sound_samples/cries/cry_not_fletchling.aif b/sound/direct_sound_samples/cries/uncomp_fletchling.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_fletchling.aif rename to sound/direct_sound_samples/cries/uncomp_fletchling.aif diff --git a/sound/direct_sound_samples/cries/cry_not_floette.aif b/sound/direct_sound_samples/cries/uncomp_floette.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_floette.aif rename to sound/direct_sound_samples/cries/uncomp_floette.aif diff --git a/sound/direct_sound_samples/cries/cry_not_floette_eternal_flower.aif b/sound/direct_sound_samples/cries/uncomp_floette_eternal_flower.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_floette_eternal_flower.aif rename to sound/direct_sound_samples/cries/uncomp_floette_eternal_flower.aif diff --git a/sound/direct_sound_samples/cries/cry_not_florges.aif b/sound/direct_sound_samples/cries/uncomp_florges.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_florges.aif rename to sound/direct_sound_samples/cries/uncomp_florges.aif diff --git a/sound/direct_sound_samples/cries/cry_not_fomantis.aif b/sound/direct_sound_samples/cries/uncomp_fomantis.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_fomantis.aif rename to sound/direct_sound_samples/cries/uncomp_fomantis.aif diff --git a/sound/direct_sound_samples/cries/cry_not_foongus.aif b/sound/direct_sound_samples/cries/uncomp_foongus.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_foongus.aif rename to sound/direct_sound_samples/cries/uncomp_foongus.aif diff --git a/sound/direct_sound_samples/cries/cry_not_froakie.aif b/sound/direct_sound_samples/cries/uncomp_froakie.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_froakie.aif rename to sound/direct_sound_samples/cries/uncomp_froakie.aif diff --git a/sound/direct_sound_samples/cries/cry_not_frogadier.aif b/sound/direct_sound_samples/cries/uncomp_frogadier.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_frogadier.aif rename to sound/direct_sound_samples/cries/uncomp_frogadier.aif diff --git a/sound/direct_sound_samples/cries/cry_not_frosmoth.aif b/sound/direct_sound_samples/cries/uncomp_frosmoth.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_frosmoth.aif rename to sound/direct_sound_samples/cries/uncomp_frosmoth.aif diff --git a/sound/direct_sound_samples/cries/cry_not_furfrou.aif b/sound/direct_sound_samples/cries/uncomp_furfrou.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_furfrou.aif rename to sound/direct_sound_samples/cries/uncomp_furfrou.aif diff --git a/sound/direct_sound_samples/cries/cry_not_glastrier.aif b/sound/direct_sound_samples/cries/uncomp_glastrier.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_glastrier.aif rename to sound/direct_sound_samples/cries/uncomp_glastrier.aif diff --git a/sound/direct_sound_samples/cries/cry_not_gogoat.aif b/sound/direct_sound_samples/cries/uncomp_gogoat.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_gogoat.aif rename to sound/direct_sound_samples/cries/uncomp_gogoat.aif diff --git a/sound/direct_sound_samples/cries/cry_not_golisopod.aif b/sound/direct_sound_samples/cries/uncomp_golisopod.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_golisopod.aif rename to sound/direct_sound_samples/cries/uncomp_golisopod.aif diff --git a/sound/direct_sound_samples/cries/cry_not_goodra.aif b/sound/direct_sound_samples/cries/uncomp_goodra.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_goodra.aif rename to sound/direct_sound_samples/cries/uncomp_goodra.aif diff --git a/sound/direct_sound_samples/cries/cry_not_goomy.aif b/sound/direct_sound_samples/cries/uncomp_goomy.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_goomy.aif rename to sound/direct_sound_samples/cries/uncomp_goomy.aif diff --git a/sound/direct_sound_samples/cries/cry_not_gossifleur.aif b/sound/direct_sound_samples/cries/uncomp_gossifleur.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_gossifleur.aif rename to sound/direct_sound_samples/cries/uncomp_gossifleur.aif diff --git a/sound/direct_sound_samples/cries/cry_not_gourgeist.aif b/sound/direct_sound_samples/cries/uncomp_gourgeist.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_gourgeist.aif rename to sound/direct_sound_samples/cries/uncomp_gourgeist.aif diff --git a/sound/direct_sound_samples/cries/cry_not_gourgeist_super.aif b/sound/direct_sound_samples/cries/uncomp_gourgeist_super.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_gourgeist_super.aif rename to sound/direct_sound_samples/cries/uncomp_gourgeist_super.aif diff --git a/sound/direct_sound_samples/cries/cry_not_grapploct.aif b/sound/direct_sound_samples/cries/uncomp_grapploct.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_grapploct.aif rename to sound/direct_sound_samples/cries/uncomp_grapploct.aif diff --git a/sound/direct_sound_samples/cries/cry_not_greedent.aif b/sound/direct_sound_samples/cries/uncomp_greedent.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_greedent.aif rename to sound/direct_sound_samples/cries/uncomp_greedent.aif diff --git a/sound/direct_sound_samples/cries/cry_not_greninja.aif b/sound/direct_sound_samples/cries/uncomp_greninja.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_greninja.aif rename to sound/direct_sound_samples/cries/uncomp_greninja.aif diff --git a/sound/direct_sound_samples/cries/cry_not_grimmsnarl.aif b/sound/direct_sound_samples/cries/uncomp_grimmsnarl.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_grimmsnarl.aif rename to sound/direct_sound_samples/cries/uncomp_grimmsnarl.aif diff --git a/sound/direct_sound_samples/cries/cry_not_grookey.aif b/sound/direct_sound_samples/cries/uncomp_grookey.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_grookey.aif rename to sound/direct_sound_samples/cries/uncomp_grookey.aif diff --git a/sound/direct_sound_samples/cries/cry_not_grubbin.aif b/sound/direct_sound_samples/cries/uncomp_grubbin.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_grubbin.aif rename to sound/direct_sound_samples/cries/uncomp_grubbin.aif diff --git a/sound/direct_sound_samples/cries/cry_not_gumshoos.aif b/sound/direct_sound_samples/cries/uncomp_gumshoos.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_gumshoos.aif rename to sound/direct_sound_samples/cries/uncomp_gumshoos.aif diff --git a/sound/direct_sound_samples/cries/cry_not_guzzlord.aif b/sound/direct_sound_samples/cries/uncomp_guzzlord.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_guzzlord.aif rename to sound/direct_sound_samples/cries/uncomp_guzzlord.aif diff --git a/sound/direct_sound_samples/cries/cry_not_hakamo_o.aif b/sound/direct_sound_samples/cries/uncomp_hakamo_o.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_hakamo_o.aif rename to sound/direct_sound_samples/cries/uncomp_hakamo_o.aif diff --git a/sound/direct_sound_samples/cries/cry_not_hatenna.aif b/sound/direct_sound_samples/cries/uncomp_hatenna.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_hatenna.aif rename to sound/direct_sound_samples/cries/uncomp_hatenna.aif diff --git a/sound/direct_sound_samples/cries/cry_not_hatterene.aif b/sound/direct_sound_samples/cries/uncomp_hatterene.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_hatterene.aif rename to sound/direct_sound_samples/cries/uncomp_hatterene.aif diff --git a/sound/direct_sound_samples/cries/cry_not_hattrem.aif b/sound/direct_sound_samples/cries/uncomp_hattrem.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_hattrem.aif rename to sound/direct_sound_samples/cries/uncomp_hattrem.aif diff --git a/sound/direct_sound_samples/cries/cry_not_hawlucha.aif b/sound/direct_sound_samples/cries/uncomp_hawlucha.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_hawlucha.aif rename to sound/direct_sound_samples/cries/uncomp_hawlucha.aif diff --git a/sound/direct_sound_samples/cries/cry_not_heliolisk.aif b/sound/direct_sound_samples/cries/uncomp_heliolisk.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_heliolisk.aif rename to sound/direct_sound_samples/cries/uncomp_heliolisk.aif diff --git a/sound/direct_sound_samples/cries/cry_not_helioptile.aif b/sound/direct_sound_samples/cries/uncomp_helioptile.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_helioptile.aif rename to sound/direct_sound_samples/cries/uncomp_helioptile.aif diff --git a/sound/direct_sound_samples/cries/cry_not_honedge.aif b/sound/direct_sound_samples/cries/uncomp_honedge.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_honedge.aif rename to sound/direct_sound_samples/cries/uncomp_honedge.aif diff --git a/sound/direct_sound_samples/cries/cry_not_hoopa.aif b/sound/direct_sound_samples/cries/uncomp_hoopa.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_hoopa.aif rename to sound/direct_sound_samples/cries/uncomp_hoopa.aif diff --git a/sound/direct_sound_samples/cries/cry_not_hoopa_unbound.aif b/sound/direct_sound_samples/cries/uncomp_hoopa_unbound.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_hoopa_unbound.aif rename to sound/direct_sound_samples/cries/uncomp_hoopa_unbound.aif diff --git a/sound/direct_sound_samples/cries/cry_not_impidimp.aif b/sound/direct_sound_samples/cries/uncomp_impidimp.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_impidimp.aif rename to sound/direct_sound_samples/cries/uncomp_impidimp.aif diff --git a/sound/direct_sound_samples/cries/cry_not_incineroar.aif b/sound/direct_sound_samples/cries/uncomp_incineroar.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_incineroar.aif rename to sound/direct_sound_samples/cries/uncomp_incineroar.aif diff --git a/sound/direct_sound_samples/cries/cry_not_indeedee.aif b/sound/direct_sound_samples/cries/uncomp_indeedee.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_indeedee.aif rename to sound/direct_sound_samples/cries/uncomp_indeedee.aif diff --git a/sound/direct_sound_samples/cries/cry_not_indeedee_female.aif b/sound/direct_sound_samples/cries/uncomp_indeedee_female.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_indeedee_female.aif rename to sound/direct_sound_samples/cries/uncomp_indeedee_female.aif diff --git a/sound/direct_sound_samples/cries/cry_not_inkay.aif b/sound/direct_sound_samples/cries/uncomp_inkay.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_inkay.aif rename to sound/direct_sound_samples/cries/uncomp_inkay.aif diff --git a/sound/direct_sound_samples/cries/cry_not_inteleon.aif b/sound/direct_sound_samples/cries/uncomp_inteleon.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_inteleon.aif rename to sound/direct_sound_samples/cries/uncomp_inteleon.aif diff --git a/sound/direct_sound_samples/cries/cry_not_jangmo_o.aif b/sound/direct_sound_samples/cries/uncomp_jangmo_o.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_jangmo_o.aif rename to sound/direct_sound_samples/cries/uncomp_jangmo_o.aif diff --git a/sound/direct_sound_samples/cries/cry_not_kartana.aif b/sound/direct_sound_samples/cries/uncomp_kartana.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_kartana.aif rename to sound/direct_sound_samples/cries/uncomp_kartana.aif diff --git a/sound/direct_sound_samples/cries/cry_not_keldeo.aif b/sound/direct_sound_samples/cries/uncomp_keldeo.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_keldeo.aif rename to sound/direct_sound_samples/cries/uncomp_keldeo.aif diff --git a/sound/direct_sound_samples/cries/cry_not_klefki.aif b/sound/direct_sound_samples/cries/uncomp_klefki.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_klefki.aif rename to sound/direct_sound_samples/cries/uncomp_klefki.aif diff --git a/sound/direct_sound_samples/cries/cry_not_komala.aif b/sound/direct_sound_samples/cries/uncomp_komala.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_komala.aif rename to sound/direct_sound_samples/cries/uncomp_komala.aif diff --git a/sound/direct_sound_samples/cries/cry_not_kommo_o.aif b/sound/direct_sound_samples/cries/uncomp_kommo_o.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_kommo_o.aif rename to sound/direct_sound_samples/cries/uncomp_kommo_o.aif diff --git a/sound/direct_sound_samples/cries/cry_not_kubfu.aif b/sound/direct_sound_samples/cries/uncomp_kubfu.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_kubfu.aif rename to sound/direct_sound_samples/cries/uncomp_kubfu.aif diff --git a/sound/direct_sound_samples/cries/cry_not_litleo.aif b/sound/direct_sound_samples/cries/uncomp_litleo.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_litleo.aif rename to sound/direct_sound_samples/cries/uncomp_litleo.aif diff --git a/sound/direct_sound_samples/cries/cry_not_litten.aif b/sound/direct_sound_samples/cries/uncomp_litten.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_litten.aif rename to sound/direct_sound_samples/cries/uncomp_litten.aif diff --git a/sound/direct_sound_samples/cries/cry_not_lunala.aif b/sound/direct_sound_samples/cries/uncomp_lunala.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_lunala.aif rename to sound/direct_sound_samples/cries/uncomp_lunala.aif diff --git a/sound/direct_sound_samples/cries/cry_not_lurantis.aif b/sound/direct_sound_samples/cries/uncomp_lurantis.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_lurantis.aif rename to sound/direct_sound_samples/cries/uncomp_lurantis.aif diff --git a/sound/direct_sound_samples/cries/cry_not_lycanroc.aif b/sound/direct_sound_samples/cries/uncomp_lycanroc.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_lycanroc.aif rename to sound/direct_sound_samples/cries/uncomp_lycanroc.aif diff --git a/sound/direct_sound_samples/cries/cry_not_lycanroc_dusk.aif b/sound/direct_sound_samples/cries/uncomp_lycanroc_dusk.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_lycanroc_dusk.aif rename to sound/direct_sound_samples/cries/uncomp_lycanroc_dusk.aif diff --git a/sound/direct_sound_samples/cries/cry_not_lycanroc_midnight.aif b/sound/direct_sound_samples/cries/uncomp_lycanroc_midnight.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_lycanroc_midnight.aif rename to sound/direct_sound_samples/cries/uncomp_lycanroc_midnight.aif diff --git a/sound/direct_sound_samples/cries/cry_not_magearna.aif b/sound/direct_sound_samples/cries/uncomp_magearna.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_magearna.aif rename to sound/direct_sound_samples/cries/uncomp_magearna.aif diff --git a/sound/direct_sound_samples/cries/cry_not_malamar.aif b/sound/direct_sound_samples/cries/uncomp_malamar.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_malamar.aif rename to sound/direct_sound_samples/cries/uncomp_malamar.aif diff --git a/sound/direct_sound_samples/cries/cry_not_mareanie.aif b/sound/direct_sound_samples/cries/uncomp_mareanie.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_mareanie.aif rename to sound/direct_sound_samples/cries/uncomp_mareanie.aif diff --git a/sound/direct_sound_samples/cries/cry_not_marshadow.aif b/sound/direct_sound_samples/cries/uncomp_marshadow.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_marshadow.aif rename to sound/direct_sound_samples/cries/uncomp_marshadow.aif diff --git a/sound/direct_sound_samples/cries/cry_not_mega_abomasnow.aif b/sound/direct_sound_samples/cries/uncomp_mega_abomasnow.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_mega_abomasnow.aif rename to sound/direct_sound_samples/cries/uncomp_mega_abomasnow.aif diff --git a/sound/direct_sound_samples/cries/cry_not_mega_absol.aif b/sound/direct_sound_samples/cries/uncomp_mega_absol.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_mega_absol.aif rename to sound/direct_sound_samples/cries/uncomp_mega_absol.aif diff --git a/sound/direct_sound_samples/cries/cry_not_mega_aerodactyl.aif b/sound/direct_sound_samples/cries/uncomp_mega_aerodactyl.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_mega_aerodactyl.aif rename to sound/direct_sound_samples/cries/uncomp_mega_aerodactyl.aif diff --git a/sound/direct_sound_samples/cries/cry_not_mega_aggron.aif b/sound/direct_sound_samples/cries/uncomp_mega_aggron.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_mega_aggron.aif rename to sound/direct_sound_samples/cries/uncomp_mega_aggron.aif diff --git a/sound/direct_sound_samples/cries/cry_not_mega_alakazam.aif b/sound/direct_sound_samples/cries/uncomp_mega_alakazam.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_mega_alakazam.aif rename to sound/direct_sound_samples/cries/uncomp_mega_alakazam.aif diff --git a/sound/direct_sound_samples/cries/cry_not_mega_altaria.aif b/sound/direct_sound_samples/cries/uncomp_mega_altaria.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_mega_altaria.aif rename to sound/direct_sound_samples/cries/uncomp_mega_altaria.aif diff --git a/sound/direct_sound_samples/cries/cry_not_mega_ampharos.aif b/sound/direct_sound_samples/cries/uncomp_mega_ampharos.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_mega_ampharos.aif rename to sound/direct_sound_samples/cries/uncomp_mega_ampharos.aif diff --git a/sound/direct_sound_samples/cries/cry_not_mega_audino.aif b/sound/direct_sound_samples/cries/uncomp_mega_audino.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_mega_audino.aif rename to sound/direct_sound_samples/cries/uncomp_mega_audino.aif diff --git a/sound/direct_sound_samples/cries/cry_not_mega_banette.aif b/sound/direct_sound_samples/cries/uncomp_mega_banette.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_mega_banette.aif rename to sound/direct_sound_samples/cries/uncomp_mega_banette.aif diff --git a/sound/direct_sound_samples/cries/cry_not_mega_beedrill.aif b/sound/direct_sound_samples/cries/uncomp_mega_beedrill.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_mega_beedrill.aif rename to sound/direct_sound_samples/cries/uncomp_mega_beedrill.aif diff --git a/sound/direct_sound_samples/cries/cry_not_mega_blastoise.aif b/sound/direct_sound_samples/cries/uncomp_mega_blastoise.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_mega_blastoise.aif rename to sound/direct_sound_samples/cries/uncomp_mega_blastoise.aif diff --git a/sound/direct_sound_samples/cries/cry_not_mega_blaziken.aif b/sound/direct_sound_samples/cries/uncomp_mega_blaziken.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_mega_blaziken.aif rename to sound/direct_sound_samples/cries/uncomp_mega_blaziken.aif diff --git a/sound/direct_sound_samples/cries/cry_not_mega_camerupt.aif b/sound/direct_sound_samples/cries/uncomp_mega_camerupt.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_mega_camerupt.aif rename to sound/direct_sound_samples/cries/uncomp_mega_camerupt.aif diff --git a/sound/direct_sound_samples/cries/cry_not_mega_charizard_x.aif b/sound/direct_sound_samples/cries/uncomp_mega_charizard_x.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_mega_charizard_x.aif rename to sound/direct_sound_samples/cries/uncomp_mega_charizard_x.aif diff --git a/sound/direct_sound_samples/cries/cry_not_mega_charizard_y.aif b/sound/direct_sound_samples/cries/uncomp_mega_charizard_y.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_mega_charizard_y.aif rename to sound/direct_sound_samples/cries/uncomp_mega_charizard_y.aif diff --git a/sound/direct_sound_samples/cries/cry_not_mega_diancie.aif b/sound/direct_sound_samples/cries/uncomp_mega_diancie.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_mega_diancie.aif rename to sound/direct_sound_samples/cries/uncomp_mega_diancie.aif diff --git a/sound/direct_sound_samples/cries/cry_not_mega_gallade.aif b/sound/direct_sound_samples/cries/uncomp_mega_gallade.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_mega_gallade.aif rename to sound/direct_sound_samples/cries/uncomp_mega_gallade.aif diff --git a/sound/direct_sound_samples/cries/cry_not_mega_garchomp.aif b/sound/direct_sound_samples/cries/uncomp_mega_garchomp.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_mega_garchomp.aif rename to sound/direct_sound_samples/cries/uncomp_mega_garchomp.aif diff --git a/sound/direct_sound_samples/cries/cry_not_mega_gardevoir.aif b/sound/direct_sound_samples/cries/uncomp_mega_gardevoir.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_mega_gardevoir.aif rename to sound/direct_sound_samples/cries/uncomp_mega_gardevoir.aif diff --git a/sound/direct_sound_samples/cries/cry_not_mega_gengar.aif b/sound/direct_sound_samples/cries/uncomp_mega_gengar.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_mega_gengar.aif rename to sound/direct_sound_samples/cries/uncomp_mega_gengar.aif diff --git a/sound/direct_sound_samples/cries/cry_not_mega_glalie.aif b/sound/direct_sound_samples/cries/uncomp_mega_glalie.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_mega_glalie.aif rename to sound/direct_sound_samples/cries/uncomp_mega_glalie.aif diff --git a/sound/direct_sound_samples/cries/cry_not_mega_gyarados.aif b/sound/direct_sound_samples/cries/uncomp_mega_gyarados.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_mega_gyarados.aif rename to sound/direct_sound_samples/cries/uncomp_mega_gyarados.aif diff --git a/sound/direct_sound_samples/cries/cry_not_mega_heracross.aif b/sound/direct_sound_samples/cries/uncomp_mega_heracross.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_mega_heracross.aif rename to sound/direct_sound_samples/cries/uncomp_mega_heracross.aif diff --git a/sound/direct_sound_samples/cries/cry_not_mega_houndoom.aif b/sound/direct_sound_samples/cries/uncomp_mega_houndoom.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_mega_houndoom.aif rename to sound/direct_sound_samples/cries/uncomp_mega_houndoom.aif diff --git a/sound/direct_sound_samples/cries/cry_not_mega_kangaskhan.aif b/sound/direct_sound_samples/cries/uncomp_mega_kangaskhan.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_mega_kangaskhan.aif rename to sound/direct_sound_samples/cries/uncomp_mega_kangaskhan.aif diff --git a/sound/direct_sound_samples/cries/cry_not_mega_latias.aif b/sound/direct_sound_samples/cries/uncomp_mega_latias.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_mega_latias.aif rename to sound/direct_sound_samples/cries/uncomp_mega_latias.aif diff --git a/sound/direct_sound_samples/cries/cry_not_mega_latios.aif b/sound/direct_sound_samples/cries/uncomp_mega_latios.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_mega_latios.aif rename to sound/direct_sound_samples/cries/uncomp_mega_latios.aif diff --git a/sound/direct_sound_samples/cries/cry_not_mega_lopunny.aif b/sound/direct_sound_samples/cries/uncomp_mega_lopunny.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_mega_lopunny.aif rename to sound/direct_sound_samples/cries/uncomp_mega_lopunny.aif diff --git a/sound/direct_sound_samples/cries/cry_not_mega_lucario.aif b/sound/direct_sound_samples/cries/uncomp_mega_lucario.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_mega_lucario.aif rename to sound/direct_sound_samples/cries/uncomp_mega_lucario.aif diff --git a/sound/direct_sound_samples/cries/cry_not_mega_manectric.aif b/sound/direct_sound_samples/cries/uncomp_mega_manectric.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_mega_manectric.aif rename to sound/direct_sound_samples/cries/uncomp_mega_manectric.aif diff --git a/sound/direct_sound_samples/cries/cry_not_mega_mawile.aif b/sound/direct_sound_samples/cries/uncomp_mega_mawile.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_mega_mawile.aif rename to sound/direct_sound_samples/cries/uncomp_mega_mawile.aif diff --git a/sound/direct_sound_samples/cries/cry_not_mega_medicham.aif b/sound/direct_sound_samples/cries/uncomp_mega_medicham.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_mega_medicham.aif rename to sound/direct_sound_samples/cries/uncomp_mega_medicham.aif diff --git a/sound/direct_sound_samples/cries/cry_not_mega_metagross.aif b/sound/direct_sound_samples/cries/uncomp_mega_metagross.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_mega_metagross.aif rename to sound/direct_sound_samples/cries/uncomp_mega_metagross.aif diff --git a/sound/direct_sound_samples/cries/cry_not_mega_mewtwo_x.aif b/sound/direct_sound_samples/cries/uncomp_mega_mewtwo_x.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_mega_mewtwo_x.aif rename to sound/direct_sound_samples/cries/uncomp_mega_mewtwo_x.aif diff --git a/sound/direct_sound_samples/cries/cry_not_mega_mewtwo_y.aif b/sound/direct_sound_samples/cries/uncomp_mega_mewtwo_y.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_mega_mewtwo_y.aif rename to sound/direct_sound_samples/cries/uncomp_mega_mewtwo_y.aif diff --git a/sound/direct_sound_samples/cries/cry_not_mega_pidgeot.aif b/sound/direct_sound_samples/cries/uncomp_mega_pidgeot.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_mega_pidgeot.aif rename to sound/direct_sound_samples/cries/uncomp_mega_pidgeot.aif diff --git a/sound/direct_sound_samples/cries/cry_not_mega_pinsir.aif b/sound/direct_sound_samples/cries/uncomp_mega_pinsir.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_mega_pinsir.aif rename to sound/direct_sound_samples/cries/uncomp_mega_pinsir.aif diff --git a/sound/direct_sound_samples/cries/cry_not_mega_rayquaza.aif b/sound/direct_sound_samples/cries/uncomp_mega_rayquaza.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_mega_rayquaza.aif rename to sound/direct_sound_samples/cries/uncomp_mega_rayquaza.aif diff --git a/sound/direct_sound_samples/cries/cry_not_mega_sableye.aif b/sound/direct_sound_samples/cries/uncomp_mega_sableye.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_mega_sableye.aif rename to sound/direct_sound_samples/cries/uncomp_mega_sableye.aif diff --git a/sound/direct_sound_samples/cries/cry_not_mega_salamence.aif b/sound/direct_sound_samples/cries/uncomp_mega_salamence.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_mega_salamence.aif rename to sound/direct_sound_samples/cries/uncomp_mega_salamence.aif diff --git a/sound/direct_sound_samples/cries/cry_not_mega_sceptile.aif b/sound/direct_sound_samples/cries/uncomp_mega_sceptile.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_mega_sceptile.aif rename to sound/direct_sound_samples/cries/uncomp_mega_sceptile.aif diff --git a/sound/direct_sound_samples/cries/cry_not_mega_scizor.aif b/sound/direct_sound_samples/cries/uncomp_mega_scizor.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_mega_scizor.aif rename to sound/direct_sound_samples/cries/uncomp_mega_scizor.aif diff --git a/sound/direct_sound_samples/cries/cry_not_mega_sharpedo.aif b/sound/direct_sound_samples/cries/uncomp_mega_sharpedo.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_mega_sharpedo.aif rename to sound/direct_sound_samples/cries/uncomp_mega_sharpedo.aif diff --git a/sound/direct_sound_samples/cries/cry_not_mega_slowbro.aif b/sound/direct_sound_samples/cries/uncomp_mega_slowbro.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_mega_slowbro.aif rename to sound/direct_sound_samples/cries/uncomp_mega_slowbro.aif diff --git a/sound/direct_sound_samples/cries/cry_not_mega_steelix.aif b/sound/direct_sound_samples/cries/uncomp_mega_steelix.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_mega_steelix.aif rename to sound/direct_sound_samples/cries/uncomp_mega_steelix.aif diff --git a/sound/direct_sound_samples/cries/cry_not_mega_swampert.aif b/sound/direct_sound_samples/cries/uncomp_mega_swampert.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_mega_swampert.aif rename to sound/direct_sound_samples/cries/uncomp_mega_swampert.aif diff --git a/sound/direct_sound_samples/cries/cry_not_mega_tyranitar.aif b/sound/direct_sound_samples/cries/uncomp_mega_tyranitar.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_mega_tyranitar.aif rename to sound/direct_sound_samples/cries/uncomp_mega_tyranitar.aif diff --git a/sound/direct_sound_samples/cries/cry_not_mega_venusaur.aif b/sound/direct_sound_samples/cries/uncomp_mega_venusaur.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_mega_venusaur.aif rename to sound/direct_sound_samples/cries/uncomp_mega_venusaur.aif diff --git a/sound/direct_sound_samples/cries/cry_not_melmetal.aif b/sound/direct_sound_samples/cries/uncomp_melmetal.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_melmetal.aif rename to sound/direct_sound_samples/cries/uncomp_melmetal.aif diff --git a/sound/direct_sound_samples/cries/cry_not_meltan.aif b/sound/direct_sound_samples/cries/uncomp_meltan.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_meltan.aif rename to sound/direct_sound_samples/cries/uncomp_meltan.aif diff --git a/sound/direct_sound_samples/cries/cry_not_meowstic.aif b/sound/direct_sound_samples/cries/uncomp_meowstic.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_meowstic.aif rename to sound/direct_sound_samples/cries/uncomp_meowstic.aif diff --git a/sound/direct_sound_samples/cries/cry_not_milcery.aif b/sound/direct_sound_samples/cries/uncomp_milcery.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_milcery.aif rename to sound/direct_sound_samples/cries/uncomp_milcery.aif diff --git a/sound/direct_sound_samples/cries/cry_not_mimikyu.aif b/sound/direct_sound_samples/cries/uncomp_mimikyu.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_mimikyu.aif rename to sound/direct_sound_samples/cries/uncomp_mimikyu.aif diff --git a/sound/direct_sound_samples/cries/cry_not_minior.aif b/sound/direct_sound_samples/cries/uncomp_minior.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_minior.aif rename to sound/direct_sound_samples/cries/uncomp_minior.aif diff --git a/sound/direct_sound_samples/cries/cry_not_morelull.aif b/sound/direct_sound_samples/cries/uncomp_morelull.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_morelull.aif rename to sound/direct_sound_samples/cries/uncomp_morelull.aif diff --git a/sound/direct_sound_samples/cries/cry_not_morgrem.aif b/sound/direct_sound_samples/cries/uncomp_morgrem.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_morgrem.aif rename to sound/direct_sound_samples/cries/uncomp_morgrem.aif diff --git a/sound/direct_sound_samples/cries/cry_not_morpeko.aif b/sound/direct_sound_samples/cries/uncomp_morpeko.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_morpeko.aif rename to sound/direct_sound_samples/cries/uncomp_morpeko.aif diff --git a/sound/direct_sound_samples/cries/cry_not_morpeko_hangry.aif b/sound/direct_sound_samples/cries/uncomp_morpeko_hangry.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_morpeko_hangry.aif rename to sound/direct_sound_samples/cries/uncomp_morpeko_hangry.aif diff --git a/sound/direct_sound_samples/cries/cry_not_mr_rime.aif b/sound/direct_sound_samples/cries/uncomp_mr_rime.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_mr_rime.aif rename to sound/direct_sound_samples/cries/uncomp_mr_rime.aif diff --git a/sound/direct_sound_samples/cries/cry_not_mudbray.aif b/sound/direct_sound_samples/cries/uncomp_mudbray.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_mudbray.aif rename to sound/direct_sound_samples/cries/uncomp_mudbray.aif diff --git a/sound/direct_sound_samples/cries/cry_not_mudsdale.aif b/sound/direct_sound_samples/cries/uncomp_mudsdale.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_mudsdale.aif rename to sound/direct_sound_samples/cries/uncomp_mudsdale.aif diff --git a/sound/direct_sound_samples/cries/cry_not_naganadel.aif b/sound/direct_sound_samples/cries/uncomp_naganadel.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_naganadel.aif rename to sound/direct_sound_samples/cries/uncomp_naganadel.aif diff --git a/sound/direct_sound_samples/cries/cry_not_necrozma.aif b/sound/direct_sound_samples/cries/uncomp_necrozma.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_necrozma.aif rename to sound/direct_sound_samples/cries/uncomp_necrozma.aif diff --git a/sound/direct_sound_samples/cries/cry_not_necrozma_dawn_wings.aif b/sound/direct_sound_samples/cries/uncomp_necrozma_dawn_wings.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_necrozma_dawn_wings.aif rename to sound/direct_sound_samples/cries/uncomp_necrozma_dawn_wings.aif diff --git a/sound/direct_sound_samples/cries/cry_not_necrozma_dusk_mane.aif b/sound/direct_sound_samples/cries/uncomp_necrozma_dusk_mane.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_necrozma_dusk_mane.aif rename to sound/direct_sound_samples/cries/uncomp_necrozma_dusk_mane.aif diff --git a/sound/direct_sound_samples/cries/cry_not_necrozma_ultra.aif b/sound/direct_sound_samples/cries/uncomp_necrozma_ultra.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_necrozma_ultra.aif rename to sound/direct_sound_samples/cries/uncomp_necrozma_ultra.aif diff --git a/sound/direct_sound_samples/cries/cry_not_nickit.aif b/sound/direct_sound_samples/cries/uncomp_nickit.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_nickit.aif rename to sound/direct_sound_samples/cries/uncomp_nickit.aif diff --git a/sound/direct_sound_samples/cries/cry_not_nihilego.aif b/sound/direct_sound_samples/cries/uncomp_nihilego.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_nihilego.aif rename to sound/direct_sound_samples/cries/uncomp_nihilego.aif diff --git a/sound/direct_sound_samples/cries/cry_not_noibat.aif b/sound/direct_sound_samples/cries/uncomp_noibat.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_noibat.aif rename to sound/direct_sound_samples/cries/uncomp_noibat.aif diff --git a/sound/direct_sound_samples/cries/cry_not_noivern.aif b/sound/direct_sound_samples/cries/uncomp_noivern.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_noivern.aif rename to sound/direct_sound_samples/cries/uncomp_noivern.aif diff --git a/sound/direct_sound_samples/cries/cry_not_obstagoon.aif b/sound/direct_sound_samples/cries/uncomp_obstagoon.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_obstagoon.aif rename to sound/direct_sound_samples/cries/uncomp_obstagoon.aif diff --git a/sound/direct_sound_samples/cries/cry_not_oranguru.aif b/sound/direct_sound_samples/cries/uncomp_oranguru.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_oranguru.aif rename to sound/direct_sound_samples/cries/uncomp_oranguru.aif diff --git a/sound/direct_sound_samples/cries/cry_not_orbeetle.aif b/sound/direct_sound_samples/cries/uncomp_orbeetle.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_orbeetle.aif rename to sound/direct_sound_samples/cries/uncomp_orbeetle.aif diff --git a/sound/direct_sound_samples/cries/cry_not_oricorio.aif b/sound/direct_sound_samples/cries/uncomp_oricorio.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_oricorio.aif rename to sound/direct_sound_samples/cries/uncomp_oricorio.aif diff --git a/sound/direct_sound_samples/cries/cry_not_oricorio_pa_u.aif b/sound/direct_sound_samples/cries/uncomp_oricorio_pau.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_oricorio_pa_u.aif rename to sound/direct_sound_samples/cries/uncomp_oricorio_pau.aif diff --git a/sound/direct_sound_samples/cries/cry_not_oricorio_pom_pom.aif b/sound/direct_sound_samples/cries/uncomp_oricorio_pom_pom.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_oricorio_pom_pom.aif rename to sound/direct_sound_samples/cries/uncomp_oricorio_pom_pom.aif diff --git a/sound/direct_sound_samples/cries/cry_not_oricorio_sensu.aif b/sound/direct_sound_samples/cries/uncomp_oricorio_sensu.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_oricorio_sensu.aif rename to sound/direct_sound_samples/cries/uncomp_oricorio_sensu.aif diff --git a/sound/direct_sound_samples/cries/cry_not_palossand.aif b/sound/direct_sound_samples/cries/uncomp_palossand.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_palossand.aif rename to sound/direct_sound_samples/cries/uncomp_palossand.aif diff --git a/sound/direct_sound_samples/cries/cry_not_pancham.aif b/sound/direct_sound_samples/cries/uncomp_pancham.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_pancham.aif rename to sound/direct_sound_samples/cries/uncomp_pancham.aif diff --git a/sound/direct_sound_samples/cries/cry_not_pangoro.aif b/sound/direct_sound_samples/cries/uncomp_pangoro.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_pangoro.aif rename to sound/direct_sound_samples/cries/uncomp_pangoro.aif diff --git a/sound/direct_sound_samples/cries/cry_not_passimian.aif b/sound/direct_sound_samples/cries/uncomp_passimian.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_passimian.aif rename to sound/direct_sound_samples/cries/uncomp_passimian.aif diff --git a/sound/direct_sound_samples/cries/cry_not_perrserker.aif b/sound/direct_sound_samples/cries/uncomp_perrserker.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_perrserker.aif rename to sound/direct_sound_samples/cries/uncomp_perrserker.aif diff --git a/sound/direct_sound_samples/cries/cry_not_phantump.aif b/sound/direct_sound_samples/cries/uncomp_phantump.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_phantump.aif rename to sound/direct_sound_samples/cries/uncomp_phantump.aif diff --git a/sound/direct_sound_samples/cries/cry_not_pheromosa.aif b/sound/direct_sound_samples/cries/uncomp_pheromosa.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_pheromosa.aif rename to sound/direct_sound_samples/cries/uncomp_pheromosa.aif diff --git a/sound/direct_sound_samples/cries/cry_not_pikipek.aif b/sound/direct_sound_samples/cries/uncomp_pikipek.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_pikipek.aif rename to sound/direct_sound_samples/cries/uncomp_pikipek.aif diff --git a/sound/direct_sound_samples/cries/cry_not_pincurchin.aif b/sound/direct_sound_samples/cries/uncomp_pincurchin.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_pincurchin.aif rename to sound/direct_sound_samples/cries/uncomp_pincurchin.aif diff --git a/sound/direct_sound_samples/cries/cry_not_poipole.aif b/sound/direct_sound_samples/cries/uncomp_poipole.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_poipole.aif rename to sound/direct_sound_samples/cries/uncomp_poipole.aif diff --git a/sound/direct_sound_samples/cries/cry_not_polteageist.aif b/sound/direct_sound_samples/cries/uncomp_polteageist.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_polteageist.aif rename to sound/direct_sound_samples/cries/uncomp_polteageist.aif diff --git a/sound/direct_sound_samples/cries/cry_not_popplio.aif b/sound/direct_sound_samples/cries/uncomp_popplio.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_popplio.aif rename to sound/direct_sound_samples/cries/uncomp_popplio.aif diff --git a/sound/direct_sound_samples/cries/cry_not_primal_groudon.aif b/sound/direct_sound_samples/cries/uncomp_primal_groudon.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_primal_groudon.aif rename to sound/direct_sound_samples/cries/uncomp_primal_groudon.aif diff --git a/sound/direct_sound_samples/cries/cry_not_primal_kyogre.aif b/sound/direct_sound_samples/cries/uncomp_primal_kyogre.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_primal_kyogre.aif rename to sound/direct_sound_samples/cries/uncomp_primal_kyogre.aif diff --git a/sound/direct_sound_samples/cries/cry_not_primarina.aif b/sound/direct_sound_samples/cries/uncomp_primarina.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_primarina.aif rename to sound/direct_sound_samples/cries/uncomp_primarina.aif diff --git a/sound/direct_sound_samples/cries/cry_not_pumpkaboo.aif b/sound/direct_sound_samples/cries/uncomp_pumpkaboo.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_pumpkaboo.aif rename to sound/direct_sound_samples/cries/uncomp_pumpkaboo.aif diff --git a/sound/direct_sound_samples/cries/cry_not_pumpkaboo_super.aif b/sound/direct_sound_samples/cries/uncomp_pumpkaboo_super.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_pumpkaboo_super.aif rename to sound/direct_sound_samples/cries/uncomp_pumpkaboo_super.aif diff --git a/sound/direct_sound_samples/cries/cry_not_pyroar.aif b/sound/direct_sound_samples/cries/uncomp_pyroar.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_pyroar.aif rename to sound/direct_sound_samples/cries/uncomp_pyroar.aif diff --git a/sound/direct_sound_samples/cries/cry_not_pyukumuku.aif b/sound/direct_sound_samples/cries/uncomp_pyukumuku.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_pyukumuku.aif rename to sound/direct_sound_samples/cries/uncomp_pyukumuku.aif diff --git a/sound/direct_sound_samples/cries/cry_not_quilladin.aif b/sound/direct_sound_samples/cries/uncomp_quilladin.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_quilladin.aif rename to sound/direct_sound_samples/cries/uncomp_quilladin.aif diff --git a/sound/direct_sound_samples/cries/cry_not_raboot.aif b/sound/direct_sound_samples/cries/uncomp_raboot.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_raboot.aif rename to sound/direct_sound_samples/cries/uncomp_raboot.aif diff --git a/sound/direct_sound_samples/cries/cry_not_regidrago.aif b/sound/direct_sound_samples/cries/uncomp_regidrago.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_regidrago.aif rename to sound/direct_sound_samples/cries/uncomp_regidrago.aif diff --git a/sound/direct_sound_samples/cries/cry_not_regieleki.aif b/sound/direct_sound_samples/cries/uncomp_regieleki.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_regieleki.aif rename to sound/direct_sound_samples/cries/uncomp_regieleki.aif diff --git a/sound/direct_sound_samples/cries/cry_not_ribombee.aif b/sound/direct_sound_samples/cries/uncomp_ribombee.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_ribombee.aif rename to sound/direct_sound_samples/cries/uncomp_ribombee.aif diff --git a/sound/direct_sound_samples/cries/cry_not_rillaboom.aif b/sound/direct_sound_samples/cries/uncomp_rillaboom.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_rillaboom.aif rename to sound/direct_sound_samples/cries/uncomp_rillaboom.aif diff --git a/sound/direct_sound_samples/cries/cry_not_rockruff.aif b/sound/direct_sound_samples/cries/uncomp_rockruff.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_rockruff.aif rename to sound/direct_sound_samples/cries/uncomp_rockruff.aif diff --git a/sound/direct_sound_samples/cries/cry_not_rolycoly.aif b/sound/direct_sound_samples/cries/uncomp_rolycoly.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_rolycoly.aif rename to sound/direct_sound_samples/cries/uncomp_rolycoly.aif diff --git a/sound/direct_sound_samples/cries/cry_not_rookidee.aif b/sound/direct_sound_samples/cries/uncomp_rookidee.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_rookidee.aif rename to sound/direct_sound_samples/cries/uncomp_rookidee.aif diff --git a/sound/direct_sound_samples/cries/cry_not_rowlet.aif b/sound/direct_sound_samples/cries/uncomp_rowlet.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_rowlet.aif rename to sound/direct_sound_samples/cries/uncomp_rowlet.aif diff --git a/sound/direct_sound_samples/cries/cry_not_runerigus.aif b/sound/direct_sound_samples/cries/uncomp_runerigus.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_runerigus.aif rename to sound/direct_sound_samples/cries/uncomp_runerigus.aif diff --git a/sound/direct_sound_samples/cries/cry_not_salandit.aif b/sound/direct_sound_samples/cries/uncomp_salandit.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_salandit.aif rename to sound/direct_sound_samples/cries/uncomp_salandit.aif diff --git a/sound/direct_sound_samples/cries/cry_not_salazzle.aif b/sound/direct_sound_samples/cries/uncomp_salazzle.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_salazzle.aif rename to sound/direct_sound_samples/cries/uncomp_salazzle.aif diff --git a/sound/direct_sound_samples/cries/cry_not_sandaconda.aif b/sound/direct_sound_samples/cries/uncomp_sandaconda.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_sandaconda.aif rename to sound/direct_sound_samples/cries/uncomp_sandaconda.aif diff --git a/sound/direct_sound_samples/cries/cry_not_sandygast.aif b/sound/direct_sound_samples/cries/uncomp_sandygast.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_sandygast.aif rename to sound/direct_sound_samples/cries/uncomp_sandygast.aif diff --git a/sound/direct_sound_samples/cries/cry_not_scatterbug.aif b/sound/direct_sound_samples/cries/uncomp_scatterbug.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_scatterbug.aif rename to sound/direct_sound_samples/cries/uncomp_scatterbug.aif diff --git a/sound/direct_sound_samples/cries/cry_not_scorbunny.aif b/sound/direct_sound_samples/cries/uncomp_scorbunny.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_scorbunny.aif rename to sound/direct_sound_samples/cries/uncomp_scorbunny.aif diff --git a/sound/direct_sound_samples/cries/cry_not_shelmet.aif b/sound/direct_sound_samples/cries/uncomp_shelmet.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_shelmet.aif rename to sound/direct_sound_samples/cries/uncomp_shelmet.aif diff --git a/sound/direct_sound_samples/cries/cry_not_shiinotic.aif b/sound/direct_sound_samples/cries/uncomp_shiinotic.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_shiinotic.aif rename to sound/direct_sound_samples/cries/uncomp_shiinotic.aif diff --git a/sound/direct_sound_samples/cries/cry_not_silicobra.aif b/sound/direct_sound_samples/cries/uncomp_silicobra.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_silicobra.aif rename to sound/direct_sound_samples/cries/uncomp_silicobra.aif diff --git a/sound/direct_sound_samples/cries/cry_not_silvally.aif b/sound/direct_sound_samples/cries/uncomp_silvally.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_silvally.aif rename to sound/direct_sound_samples/cries/uncomp_silvally.aif diff --git a/sound/direct_sound_samples/cries/cry_not_sinistea.aif b/sound/direct_sound_samples/cries/uncomp_sinistea.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_sinistea.aif rename to sound/direct_sound_samples/cries/uncomp_sinistea.aif diff --git a/sound/direct_sound_samples/cries/cry_not_sirfetchd.aif b/sound/direct_sound_samples/cries/uncomp_sirfetchd.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_sirfetchd.aif rename to sound/direct_sound_samples/cries/uncomp_sirfetchd.aif diff --git a/sound/direct_sound_samples/cries/cry_not_sizzlipede.aif b/sound/direct_sound_samples/cries/uncomp_sizzlipede.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_sizzlipede.aif rename to sound/direct_sound_samples/cries/uncomp_sizzlipede.aif diff --git a/sound/direct_sound_samples/cries/cry_not_skiddo.aif b/sound/direct_sound_samples/cries/uncomp_skiddo.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_skiddo.aif rename to sound/direct_sound_samples/cries/uncomp_skiddo.aif diff --git a/sound/direct_sound_samples/cries/cry_not_skrelp.aif b/sound/direct_sound_samples/cries/uncomp_skrelp.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_skrelp.aif rename to sound/direct_sound_samples/cries/uncomp_skrelp.aif diff --git a/sound/direct_sound_samples/cries/cry_not_skwovet.aif b/sound/direct_sound_samples/cries/uncomp_skwovet.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_skwovet.aif rename to sound/direct_sound_samples/cries/uncomp_skwovet.aif diff --git a/sound/direct_sound_samples/cries/cry_not_sliggoo.aif b/sound/direct_sound_samples/cries/uncomp_sliggoo.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_sliggoo.aif rename to sound/direct_sound_samples/cries/uncomp_sliggoo.aif diff --git a/sound/direct_sound_samples/cries/cry_not_slowpoke_galarian.aif b/sound/direct_sound_samples/cries/uncomp_slowpoke_galarian.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_slowpoke_galarian.aif rename to sound/direct_sound_samples/cries/uncomp_slowpoke_galarian.aif diff --git a/sound/direct_sound_samples/cries/cry_not_slurpuff.aif b/sound/direct_sound_samples/cries/uncomp_slurpuff.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_slurpuff.aif rename to sound/direct_sound_samples/cries/uncomp_slurpuff.aif diff --git a/sound/direct_sound_samples/cries/cry_not_snom.aif b/sound/direct_sound_samples/cries/uncomp_snom.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_snom.aif rename to sound/direct_sound_samples/cries/uncomp_snom.aif diff --git a/sound/direct_sound_samples/cries/cry_not_sobble.aif b/sound/direct_sound_samples/cries/uncomp_sobble.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_sobble.aif rename to sound/direct_sound_samples/cries/uncomp_sobble.aif diff --git a/sound/direct_sound_samples/cries/cry_not_solgaleo.aif b/sound/direct_sound_samples/cries/uncomp_solgaleo.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_solgaleo.aif rename to sound/direct_sound_samples/cries/uncomp_solgaleo.aif diff --git a/sound/direct_sound_samples/cries/cry_not_spectrier.aif b/sound/direct_sound_samples/cries/uncomp_spectrier.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_spectrier.aif rename to sound/direct_sound_samples/cries/uncomp_spectrier.aif diff --git a/sound/direct_sound_samples/cries/cry_not_spewpa.aif b/sound/direct_sound_samples/cries/uncomp_spewpa.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_spewpa.aif rename to sound/direct_sound_samples/cries/uncomp_spewpa.aif diff --git a/sound/direct_sound_samples/cries/cry_not_spritzee.aif b/sound/direct_sound_samples/cries/uncomp_spritzee.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_spritzee.aif rename to sound/direct_sound_samples/cries/uncomp_spritzee.aif diff --git a/sound/direct_sound_samples/cries/cry_not_stakataka.aif b/sound/direct_sound_samples/cries/uncomp_stakataka.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_stakataka.aif rename to sound/direct_sound_samples/cries/uncomp_stakataka.aif diff --git a/sound/direct_sound_samples/cries/cry_not_steenee.aif b/sound/direct_sound_samples/cries/uncomp_steenee.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_steenee.aif rename to sound/direct_sound_samples/cries/uncomp_steenee.aif diff --git a/sound/direct_sound_samples/cries/cry_not_stonjourner.aif b/sound/direct_sound_samples/cries/uncomp_stonjourner.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_stonjourner.aif rename to sound/direct_sound_samples/cries/uncomp_stonjourner.aif diff --git a/sound/direct_sound_samples/cries/cry_not_stufful.aif b/sound/direct_sound_samples/cries/uncomp_stufful.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_stufful.aif rename to sound/direct_sound_samples/cries/uncomp_stufful.aif diff --git a/sound/direct_sound_samples/cries/cry_not_swirlix.aif b/sound/direct_sound_samples/cries/uncomp_swirlix.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_swirlix.aif rename to sound/direct_sound_samples/cries/uncomp_swirlix.aif diff --git a/sound/direct_sound_samples/cries/cry_not_swoobat.aif b/sound/direct_sound_samples/cries/uncomp_swoobat.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_swoobat.aif rename to sound/direct_sound_samples/cries/uncomp_swoobat.aif diff --git a/sound/direct_sound_samples/cries/cry_not_sylveon.aif b/sound/direct_sound_samples/cries/uncomp_sylveon.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_sylveon.aif rename to sound/direct_sound_samples/cries/uncomp_sylveon.aif diff --git a/sound/direct_sound_samples/cries/cry_not_talonflame.aif b/sound/direct_sound_samples/cries/uncomp_talonflame.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_talonflame.aif rename to sound/direct_sound_samples/cries/uncomp_talonflame.aif diff --git a/sound/direct_sound_samples/cries/cry_not_tapu_bulu.aif b/sound/direct_sound_samples/cries/uncomp_tapu_bulu.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_tapu_bulu.aif rename to sound/direct_sound_samples/cries/uncomp_tapu_bulu.aif diff --git a/sound/direct_sound_samples/cries/cry_not_tapu_fini.aif b/sound/direct_sound_samples/cries/uncomp_tapu_fini.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_tapu_fini.aif rename to sound/direct_sound_samples/cries/uncomp_tapu_fini.aif diff --git a/sound/direct_sound_samples/cries/cry_not_tapu_koko.aif b/sound/direct_sound_samples/cries/uncomp_tapu_koko.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_tapu_koko.aif rename to sound/direct_sound_samples/cries/uncomp_tapu_koko.aif diff --git a/sound/direct_sound_samples/cries/cry_not_tapu_lele.aif b/sound/direct_sound_samples/cries/uncomp_tapu_lele.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_tapu_lele.aif rename to sound/direct_sound_samples/cries/uncomp_tapu_lele.aif diff --git a/sound/direct_sound_samples/cries/cry_not_thievul.aif b/sound/direct_sound_samples/cries/uncomp_thievul.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_thievul.aif rename to sound/direct_sound_samples/cries/uncomp_thievul.aif diff --git a/sound/direct_sound_samples/cries/cry_not_thwackey.aif b/sound/direct_sound_samples/cries/uncomp_thwackey.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_thwackey.aif rename to sound/direct_sound_samples/cries/uncomp_thwackey.aif diff --git a/sound/direct_sound_samples/cries/cry_not_togedemaru.aif b/sound/direct_sound_samples/cries/uncomp_togedemaru.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_togedemaru.aif rename to sound/direct_sound_samples/cries/uncomp_togedemaru.aif diff --git a/sound/direct_sound_samples/cries/cry_not_torracat.aif b/sound/direct_sound_samples/cries/uncomp_torracat.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_torracat.aif rename to sound/direct_sound_samples/cries/uncomp_torracat.aif diff --git a/sound/direct_sound_samples/cries/cry_not_toucannon.aif b/sound/direct_sound_samples/cries/uncomp_toucannon.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_toucannon.aif rename to sound/direct_sound_samples/cries/uncomp_toucannon.aif diff --git a/sound/direct_sound_samples/cries/cry_not_toxapex.aif b/sound/direct_sound_samples/cries/uncomp_toxapex.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_toxapex.aif rename to sound/direct_sound_samples/cries/uncomp_toxapex.aif diff --git a/sound/direct_sound_samples/cries/cry_not_toxel.aif b/sound/direct_sound_samples/cries/uncomp_toxel.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_toxel.aif rename to sound/direct_sound_samples/cries/uncomp_toxel.aif diff --git a/sound/direct_sound_samples/cries/cry_not_toxtricity.aif b/sound/direct_sound_samples/cries/uncomp_toxtricity.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_toxtricity.aif rename to sound/direct_sound_samples/cries/uncomp_toxtricity.aif diff --git a/sound/direct_sound_samples/cries/cry_not_toxtricity_low_key.aif b/sound/direct_sound_samples/cries/uncomp_toxtricity_low_key.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_toxtricity_low_key.aif rename to sound/direct_sound_samples/cries/uncomp_toxtricity_low_key.aif diff --git a/sound/direct_sound_samples/cries/cry_not_trevenant.aif b/sound/direct_sound_samples/cries/uncomp_trevenant.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_trevenant.aif rename to sound/direct_sound_samples/cries/uncomp_trevenant.aif diff --git a/sound/direct_sound_samples/cries/cry_not_trumbeak.aif b/sound/direct_sound_samples/cries/uncomp_trumbeak.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_trumbeak.aif rename to sound/direct_sound_samples/cries/uncomp_trumbeak.aif diff --git a/sound/direct_sound_samples/cries/cry_not_tsareena.aif b/sound/direct_sound_samples/cries/uncomp_tsareena.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_tsareena.aif rename to sound/direct_sound_samples/cries/uncomp_tsareena.aif diff --git a/sound/direct_sound_samples/cries/cry_not_turtonator.aif b/sound/direct_sound_samples/cries/uncomp_turtonator.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_turtonator.aif rename to sound/direct_sound_samples/cries/uncomp_turtonator.aif diff --git a/sound/direct_sound_samples/cries/cry_not_type_null.aif b/sound/direct_sound_samples/cries/uncomp_type_null.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_type_null.aif rename to sound/direct_sound_samples/cries/uncomp_type_null.aif diff --git a/sound/direct_sound_samples/cries/cry_not_tyrantrum.aif b/sound/direct_sound_samples/cries/uncomp_tyrantrum.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_tyrantrum.aif rename to sound/direct_sound_samples/cries/uncomp_tyrantrum.aif diff --git a/sound/direct_sound_samples/cries/cry_not_tyrunt.aif b/sound/direct_sound_samples/cries/uncomp_tyrunt.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_tyrunt.aif rename to sound/direct_sound_samples/cries/uncomp_tyrunt.aif diff --git a/sound/direct_sound_samples/cries/cry_not_urshifu.aif b/sound/direct_sound_samples/cries/uncomp_urshifu.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_urshifu.aif rename to sound/direct_sound_samples/cries/uncomp_urshifu.aif diff --git a/sound/direct_sound_samples/cries/cry_not_urshifu_rapid_strike_style.aif b/sound/direct_sound_samples/cries/uncomp_urshifu_rapid_strike_style.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_urshifu_rapid_strike_style.aif rename to sound/direct_sound_samples/cries/uncomp_urshifu_rapid_strike_style.aif diff --git a/sound/direct_sound_samples/cries/cry_not_vikavolt.aif b/sound/direct_sound_samples/cries/uncomp_vikavolt.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_vikavolt.aif rename to sound/direct_sound_samples/cries/uncomp_vikavolt.aif diff --git a/sound/direct_sound_samples/cries/cry_not_vivillon.aif b/sound/direct_sound_samples/cries/uncomp_vivillon.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_vivillon.aif rename to sound/direct_sound_samples/cries/uncomp_vivillon.aif diff --git a/sound/direct_sound_samples/cries/cry_not_volcanion.aif b/sound/direct_sound_samples/cries/uncomp_volcanion.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_volcanion.aif rename to sound/direct_sound_samples/cries/uncomp_volcanion.aif diff --git a/sound/direct_sound_samples/cries/cry_not_wimpod.aif b/sound/direct_sound_samples/cries/uncomp_wimpod.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_wimpod.aif rename to sound/direct_sound_samples/cries/uncomp_wimpod.aif diff --git a/sound/direct_sound_samples/cries/cry_not_wishiwashi.aif b/sound/direct_sound_samples/cries/uncomp_wishiwashi.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_wishiwashi.aif rename to sound/direct_sound_samples/cries/uncomp_wishiwashi.aif diff --git a/sound/direct_sound_samples/cries/cry_not_wishiwashi_school.aif b/sound/direct_sound_samples/cries/uncomp_wishiwashi_school.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_wishiwashi_school.aif rename to sound/direct_sound_samples/cries/uncomp_wishiwashi_school.aif diff --git a/sound/direct_sound_samples/cries/cry_not_wooloo.aif b/sound/direct_sound_samples/cries/uncomp_wooloo.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_wooloo.aif rename to sound/direct_sound_samples/cries/uncomp_wooloo.aif diff --git a/sound/direct_sound_samples/cries/cry_not_xerneas.aif b/sound/direct_sound_samples/cries/uncomp_xerneas.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_xerneas.aif rename to sound/direct_sound_samples/cries/uncomp_xerneas.aif diff --git a/sound/direct_sound_samples/cries/cry_not_xurkitree.aif b/sound/direct_sound_samples/cries/uncomp_xurkitree.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_xurkitree.aif rename to sound/direct_sound_samples/cries/uncomp_xurkitree.aif diff --git a/sound/direct_sound_samples/cries/cry_not_yamask.aif b/sound/direct_sound_samples/cries/uncomp_yamask.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_yamask.aif rename to sound/direct_sound_samples/cries/uncomp_yamask.aif diff --git a/sound/direct_sound_samples/cries/cry_not_yamper.aif b/sound/direct_sound_samples/cries/uncomp_yamper.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_yamper.aif rename to sound/direct_sound_samples/cries/uncomp_yamper.aif diff --git a/sound/direct_sound_samples/cries/cry_not_yungoos.aif b/sound/direct_sound_samples/cries/uncomp_yungoos.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_yungoos.aif rename to sound/direct_sound_samples/cries/uncomp_yungoos.aif diff --git a/sound/direct_sound_samples/cries/cry_not_yveltal.aif b/sound/direct_sound_samples/cries/uncomp_yveltal.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_yveltal.aif rename to sound/direct_sound_samples/cries/uncomp_yveltal.aif diff --git a/sound/direct_sound_samples/cries/cry_not_zacian.aif b/sound/direct_sound_samples/cries/uncomp_zacian.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_zacian.aif rename to sound/direct_sound_samples/cries/uncomp_zacian.aif diff --git a/sound/direct_sound_samples/cries/cry_not_zacian_crowned_sword.aif b/sound/direct_sound_samples/cries/uncomp_zacian_crowned_sword.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_zacian_crowned_sword.aif rename to sound/direct_sound_samples/cries/uncomp_zacian_crowned_sword.aif diff --git a/sound/direct_sound_samples/cries/cry_not_zamazenta.aif b/sound/direct_sound_samples/cries/uncomp_zamazenta.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_zamazenta.aif rename to sound/direct_sound_samples/cries/uncomp_zamazenta.aif diff --git a/sound/direct_sound_samples/cries/cry_not_zamazenta_crowned_shield.aif b/sound/direct_sound_samples/cries/uncomp_zamazenta_crowned_shield.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_zamazenta_crowned_shield.aif rename to sound/direct_sound_samples/cries/uncomp_zamazenta_crowned_shield.aif diff --git a/sound/direct_sound_samples/cries/cry_not_zarude.aif b/sound/direct_sound_samples/cries/uncomp_zarude.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_zarude.aif rename to sound/direct_sound_samples/cries/uncomp_zarude.aif diff --git a/sound/direct_sound_samples/cries/cry_not_zeraora.aif b/sound/direct_sound_samples/cries/uncomp_zeraora.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_zeraora.aif rename to sound/direct_sound_samples/cries/uncomp_zeraora.aif diff --git a/sound/direct_sound_samples/cries/cry_not_zygarde.aif b/sound/direct_sound_samples/cries/uncomp_zygarde.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_zygarde.aif rename to sound/direct_sound_samples/cries/uncomp_zygarde.aif diff --git a/sound/direct_sound_samples/cries/cry_not_zygarde_10.aif b/sound/direct_sound_samples/cries/uncomp_zygarde_10.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_zygarde_10.aif rename to sound/direct_sound_samples/cries/uncomp_zygarde_10.aif diff --git a/sound/direct_sound_samples/cries/cry_not_zygarde_complete.aif b/sound/direct_sound_samples/cries/uncomp_zygarde_complete.aif similarity index 100% rename from sound/direct_sound_samples/cries/cry_not_zygarde_complete.aif rename to sound/direct_sound_samples/cries/uncomp_zygarde_complete.aif diff --git a/sound/direct_sound_samples/cries/unfezant.aif b/sound/direct_sound_samples/cries/unfezant.aif new file mode 100644 index 000000000..dadbed948 Binary files /dev/null and b/sound/direct_sound_samples/cries/unfezant.aif differ diff --git a/sound/direct_sound_samples/cries/unown.aif b/sound/direct_sound_samples/cries/unown.aif new file mode 100644 index 000000000..86a836135 Binary files /dev/null and b/sound/direct_sound_samples/cries/unown.aif differ diff --git a/sound/direct_sound_samples/cries/ursaring.aif b/sound/direct_sound_samples/cries/ursaring.aif new file mode 100644 index 000000000..643738f83 Binary files /dev/null and b/sound/direct_sound_samples/cries/ursaring.aif differ diff --git a/sound/direct_sound_samples/cries/uxie.aif b/sound/direct_sound_samples/cries/uxie.aif new file mode 100644 index 000000000..34745ddd9 Binary files /dev/null and b/sound/direct_sound_samples/cries/uxie.aif differ diff --git a/sound/direct_sound_samples/cries/vanillish.aif b/sound/direct_sound_samples/cries/vanillish.aif new file mode 100644 index 000000000..e53b51040 Binary files /dev/null and b/sound/direct_sound_samples/cries/vanillish.aif differ diff --git a/sound/direct_sound_samples/cries/vanillite.aif b/sound/direct_sound_samples/cries/vanillite.aif new file mode 100644 index 000000000..72bbe2485 Binary files /dev/null and b/sound/direct_sound_samples/cries/vanillite.aif differ diff --git a/sound/direct_sound_samples/cries/vanilluxe.aif b/sound/direct_sound_samples/cries/vanilluxe.aif new file mode 100644 index 000000000..45f2d085d Binary files /dev/null and b/sound/direct_sound_samples/cries/vanilluxe.aif differ diff --git a/sound/direct_sound_samples/cries/vaporeon.aif b/sound/direct_sound_samples/cries/vaporeon.aif new file mode 100644 index 000000000..937ad74ce Binary files /dev/null and b/sound/direct_sound_samples/cries/vaporeon.aif differ diff --git a/sound/direct_sound_samples/cries/venipede.aif b/sound/direct_sound_samples/cries/venipede.aif new file mode 100644 index 000000000..43a663981 Binary files /dev/null and b/sound/direct_sound_samples/cries/venipede.aif differ diff --git a/sound/direct_sound_samples/cries/venomoth.aif b/sound/direct_sound_samples/cries/venomoth.aif new file mode 100644 index 000000000..0ae031bb9 Binary files /dev/null and b/sound/direct_sound_samples/cries/venomoth.aif differ diff --git a/sound/direct_sound_samples/cries/venonat.aif b/sound/direct_sound_samples/cries/venonat.aif new file mode 100644 index 000000000..f490a4445 Binary files /dev/null and b/sound/direct_sound_samples/cries/venonat.aif differ diff --git a/sound/direct_sound_samples/cries/venusaur.aif b/sound/direct_sound_samples/cries/venusaur.aif new file mode 100644 index 000000000..6e890f73b Binary files /dev/null and b/sound/direct_sound_samples/cries/venusaur.aif differ diff --git a/sound/direct_sound_samples/cries/vespiquen.aif b/sound/direct_sound_samples/cries/vespiquen.aif new file mode 100644 index 000000000..5fdbd5e2f Binary files /dev/null and b/sound/direct_sound_samples/cries/vespiquen.aif differ diff --git a/sound/direct_sound_samples/cries/vibrava.aif b/sound/direct_sound_samples/cries/vibrava.aif new file mode 100644 index 000000000..747014264 Binary files /dev/null and b/sound/direct_sound_samples/cries/vibrava.aif differ diff --git a/sound/direct_sound_samples/cries/victini.aif b/sound/direct_sound_samples/cries/victini.aif new file mode 100644 index 000000000..31801a064 Binary files /dev/null and b/sound/direct_sound_samples/cries/victini.aif differ diff --git a/sound/direct_sound_samples/cries/victreebel.aif b/sound/direct_sound_samples/cries/victreebel.aif new file mode 100644 index 000000000..d16996bb8 Binary files /dev/null and b/sound/direct_sound_samples/cries/victreebel.aif differ diff --git a/sound/direct_sound_samples/cries/vigoroth.aif b/sound/direct_sound_samples/cries/vigoroth.aif new file mode 100644 index 000000000..4f6e00a13 Binary files /dev/null and b/sound/direct_sound_samples/cries/vigoroth.aif differ diff --git a/sound/direct_sound_samples/cries/vileplume.aif b/sound/direct_sound_samples/cries/vileplume.aif new file mode 100644 index 000000000..f182cf99d Binary files /dev/null and b/sound/direct_sound_samples/cries/vileplume.aif differ diff --git a/sound/direct_sound_samples/cries/virizion.aif b/sound/direct_sound_samples/cries/virizion.aif new file mode 100644 index 000000000..296aaa829 Binary files /dev/null and b/sound/direct_sound_samples/cries/virizion.aif differ diff --git a/sound/direct_sound_samples/cries/volbeat.aif b/sound/direct_sound_samples/cries/volbeat.aif new file mode 100644 index 000000000..90e5e66ca Binary files /dev/null and b/sound/direct_sound_samples/cries/volbeat.aif differ diff --git a/sound/direct_sound_samples/cries/volcarona.aif b/sound/direct_sound_samples/cries/volcarona.aif new file mode 100644 index 000000000..8d34404dc Binary files /dev/null and b/sound/direct_sound_samples/cries/volcarona.aif differ diff --git a/sound/direct_sound_samples/cries/voltorb.aif b/sound/direct_sound_samples/cries/voltorb.aif new file mode 100644 index 000000000..54a359770 Binary files /dev/null and b/sound/direct_sound_samples/cries/voltorb.aif differ diff --git a/sound/direct_sound_samples/cries/vullaby.aif b/sound/direct_sound_samples/cries/vullaby.aif new file mode 100644 index 000000000..41beb9ed6 Binary files /dev/null and b/sound/direct_sound_samples/cries/vullaby.aif differ diff --git a/sound/direct_sound_samples/cries/vulpix.aif b/sound/direct_sound_samples/cries/vulpix.aif new file mode 100644 index 000000000..04a60e27e Binary files /dev/null and b/sound/direct_sound_samples/cries/vulpix.aif differ diff --git a/sound/direct_sound_samples/cries/wailmer.aif b/sound/direct_sound_samples/cries/wailmer.aif new file mode 100644 index 000000000..e21c05c4b Binary files /dev/null and b/sound/direct_sound_samples/cries/wailmer.aif differ diff --git a/sound/direct_sound_samples/cries/wailord.aif b/sound/direct_sound_samples/cries/wailord.aif new file mode 100644 index 000000000..40c331d40 Binary files /dev/null and b/sound/direct_sound_samples/cries/wailord.aif differ diff --git a/sound/direct_sound_samples/cries/walrein.aif b/sound/direct_sound_samples/cries/walrein.aif new file mode 100644 index 000000000..475a874ef Binary files /dev/null and b/sound/direct_sound_samples/cries/walrein.aif differ diff --git a/sound/direct_sound_samples/cries/wartortle.aif b/sound/direct_sound_samples/cries/wartortle.aif new file mode 100644 index 000000000..aa664369d Binary files /dev/null and b/sound/direct_sound_samples/cries/wartortle.aif differ diff --git a/sound/direct_sound_samples/cries/watchog.aif b/sound/direct_sound_samples/cries/watchog.aif new file mode 100644 index 000000000..e5f35aa07 Binary files /dev/null and b/sound/direct_sound_samples/cries/watchog.aif differ diff --git a/sound/direct_sound_samples/cries/weavile.aif b/sound/direct_sound_samples/cries/weavile.aif new file mode 100644 index 000000000..2a1ff90b5 Binary files /dev/null and b/sound/direct_sound_samples/cries/weavile.aif differ diff --git a/sound/direct_sound_samples/cries/weedle.aif b/sound/direct_sound_samples/cries/weedle.aif new file mode 100644 index 000000000..06a26f3d7 Binary files /dev/null and b/sound/direct_sound_samples/cries/weedle.aif differ diff --git a/sound/direct_sound_samples/cries/weepinbell.aif b/sound/direct_sound_samples/cries/weepinbell.aif new file mode 100644 index 000000000..b5df3f600 Binary files /dev/null and b/sound/direct_sound_samples/cries/weepinbell.aif differ diff --git a/sound/direct_sound_samples/cries/weezing.aif b/sound/direct_sound_samples/cries/weezing.aif new file mode 100644 index 000000000..42c3d4a5b Binary files /dev/null and b/sound/direct_sound_samples/cries/weezing.aif differ diff --git a/sound/direct_sound_samples/cries/whimsicott.aif b/sound/direct_sound_samples/cries/whimsicott.aif new file mode 100644 index 000000000..806904d0d Binary files /dev/null and b/sound/direct_sound_samples/cries/whimsicott.aif differ diff --git a/sound/direct_sound_samples/cries/whirlipede.aif b/sound/direct_sound_samples/cries/whirlipede.aif new file mode 100644 index 000000000..09628dce6 Binary files /dev/null and b/sound/direct_sound_samples/cries/whirlipede.aif differ diff --git a/sound/direct_sound_samples/cries/whiscash.aif b/sound/direct_sound_samples/cries/whiscash.aif new file mode 100644 index 000000000..9d3a28786 Binary files /dev/null and b/sound/direct_sound_samples/cries/whiscash.aif differ diff --git a/sound/direct_sound_samples/cries/whismur.aif b/sound/direct_sound_samples/cries/whismur.aif new file mode 100644 index 000000000..272a9f865 Binary files /dev/null and b/sound/direct_sound_samples/cries/whismur.aif differ diff --git a/sound/direct_sound_samples/cries/wigglytuff.aif b/sound/direct_sound_samples/cries/wigglytuff.aif new file mode 100644 index 000000000..468dcc206 Binary files /dev/null and b/sound/direct_sound_samples/cries/wigglytuff.aif differ diff --git a/sound/direct_sound_samples/cries/wingull.aif b/sound/direct_sound_samples/cries/wingull.aif new file mode 100644 index 000000000..f1965f663 Binary files /dev/null and b/sound/direct_sound_samples/cries/wingull.aif differ diff --git a/sound/direct_sound_samples/cries/wobbuffet.aif b/sound/direct_sound_samples/cries/wobbuffet.aif new file mode 100644 index 000000000..2c8193908 Binary files /dev/null and b/sound/direct_sound_samples/cries/wobbuffet.aif differ diff --git a/sound/direct_sound_samples/cries/woobat.aif b/sound/direct_sound_samples/cries/woobat.aif new file mode 100644 index 000000000..4aa987aa0 Binary files /dev/null and b/sound/direct_sound_samples/cries/woobat.aif differ diff --git a/sound/direct_sound_samples/cries/wooper.aif b/sound/direct_sound_samples/cries/wooper.aif new file mode 100644 index 000000000..c2d80b32c Binary files /dev/null and b/sound/direct_sound_samples/cries/wooper.aif differ diff --git a/sound/direct_sound_samples/cries/wormadam.aif b/sound/direct_sound_samples/cries/wormadam.aif new file mode 100644 index 000000000..633aeeafc Binary files /dev/null and b/sound/direct_sound_samples/cries/wormadam.aif differ diff --git a/sound/direct_sound_samples/cries/wurmple.aif b/sound/direct_sound_samples/cries/wurmple.aif new file mode 100644 index 000000000..e75a6e237 Binary files /dev/null and b/sound/direct_sound_samples/cries/wurmple.aif differ diff --git a/sound/direct_sound_samples/cries/wynaut.aif b/sound/direct_sound_samples/cries/wynaut.aif new file mode 100644 index 000000000..f7563a8eb Binary files /dev/null and b/sound/direct_sound_samples/cries/wynaut.aif differ diff --git a/sound/direct_sound_samples/cries/xatu.aif b/sound/direct_sound_samples/cries/xatu.aif new file mode 100644 index 000000000..8a4f2369d Binary files /dev/null and b/sound/direct_sound_samples/cries/xatu.aif differ diff --git a/sound/direct_sound_samples/cries/yamask.aif b/sound/direct_sound_samples/cries/yamask.aif new file mode 100644 index 000000000..519952d07 Binary files /dev/null and b/sound/direct_sound_samples/cries/yamask.aif differ diff --git a/sound/direct_sound_samples/cries/yanma.aif b/sound/direct_sound_samples/cries/yanma.aif new file mode 100644 index 000000000..5f373734a Binary files /dev/null and b/sound/direct_sound_samples/cries/yanma.aif differ diff --git a/sound/direct_sound_samples/cries/yanmega.aif b/sound/direct_sound_samples/cries/yanmega.aif new file mode 100644 index 000000000..daf0c0d9f Binary files /dev/null and b/sound/direct_sound_samples/cries/yanmega.aif differ diff --git a/sound/direct_sound_samples/cries/zangoose.aif b/sound/direct_sound_samples/cries/zangoose.aif new file mode 100644 index 000000000..f82cd235d Binary files /dev/null and b/sound/direct_sound_samples/cries/zangoose.aif differ diff --git a/sound/direct_sound_samples/cries/zapdos.aif b/sound/direct_sound_samples/cries/zapdos.aif new file mode 100644 index 000000000..88dcb48cc Binary files /dev/null and b/sound/direct_sound_samples/cries/zapdos.aif differ diff --git a/sound/direct_sound_samples/cries/zebstrika.aif b/sound/direct_sound_samples/cries/zebstrika.aif new file mode 100644 index 000000000..ed075a857 Binary files /dev/null and b/sound/direct_sound_samples/cries/zebstrika.aif differ diff --git a/sound/direct_sound_samples/cries/zekrom.aif b/sound/direct_sound_samples/cries/zekrom.aif new file mode 100644 index 000000000..e3fc0cc74 Binary files /dev/null and b/sound/direct_sound_samples/cries/zekrom.aif differ diff --git a/sound/direct_sound_samples/cries/zigzagoon.aif b/sound/direct_sound_samples/cries/zigzagoon.aif new file mode 100644 index 000000000..c477208d1 Binary files /dev/null and b/sound/direct_sound_samples/cries/zigzagoon.aif differ diff --git a/sound/direct_sound_samples/cries/zoroark.aif b/sound/direct_sound_samples/cries/zoroark.aif new file mode 100644 index 000000000..6184a67bd Binary files /dev/null and b/sound/direct_sound_samples/cries/zoroark.aif differ diff --git a/sound/direct_sound_samples/cries/zorua.aif b/sound/direct_sound_samples/cries/zorua.aif new file mode 100644 index 000000000..aa5e68644 Binary files /dev/null and b/sound/direct_sound_samples/cries/zorua.aif differ diff --git a/sound/direct_sound_samples/cries/zubat.aif b/sound/direct_sound_samples/cries/zubat.aif new file mode 100644 index 000000000..4b2d1a1cc Binary files /dev/null and b/sound/direct_sound_samples/cries/zubat.aif differ diff --git a/sound/direct_sound_samples/cries/zweilous.aif b/sound/direct_sound_samples/cries/zweilous.aif new file mode 100644 index 000000000..a4db32468 Binary files /dev/null and b/sound/direct_sound_samples/cries/zweilous.aif differ diff --git a/src/bard_music.c b/src/bard_music.c index 6c2578071..1a61c25ff 100644 --- a/src/bard_music.c +++ b/src/bard_music.c @@ -25,8 +25,8 @@ const struct BardSound *GetWordSounds(u16 word) { return gBardSound_InvalidWord; } - category = word >> 9; - subword = word & 0x1ff; + category = EC_GROUP(word); + subword = EC_INDEX(word); switch (category) { case EC_GROUP_POKEMON: diff --git a/src/battle_ai_script_commands.c b/src/battle_ai_script_commands.c index b7679429c..10eb013fe 100644 --- a/src/battle_ai_script_commands.c +++ b/src/battle_ai_script_commands.c @@ -293,7 +293,7 @@ void BattleAI_HandleItemUseBeforeAISetup(u8 defaultScoreMoves) if ((gBattleTypeFlags & BATTLE_TYPE_TRAINER) && !(gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_SAFARI | BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_EREADER_TRAINER | BATTLE_TYPE_SECRET_BASE | BATTLE_TYPE_FRONTIER - | BATTLE_TYPE_INGAME_PARTNER | BATTLE_TYPE_x2000000) + | BATTLE_TYPE_INGAME_PARTNER | BATTLE_TYPE_RECORDED_LINK) ) ) { diff --git a/src/battle_ai_switch_items.c b/src/battle_ai_switch_items.c index 1663c2561..263c1e7cc 100644 --- a/src/battle_ai_switch_items.c +++ b/src/battle_ai_switch_items.c @@ -62,7 +62,7 @@ static bool8 ShouldSwitchIfWonderGuard(void) } // Get party information. - if (gBattleTypeFlags & (BATTLE_TYPE_TWO_OPPONENTS | BATTLE_TYPE_x800000)) + if (gBattleTypeFlags & (BATTLE_TYPE_TWO_OPPONENTS | BATTLE_TYPE_TOWER_LINK_MULTI)) { if ((gActiveBattler & BIT_FLANK) == B_FLANK_LEFT) firstId = 0, lastId = 3; @@ -158,7 +158,7 @@ static bool8 FindMonThatAbsorbsOpponentsMove(void) if (gBattleMons[gActiveBattler].ability == absorbingTypeAbility) return FALSE; - if (gBattleTypeFlags & (BATTLE_TYPE_TWO_OPPONENTS | BATTLE_TYPE_x800000)) + if (gBattleTypeFlags & (BATTLE_TYPE_TWO_OPPONENTS | BATTLE_TYPE_TOWER_LINK_MULTI)) { if ((gActiveBattler & BIT_FLANK) == B_FLANK_LEFT) firstId = 0, lastId = 3; @@ -353,7 +353,7 @@ static bool8 FindMonWithFlagsAndSuperEffective(u8 flags, u8 moduloPercent) battlerIn2 = gActiveBattler; } - if (gBattleTypeFlags & (BATTLE_TYPE_TWO_OPPONENTS | BATTLE_TYPE_x800000)) + if (gBattleTypeFlags & (BATTLE_TYPE_TWO_OPPONENTS | BATTLE_TYPE_TOWER_LINK_MULTI)) { if ((gActiveBattler & BIT_FLANK) == 0) firstId = 0, lastId = 3; @@ -464,7 +464,7 @@ static bool8 ShouldSwitch(void) battlerIn2 = *activeBattlerPtr; } - if (gBattleTypeFlags & (BATTLE_TYPE_TWO_OPPONENTS | BATTLE_TYPE_x800000)) + if (gBattleTypeFlags & (BATTLE_TYPE_TWO_OPPONENTS | BATTLE_TYPE_TOWER_LINK_MULTI)) { if ((gActiveBattler & BIT_FLANK) == B_FLANK_LEFT) firstId = 0, lastId = 3; @@ -555,7 +555,7 @@ void AI_TrySwitchOrUseItem(void) battlerIn2 = GetBattlerAtPosition(battlerIdentity ^ BIT_FLANK); } - if (gBattleTypeFlags & (BATTLE_TYPE_TWO_OPPONENTS | BATTLE_TYPE_x800000)) + if (gBattleTypeFlags & (BATTLE_TYPE_TWO_OPPONENTS | BATTLE_TYPE_TOWER_LINK_MULTI)) { if ((gActiveBattler & BIT_FLANK) == B_FLANK_LEFT) firstId = 0, lastId = 3; @@ -661,7 +661,7 @@ u8 GetMostSuitableMonToSwitchInto(void) battlerIn2 = gActiveBattler; } - if (gBattleTypeFlags & (BATTLE_TYPE_TWO_OPPONENTS | BATTLE_TYPE_x800000)) + if (gBattleTypeFlags & (BATTLE_TYPE_TWO_OPPONENTS | BATTLE_TYPE_TOWER_LINK_MULTI)) { if ((gActiveBattler & BIT_FLANK) == B_FLANK_LEFT) firstId = 0, lastId = 3; diff --git a/src/battle_anim_effects_3.c b/src/battle_anim_effects_3.c index 665c10c19..73b1e1a00 100755 --- a/src/battle_anim_effects_3.c +++ b/src/battle_anim_effects_3.c @@ -4947,7 +4947,6 @@ static void AnimTask_OdorSleuthMovementWaitFinish(u8 taskId) static void MoveOdorSleuthClone(struct Sprite *sprite) { - int zero = 0; if (++sprite->data[1] > 1) { sprite->data[1] = 0; diff --git a/src/battle_anim_flying.c b/src/battle_anim_flying.c index f8d47f4ec..7d96fed8c 100644 --- a/src/battle_anim_flying.c +++ b/src/battle_anim_flying.c @@ -708,7 +708,6 @@ static void sub_810E520(struct Sprite *sprite) } } data->unk0_0d = 0; - data->unk2; } data->unk0_1 = 0; break; diff --git a/src/battle_anim_normal.c b/src/battle_anim_normal.c index f7df9a4a9..e32ff3151 100644 --- a/src/battle_anim_normal.c +++ b/src/battle_anim_normal.c @@ -564,8 +564,6 @@ static void AnimTask_BlendColorCycleExcludeLoop(u8 taskId) // See AnimTask_BlendColorCycle. Same, but selects palette by ANIM_TAG_* void AnimTask_BlendColorCycleByTag(u8 taskId) { - u8 paletteIndex; - gTasks[taskId].tPalTag = gBattleAnimArgs[0]; gTasks[taskId].tDelay = gBattleAnimArgs[1]; gTasks[taskId].tNumBlends = gBattleAnimArgs[2]; diff --git a/src/battle_anim_throw.c b/src/battle_anim_throw.c index fef301326..0da766036 100755 --- a/src/battle_anim_throw.c +++ b/src/battle_anim_throw.c @@ -1551,8 +1551,6 @@ static void SpriteCB_Ball_Block_Step(struct Sprite *sprite) static void LoadBallParticleGfx(u8 ballId) { - u8 taskId; - if (GetSpriteTileStartByTag(sBallParticleSpriteSheets[ballId].tag) == 0xFFFF) { LoadCompressedSpriteSheetUsingHeap(&sBallParticleSpriteSheets[ballId]); diff --git a/src/battle_anim_water.c b/src/battle_anim_water.c index 2bb90e585..f157102b0 100644 --- a/src/battle_anim_water.c +++ b/src/battle_anim_water.c @@ -881,8 +881,6 @@ static void AnimTask_CreateSurfWave_Step1(u8 taskId) u16 rgbBuffer; u16 *BGptrX = &gBattle_BG1_X; u16 *BGptrY = &gBattle_BG1_Y; - u32 palOffset; - u16 palNum; *BGptrX += gTasks[taskId].data[0]; *BGptrY += gTasks[taskId].data[1]; diff --git a/src/battle_bg.c b/src/battle_bg.c index 7c9b05b25..ad992f7b3 100644 --- a/src/battle_bg.c +++ b/src/battle_bg.c @@ -759,7 +759,7 @@ void LoadBattleMenuWindowGfx(void) void DrawMainBattleBackground(void) { - if (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_FRONTIER | BATTLE_TYPE_EREADER_TRAINER | BATTLE_TYPE_x2000000)) + if (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_FRONTIER | BATTLE_TYPE_EREADER_TRAINER | BATTLE_TYPE_RECORDED_LINK)) { LZDecompressVram(gBattleTerrainTiles_Building, (void*)(BG_CHAR_ADDR(2))); LZDecompressVram(gBattleTerrainTilemap_Building, (void*)(BG_SCREEN_ADDR(26))); @@ -1140,7 +1140,7 @@ void DrawBattleEntryBackground(void) gBattle_BG2_Y = 0xFF5C; LoadCompressedSpriteSheetUsingHeap(&sVsLettersSpriteSheet); } - else if (gBattleTypeFlags & (BATTLE_TYPE_FRONTIER | BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000 | BATTLE_TYPE_EREADER_TRAINER)) + else if (gBattleTypeFlags & (BATTLE_TYPE_FRONTIER | BATTLE_TYPE_LINK | BATTLE_TYPE_RECORDED_LINK | BATTLE_TYPE_EREADER_TRAINER)) { if (!(gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER) || gPartnerTrainerId == TRAINER_STEVEN_PARTNER) { @@ -1221,7 +1221,7 @@ bool8 LoadChosenBattleElement(u8 caseId) LoadCompressedPalette(gBattleTextboxPalette, 0, 0x40); break; case 3: - if (gBattleTypeFlags & (BATTLE_TYPE_FRONTIER | BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000 | BATTLE_TYPE_EREADER_TRAINER)) + if (gBattleTypeFlags & (BATTLE_TYPE_FRONTIER | BATTLE_TYPE_LINK | BATTLE_TYPE_RECORDED_LINK | BATTLE_TYPE_EREADER_TRAINER)) { LZDecompressVram(gBattleTerrainTiles_Building, (void*)(BG_CHAR_ADDR(2))); } @@ -1280,7 +1280,7 @@ bool8 LoadChosenBattleElement(u8 caseId) } break; case 4: - if (gBattleTypeFlags & (BATTLE_TYPE_FRONTIER | BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000 | BATTLE_TYPE_EREADER_TRAINER)) + if (gBattleTypeFlags & (BATTLE_TYPE_FRONTIER | BATTLE_TYPE_LINK | BATTLE_TYPE_RECORDED_LINK | BATTLE_TYPE_EREADER_TRAINER)) { LZDecompressVram(gBattleTerrainTilemap_Building, (void*)(BG_SCREEN_ADDR(26))); } @@ -1342,7 +1342,7 @@ bool8 LoadChosenBattleElement(u8 caseId) } break; case 5: - if (gBattleTypeFlags & (BATTLE_TYPE_FRONTIER | BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000 | BATTLE_TYPE_EREADER_TRAINER)) + if (gBattleTypeFlags & (BATTLE_TYPE_FRONTIER | BATTLE_TYPE_LINK | BATTLE_TYPE_RECORDED_LINK | BATTLE_TYPE_EREADER_TRAINER)) { LoadCompressedPalette(gBattleTerrainPalette_Frontier, 0x20, 0x60); } diff --git a/src/battle_controller_link_opponent.c b/src/battle_controller_link_opponent.c index b6278dd59..ed88bb1a9 100644 --- a/src/battle_controller_link_opponent.c +++ b/src/battle_controller_link_opponent.c @@ -69,10 +69,10 @@ static void LinkOpponentHandleTwoReturnValues(void); static void LinkOpponentHandleChosenMonReturnValue(void); static void LinkOpponentHandleOneReturnValue(void); static void LinkOpponentHandleOneReturnValue_Duplicate(void); -static void LinkOpponentHandleCmd37(void); -static void LinkOpponentHandleCmd38(void); -static void LinkOpponentHandleCmd39(void); -static void LinkOpponentHandleCmd40(void); +static void LinkOpponentHandleClearUnkVar(void); +static void LinkOpponentHandleSetUnkVar(void); +static void LinkOpponentHandleClearUnkFlag(void); +static void LinkOpponentHandleToggleUnkFlag(void); static void LinkOpponentHandleHitAnimation(void); static void LinkOpponentHandleCmd42(void); static void LinkOpponentHandlePlaySE(void); @@ -104,63 +104,63 @@ static void sub_806782C(void); static void (*const sLinkOpponentBufferCommands[CONTROLLER_CMDS_COUNT])(void) = { - LinkOpponentHandleGetMonData, - LinkOpponentHandleGetRawMonData, - LinkOpponentHandleSetMonData, - LinkOpponentHandleSetRawMonData, - LinkOpponentHandleLoadMonSprite, - LinkOpponentHandleSwitchInAnim, - LinkOpponentHandleReturnMonToBall, - LinkOpponentHandleDrawTrainerPic, - LinkOpponentHandleTrainerSlide, - LinkOpponentHandleTrainerSlideBack, - LinkOpponentHandleFaintAnimation, - LinkOpponentHandlePaletteFade, - LinkOpponentHandleSuccessBallThrowAnim, - LinkOpponentHandleBallThrowAnim, - LinkOpponentHandlePause, - LinkOpponentHandleMoveAnimation, - LinkOpponentHandlePrintString, - LinkOpponentHandlePrintSelectionString, - LinkOpponentHandleChooseAction, - LinkOpponentHandleUnknownYesNoBox, - LinkOpponentHandleChooseMove, - LinkOpponentHandleChooseItem, - LinkOpponentHandleChoosePokemon, - LinkOpponentHandleCmd23, - LinkOpponentHandleHealthBarUpdate, - LinkOpponentHandleExpUpdate, - LinkOpponentHandleStatusIconUpdate, - LinkOpponentHandleStatusAnimation, - LinkOpponentHandleStatusXor, - LinkOpponentHandleDataTransfer, - LinkOpponentHandleDMA3Transfer, - LinkOpponentHandlePlayBGM, - LinkOpponentHandleCmd32, - LinkOpponentHandleTwoReturnValues, - LinkOpponentHandleChosenMonReturnValue, - LinkOpponentHandleOneReturnValue, - LinkOpponentHandleOneReturnValue_Duplicate, - LinkOpponentHandleCmd37, - LinkOpponentHandleCmd38, - LinkOpponentHandleCmd39, - LinkOpponentHandleCmd40, - LinkOpponentHandleHitAnimation, - LinkOpponentHandleCmd42, - LinkOpponentHandlePlaySE, - LinkOpponentHandlePlayFanfareOrBGM, - LinkOpponentHandleFaintingCry, - LinkOpponentHandleIntroSlide, - LinkOpponentHandleIntroTrainerBallThrow, - LinkOpponentHandleDrawPartyStatusSummary, - LinkOpponentHandleHidePartyStatusSummary, - LinkOpponentHandleEndBounceEffect, - LinkOpponentHandleSpriteInvisibility, - LinkOpponentHandleBattleAnimation, - LinkOpponentHandleLinkStandbyMsg, - LinkOpponentHandleResetActionMoveSelection, - LinkOpponentHandleCmd55, - LinkOpponentCmdEnd + [CONTROLLER_GETMONDATA] = LinkOpponentHandleGetMonData, + [CONTROLLER_GETRAWMONDATA] = LinkOpponentHandleGetRawMonData, + [CONTROLLER_SETMONDATA] = LinkOpponentHandleSetMonData, + [CONTROLLER_SETRAWMONDATA] = LinkOpponentHandleSetRawMonData, + [CONTROLLER_LOADMONSPRITE] = LinkOpponentHandleLoadMonSprite, + [CONTROLLER_SWITCHINANIM] = LinkOpponentHandleSwitchInAnim, + [CONTROLLER_RETURNMONTOBALL] = LinkOpponentHandleReturnMonToBall, + [CONTROLLER_DRAWTRAINERPIC] = LinkOpponentHandleDrawTrainerPic, + [CONTROLLER_TRAINERSLIDE] = LinkOpponentHandleTrainerSlide, + [CONTROLLER_TRAINERSLIDEBACK] = LinkOpponentHandleTrainerSlideBack, + [CONTROLLER_FAINTANIMATION] = LinkOpponentHandleFaintAnimation, + [CONTROLLER_PALETTEFADE] = LinkOpponentHandlePaletteFade, + [CONTROLLER_SUCCESSBALLTHROWANIM] = LinkOpponentHandleSuccessBallThrowAnim, + [CONTROLLER_BALLTHROWANIM] = LinkOpponentHandleBallThrowAnim, + [CONTROLLER_PAUSE] = LinkOpponentHandlePause, + [CONTROLLER_MOVEANIMATION] = LinkOpponentHandleMoveAnimation, + [CONTROLLER_PRINTSTRING] = LinkOpponentHandlePrintString, + [CONTROLLER_PRINTSTRINGPLAYERONLY] = LinkOpponentHandlePrintSelectionString, + [CONTROLLER_CHOOSEACTION] = LinkOpponentHandleChooseAction, + [CONTROLLER_UNKNOWNYESNOBOX] = LinkOpponentHandleUnknownYesNoBox, + [CONTROLLER_CHOOSEMOVE] = LinkOpponentHandleChooseMove, + [CONTROLLER_OPENBAG] = LinkOpponentHandleChooseItem, + [CONTROLLER_CHOOSEPOKEMON] = LinkOpponentHandleChoosePokemon, + [CONTROLLER_23] = LinkOpponentHandleCmd23, + [CONTROLLER_HEALTHBARUPDATE] = LinkOpponentHandleHealthBarUpdate, + [CONTROLLER_EXPUPDATE] = LinkOpponentHandleExpUpdate, + [CONTROLLER_STATUSICONUPDATE] = LinkOpponentHandleStatusIconUpdate, + [CONTROLLER_STATUSANIMATION] = LinkOpponentHandleStatusAnimation, + [CONTROLLER_STATUSXOR] = LinkOpponentHandleStatusXor, + [CONTROLLER_DATATRANSFER] = LinkOpponentHandleDataTransfer, + [CONTROLLER_DMA3TRANSFER] = LinkOpponentHandleDMA3Transfer, + [CONTROLLER_PLAYBGM] = LinkOpponentHandlePlayBGM, + [CONTROLLER_32] = LinkOpponentHandleCmd32, + [CONTROLLER_TWORETURNVALUES] = LinkOpponentHandleTwoReturnValues, + [CONTROLLER_CHOSENMONRETURNVALUE] = LinkOpponentHandleChosenMonReturnValue, + [CONTROLLER_ONERETURNVALUE] = LinkOpponentHandleOneReturnValue, + [CONTROLLER_ONERETURNVALUE_DUPLICATE] = LinkOpponentHandleOneReturnValue_Duplicate, + [CONTROLLER_CLEARUNKVAR] = LinkOpponentHandleClearUnkVar, + [CONTROLLER_SETUNKVAR] = LinkOpponentHandleSetUnkVar, + [CONTROLLER_CLEARUNKFLAG] = LinkOpponentHandleClearUnkFlag, + [CONTROLLER_TOGGLEUNKFLAG] = LinkOpponentHandleToggleUnkFlag, + [CONTROLLER_HITANIMATION] = LinkOpponentHandleHitAnimation, + [CONTROLLER_42] = LinkOpponentHandleCmd42, + [CONTROLLER_PLAYSE] = LinkOpponentHandlePlaySE, + [CONTROLLER_PLAYFANFAREORBGM] = LinkOpponentHandlePlayFanfareOrBGM, + [CONTROLLER_FAINTINGCRY] = LinkOpponentHandleFaintingCry, + [CONTROLLER_INTROSLIDE] = LinkOpponentHandleIntroSlide, + [CONTROLLER_INTROTRAINERBALLTHROW] = LinkOpponentHandleIntroTrainerBallThrow, + [CONTROLLER_DRAWPARTYSTATUSSUMMARY] = LinkOpponentHandleDrawPartyStatusSummary, + [CONTROLLER_HIDEPARTYSTATUSSUMMARY] = LinkOpponentHandleHidePartyStatusSummary, + [CONTROLLER_ENDBOUNCE] = LinkOpponentHandleEndBounceEffect, + [CONTROLLER_SPRITEINVISIBILITY] = LinkOpponentHandleSpriteInvisibility, + [CONTROLLER_BATTLEANIMATION] = LinkOpponentHandleBattleAnimation, + [CONTROLLER_LINKSTANDBYMSG] = LinkOpponentHandleLinkStandbyMsg, + [CONTROLLER_RESETACTIONMOVESELECTION] = LinkOpponentHandleResetActionMoveSelection, + [CONTROLLER_55] = LinkOpponentHandleCmd55, + [CONTROLLER_TERMINATOR_NOP] = LinkOpponentCmdEnd }; static void nullsub_28(void) @@ -1603,27 +1603,27 @@ static void LinkOpponentHandleOneReturnValue_Duplicate(void) LinkOpponentBufferExecCompleted(); } -static void LinkOpponentHandleCmd37(void) +static void LinkOpponentHandleClearUnkVar(void) { - gUnknown_02022D0C.field_0 = 0; + gUnusedControllerStruct.unk = 0; LinkOpponentBufferExecCompleted(); } -static void LinkOpponentHandleCmd38(void) +static void LinkOpponentHandleSetUnkVar(void) { - gUnknown_02022D0C.field_0 = gBattleBufferA[gActiveBattler][1]; + gUnusedControllerStruct.unk = gBattleBufferA[gActiveBattler][1]; LinkOpponentBufferExecCompleted(); } -static void LinkOpponentHandleCmd39(void) +static void LinkOpponentHandleClearUnkFlag(void) { - gUnknown_02022D0C.flag_x80 = 0; + gUnusedControllerStruct.flag = 0; LinkOpponentBufferExecCompleted(); } -static void LinkOpponentHandleCmd40(void) +static void LinkOpponentHandleToggleUnkFlag(void) { - gUnknown_02022D0C.flag_x80 ^= 1; + gUnusedControllerStruct.flag ^= 1; LinkOpponentBufferExecCompleted(); } @@ -1692,7 +1692,6 @@ static void LinkOpponentHandleIntroSlide(void) static void LinkOpponentHandleIntroTrainerBallThrow(void) { - u8 paletteNum; u8 taskId; SetSpritePrimaryCoordsFromSecondaryCoords(&gSprites[gBattlerSpriteIds[gActiveBattler]]); diff --git a/src/battle_controller_link_partner.c b/src/battle_controller_link_partner.c index c6cb101fc..daf1ff4fd 100644 --- a/src/battle_controller_link_partner.c +++ b/src/battle_controller_link_partner.c @@ -67,10 +67,10 @@ static void LinkPartnerHandleTwoReturnValues(void); static void LinkPartnerHandleChosenMonReturnValue(void); static void LinkPartnerHandleOneReturnValue(void); static void LinkPartnerHandleOneReturnValue_Duplicate(void); -static void LinkPartnerHandleCmd37(void); -static void LinkPartnerHandleCmd38(void); -static void LinkPartnerHandleCmd39(void); -static void LinkPartnerHandleCmd40(void); +static void LinkPartnerHandleClearUnkVar(void); +static void LinkPartnerHandleSetUnkVar(void); +static void LinkPartnerHandleClearUnkFlag(void); +static void LinkPartnerHandleToggleUnkFlag(void); static void LinkPartnerHandleHitAnimation(void); static void LinkPartnerHandleCmd42(void); static void LinkPartnerHandlePlaySE(void); @@ -101,63 +101,63 @@ static void sub_814DE9C(void); static void (*const sLinkPartnerBufferCommands[CONTROLLER_CMDS_COUNT])(void) = { - LinkPartnerHandleGetMonData, - LinkPartnerHandleGetRawMonData, - LinkPartnerHandleSetMonData, - LinkPartnerHandleSetRawMonData, - LinkPartnerHandleLoadMonSprite, - LinkPartnerHandleSwitchInAnim, - LinkPartnerHandleReturnMonToBall, - LinkPartnerHandleDrawTrainerPic, - LinkPartnerHandleTrainerSlide, - LinkPartnerHandleTrainerSlideBack, - LinkPartnerHandleFaintAnimation, - LinkPartnerHandlePaletteFade, - LinkPartnerHandleSuccessBallThrowAnim, - LinkPartnerHandleBallThrowAnim, - LinkPartnerHandlePause, - LinkPartnerHandleMoveAnimation, - LinkPartnerHandlePrintString, - LinkPartnerHandlePrintSelectionString, - LinkPartnerHandleChooseAction, - LinkPartnerHandleUnknownYesNoBox, - LinkPartnerHandleChooseMove, - LinkPartnerHandleChooseItem, - LinkPartnerHandleChoosePokemon, - LinkPartnerHandleCmd23, - LinkPartnerHandleHealthBarUpdate, - LinkPartnerHandleExpUpdate, - LinkPartnerHandleStatusIconUpdate, - LinkPartnerHandleStatusAnimation, - LinkPartnerHandleStatusXor, - LinkPartnerHandleDataTransfer, - LinkPartnerHandleDMA3Transfer, - LinkPartnerHandlePlayBGM, - LinkPartnerHandleCmd32, - LinkPartnerHandleTwoReturnValues, - LinkPartnerHandleChosenMonReturnValue, - LinkPartnerHandleOneReturnValue, - LinkPartnerHandleOneReturnValue_Duplicate, - LinkPartnerHandleCmd37, - LinkPartnerHandleCmd38, - LinkPartnerHandleCmd39, - LinkPartnerHandleCmd40, - LinkPartnerHandleHitAnimation, - LinkPartnerHandleCmd42, - LinkPartnerHandlePlaySE, - LinkPartnerHandlePlayFanfareOrBGM, - LinkPartnerHandleFaintingCry, - LinkPartnerHandleIntroSlide, - LinkPartnerHandleIntroTrainerBallThrow, - LinkPartnerHandleDrawPartyStatusSummary, - LinkPartnerHandleHidePartyStatusSummary, - LinkPartnerHandleEndBounceEffect, - LinkPartnerHandleSpriteInvisibility, - LinkPartnerHandleBattleAnimation, - LinkPartnerHandleLinkStandbyMsg, - LinkPartnerHandleResetActionMoveSelection, - LinkPartnerHandleCmd55, - LinkPartnerCmdEnd + [CONTROLLER_GETMONDATA] = LinkPartnerHandleGetMonData, + [CONTROLLER_GETRAWMONDATA] = LinkPartnerHandleGetRawMonData, + [CONTROLLER_SETMONDATA] = LinkPartnerHandleSetMonData, + [CONTROLLER_SETRAWMONDATA] = LinkPartnerHandleSetRawMonData, + [CONTROLLER_LOADMONSPRITE] = LinkPartnerHandleLoadMonSprite, + [CONTROLLER_SWITCHINANIM] = LinkPartnerHandleSwitchInAnim, + [CONTROLLER_RETURNMONTOBALL] = LinkPartnerHandleReturnMonToBall, + [CONTROLLER_DRAWTRAINERPIC] = LinkPartnerHandleDrawTrainerPic, + [CONTROLLER_TRAINERSLIDE] = LinkPartnerHandleTrainerSlide, + [CONTROLLER_TRAINERSLIDEBACK] = LinkPartnerHandleTrainerSlideBack, + [CONTROLLER_FAINTANIMATION] = LinkPartnerHandleFaintAnimation, + [CONTROLLER_PALETTEFADE] = LinkPartnerHandlePaletteFade, + [CONTROLLER_SUCCESSBALLTHROWANIM] = LinkPartnerHandleSuccessBallThrowAnim, + [CONTROLLER_BALLTHROWANIM] = LinkPartnerHandleBallThrowAnim, + [CONTROLLER_PAUSE] = LinkPartnerHandlePause, + [CONTROLLER_MOVEANIMATION] = LinkPartnerHandleMoveAnimation, + [CONTROLLER_PRINTSTRING] = LinkPartnerHandlePrintString, + [CONTROLLER_PRINTSTRINGPLAYERONLY] = LinkPartnerHandlePrintSelectionString, + [CONTROLLER_CHOOSEACTION] = LinkPartnerHandleChooseAction, + [CONTROLLER_UNKNOWNYESNOBOX] = LinkPartnerHandleUnknownYesNoBox, + [CONTROLLER_CHOOSEMOVE] = LinkPartnerHandleChooseMove, + [CONTROLLER_OPENBAG] = LinkPartnerHandleChooseItem, + [CONTROLLER_CHOOSEPOKEMON] = LinkPartnerHandleChoosePokemon, + [CONTROLLER_23] = LinkPartnerHandleCmd23, + [CONTROLLER_HEALTHBARUPDATE] = LinkPartnerHandleHealthBarUpdate, + [CONTROLLER_EXPUPDATE] = LinkPartnerHandleExpUpdate, + [CONTROLLER_STATUSICONUPDATE] = LinkPartnerHandleStatusIconUpdate, + [CONTROLLER_STATUSANIMATION] = LinkPartnerHandleStatusAnimation, + [CONTROLLER_STATUSXOR] = LinkPartnerHandleStatusXor, + [CONTROLLER_DATATRANSFER] = LinkPartnerHandleDataTransfer, + [CONTROLLER_DMA3TRANSFER] = LinkPartnerHandleDMA3Transfer, + [CONTROLLER_PLAYBGM] = LinkPartnerHandlePlayBGM, + [CONTROLLER_32] = LinkPartnerHandleCmd32, + [CONTROLLER_TWORETURNVALUES] = LinkPartnerHandleTwoReturnValues, + [CONTROLLER_CHOSENMONRETURNVALUE] = LinkPartnerHandleChosenMonReturnValue, + [CONTROLLER_ONERETURNVALUE] = LinkPartnerHandleOneReturnValue, + [CONTROLLER_ONERETURNVALUE_DUPLICATE] = LinkPartnerHandleOneReturnValue_Duplicate, + [CONTROLLER_CLEARUNKVAR] = LinkPartnerHandleClearUnkVar, + [CONTROLLER_SETUNKVAR] = LinkPartnerHandleSetUnkVar, + [CONTROLLER_CLEARUNKFLAG] = LinkPartnerHandleClearUnkFlag, + [CONTROLLER_TOGGLEUNKFLAG] = LinkPartnerHandleToggleUnkFlag, + [CONTROLLER_HITANIMATION] = LinkPartnerHandleHitAnimation, + [CONTROLLER_42] = LinkPartnerHandleCmd42, + [CONTROLLER_PLAYSE] = LinkPartnerHandlePlaySE, + [CONTROLLER_PLAYFANFAREORBGM] = LinkPartnerHandlePlayFanfareOrBGM, + [CONTROLLER_FAINTINGCRY] = LinkPartnerHandleFaintingCry, + [CONTROLLER_INTROSLIDE] = LinkPartnerHandleIntroSlide, + [CONTROLLER_INTROTRAINERBALLTHROW] = LinkPartnerHandleIntroTrainerBallThrow, + [CONTROLLER_DRAWPARTYSTATUSSUMMARY] = LinkPartnerHandleDrawPartyStatusSummary, + [CONTROLLER_HIDEPARTYSTATUSSUMMARY] = LinkPartnerHandleHidePartyStatusSummary, + [CONTROLLER_ENDBOUNCE] = LinkPartnerHandleEndBounceEffect, + [CONTROLLER_SPRITEINVISIBILITY] = LinkPartnerHandleSpriteInvisibility, + [CONTROLLER_BATTLEANIMATION] = LinkPartnerHandleBattleAnimation, + [CONTROLLER_LINKSTANDBYMSG] = LinkPartnerHandleLinkStandbyMsg, + [CONTROLLER_RESETACTIONMOVESELECTION] = LinkPartnerHandleResetActionMoveSelection, + [CONTROLLER_55] = LinkPartnerHandleCmd55, + [CONTROLLER_TERMINATOR_NOP] = LinkPartnerCmdEnd }; static void SpriteCB_Null2(void) @@ -1427,27 +1427,27 @@ static void LinkPartnerHandleOneReturnValue_Duplicate(void) LinkPartnerBufferExecCompleted(); } -static void LinkPartnerHandleCmd37(void) +static void LinkPartnerHandleClearUnkVar(void) { - gUnknown_02022D0C.field_0 = 0; + gUnusedControllerStruct.unk = 0; LinkPartnerBufferExecCompleted(); } -static void LinkPartnerHandleCmd38(void) +static void LinkPartnerHandleSetUnkVar(void) { - gUnknown_02022D0C.field_0 = gBattleBufferA[gActiveBattler][1]; + gUnusedControllerStruct.unk = gBattleBufferA[gActiveBattler][1]; LinkPartnerBufferExecCompleted(); } -static void LinkPartnerHandleCmd39(void) +static void LinkPartnerHandleClearUnkFlag(void) { - gUnknown_02022D0C.flag_x80 = 0; + gUnusedControllerStruct.flag = 0; LinkPartnerBufferExecCompleted(); } -static void LinkPartnerHandleCmd40(void) +static void LinkPartnerHandleToggleUnkFlag(void) { - gUnknown_02022D0C.flag_x80 ^= 1; + gUnusedControllerStruct.flag ^= 1; LinkPartnerBufferExecCompleted(); } diff --git a/src/battle_controller_opponent.c b/src/battle_controller_opponent.c index 4c8eff859..82c69802b 100644 --- a/src/battle_controller_opponent.c +++ b/src/battle_controller_opponent.c @@ -74,10 +74,10 @@ static void OpponentHandleTwoReturnValues(void); static void OpponentHandleChosenMonReturnValue(void); static void OpponentHandleOneReturnValue(void); static void OpponentHandleOneReturnValue_Duplicate(void); -static void OpponentHandleCmd37(void); -static void OpponentHandleCmd38(void); -static void OpponentHandleCmd39(void); -static void OpponentHandleCmd40(void); +static void OpponentHandleClearUnkVar(void); +static void OpponentHandleSetUnkVar(void); +static void OpponentHandleClearUnkFlag(void); +static void OpponentHandleToggleUnkFlag(void); static void OpponentHandleHitAnimation(void); static void OpponentHandleCmd42(void); static void OpponentHandlePlaySE(void); @@ -109,67 +109,67 @@ static void sub_8062A2C(void); static void (*const sOpponentBufferCommands[CONTROLLER_CMDS_COUNT])(void) = { - OpponentHandleGetMonData, - OpponentHandleGetRawMonData, - OpponentHandleSetMonData, - OpponentHandleSetRawMonData, - OpponentHandleLoadMonSprite, - OpponentHandleSwitchInAnim, - OpponentHandleReturnMonToBall, - OpponentHandleDrawTrainerPic, - OpponentHandleTrainerSlide, - OpponentHandleTrainerSlideBack, - OpponentHandleFaintAnimation, - OpponentHandlePaletteFade, - OpponentHandleSuccessBallThrowAnim, - OpponentHandleBallThrow, - OpponentHandlePause, - OpponentHandleMoveAnimation, - OpponentHandlePrintString, - OpponentHandlePrintSelectionString, - OpponentHandleChooseAction, - OpponentHandleUnknownYesNoBox, - OpponentHandleChooseMove, - OpponentHandleChooseItem, - OpponentHandleChoosePokemon, - OpponentHandleCmd23, - OpponentHandleHealthBarUpdate, - OpponentHandleExpUpdate, - OpponentHandleStatusIconUpdate, - OpponentHandleStatusAnimation, - OpponentHandleStatusXor, - OpponentHandleDataTransfer, - OpponentHandleDMA3Transfer, - OpponentHandlePlayBGM, - OpponentHandleCmd32, - OpponentHandleTwoReturnValues, - OpponentHandleChosenMonReturnValue, - OpponentHandleOneReturnValue, - OpponentHandleOneReturnValue_Duplicate, - OpponentHandleCmd37, - OpponentHandleCmd38, - OpponentHandleCmd39, - OpponentHandleCmd40, - OpponentHandleHitAnimation, - OpponentHandleCmd42, - OpponentHandlePlaySE, - OpponentHandlePlayFanfareOrBGM, - OpponentHandleFaintingCry, - OpponentHandleIntroSlide, - OpponentHandleIntroTrainerBallThrow, - OpponentHandleDrawPartyStatusSummary, - OpponentHandleHidePartyStatusSummary, - OpponentHandleEndBounceEffect, - OpponentHandleSpriteInvisibility, - OpponentHandleBattleAnimation, - OpponentHandleLinkStandbyMsg, - OpponentHandleResetActionMoveSelection, - OpponentHandleCmd55, - OpponentCmdEnd + [CONTROLLER_GETMONDATA] = OpponentHandleGetMonData, + [CONTROLLER_GETRAWMONDATA] = OpponentHandleGetRawMonData, + [CONTROLLER_SETMONDATA] = OpponentHandleSetMonData, + [CONTROLLER_SETRAWMONDATA] = OpponentHandleSetRawMonData, + [CONTROLLER_LOADMONSPRITE] = OpponentHandleLoadMonSprite, + [CONTROLLER_SWITCHINANIM] = OpponentHandleSwitchInAnim, + [CONTROLLER_RETURNMONTOBALL] = OpponentHandleReturnMonToBall, + [CONTROLLER_DRAWTRAINERPIC] = OpponentHandleDrawTrainerPic, + [CONTROLLER_TRAINERSLIDE] = OpponentHandleTrainerSlide, + [CONTROLLER_TRAINERSLIDEBACK] = OpponentHandleTrainerSlideBack, + [CONTROLLER_FAINTANIMATION] = OpponentHandleFaintAnimation, + [CONTROLLER_PALETTEFADE] = OpponentHandlePaletteFade, + [CONTROLLER_SUCCESSBALLTHROWANIM] = OpponentHandleSuccessBallThrowAnim, + [CONTROLLER_BALLTHROWANIM] = OpponentHandleBallThrow, + [CONTROLLER_PAUSE] = OpponentHandlePause, + [CONTROLLER_MOVEANIMATION] = OpponentHandleMoveAnimation, + [CONTROLLER_PRINTSTRING] = OpponentHandlePrintString, + [CONTROLLER_PRINTSTRINGPLAYERONLY] = OpponentHandlePrintSelectionString, + [CONTROLLER_CHOOSEACTION] = OpponentHandleChooseAction, + [CONTROLLER_UNKNOWNYESNOBOX] = OpponentHandleUnknownYesNoBox, + [CONTROLLER_CHOOSEMOVE] = OpponentHandleChooseMove, + [CONTROLLER_OPENBAG] = OpponentHandleChooseItem, + [CONTROLLER_CHOOSEPOKEMON] = OpponentHandleChoosePokemon, + [CONTROLLER_23] = OpponentHandleCmd23, + [CONTROLLER_HEALTHBARUPDATE] = OpponentHandleHealthBarUpdate, + [CONTROLLER_EXPUPDATE] = OpponentHandleExpUpdate, + [CONTROLLER_STATUSICONUPDATE] = OpponentHandleStatusIconUpdate, + [CONTROLLER_STATUSANIMATION] = OpponentHandleStatusAnimation, + [CONTROLLER_STATUSXOR] = OpponentHandleStatusXor, + [CONTROLLER_DATATRANSFER] = OpponentHandleDataTransfer, + [CONTROLLER_DMA3TRANSFER] = OpponentHandleDMA3Transfer, + [CONTROLLER_PLAYBGM] = OpponentHandlePlayBGM, + [CONTROLLER_32] = OpponentHandleCmd32, + [CONTROLLER_TWORETURNVALUES] = OpponentHandleTwoReturnValues, + [CONTROLLER_CHOSENMONRETURNVALUE] = OpponentHandleChosenMonReturnValue, + [CONTROLLER_ONERETURNVALUE] = OpponentHandleOneReturnValue, + [CONTROLLER_ONERETURNVALUE_DUPLICATE] = OpponentHandleOneReturnValue_Duplicate, + [CONTROLLER_CLEARUNKVAR] = OpponentHandleClearUnkVar, + [CONTROLLER_SETUNKVAR] = OpponentHandleSetUnkVar, + [CONTROLLER_CLEARUNKFLAG] = OpponentHandleClearUnkFlag, + [CONTROLLER_TOGGLEUNKFLAG] = OpponentHandleToggleUnkFlag, + [CONTROLLER_HITANIMATION] = OpponentHandleHitAnimation, + [CONTROLLER_42] = OpponentHandleCmd42, + [CONTROLLER_PLAYSE] = OpponentHandlePlaySE, + [CONTROLLER_PLAYFANFAREORBGM] = OpponentHandlePlayFanfareOrBGM, + [CONTROLLER_FAINTINGCRY] = OpponentHandleFaintingCry, + [CONTROLLER_INTROSLIDE] = OpponentHandleIntroSlide, + [CONTROLLER_INTROTRAINERBALLTHROW] = OpponentHandleIntroTrainerBallThrow, + [CONTROLLER_DRAWPARTYSTATUSSUMMARY] = OpponentHandleDrawPartyStatusSummary, + [CONTROLLER_HIDEPARTYSTATUSSUMMARY] = OpponentHandleHidePartyStatusSummary, + [CONTROLLER_ENDBOUNCE] = OpponentHandleEndBounceEffect, + [CONTROLLER_SPRITEINVISIBILITY] = OpponentHandleSpriteInvisibility, + [CONTROLLER_BATTLEANIMATION] = OpponentHandleBattleAnimation, + [CONTROLLER_LINKSTANDBYMSG] = OpponentHandleLinkStandbyMsg, + [CONTROLLER_RESETACTIONMOVESELECTION] = OpponentHandleResetActionMoveSelection, + [CONTROLLER_55] = OpponentHandleCmd55, + [CONTROLLER_TERMINATOR_NOP] = OpponentCmdEnd }; // unknown unused data -static const u8 sUnknown_0831C7AC[] = {0xB0, 0xB0, 0xC8, 0x98, 0x28, 0x28, 0x28, 0x20}; +static const u8 sUnused[] = {0xB0, 0xB0, 0xC8, 0x98, 0x28, 0x28, 0x28, 0x20}; static void nullsub_26(void) { @@ -1259,7 +1259,7 @@ static void OpponentHandleDrawTrainerPic(void) } else if (gBattleTypeFlags & BATTLE_TYPE_FRONTIER) { - if (gBattleTypeFlags & (BATTLE_TYPE_TWO_OPPONENTS | BATTLE_TYPE_x800000)) + if (gBattleTypeFlags & (BATTLE_TYPE_TWO_OPPONENTS | BATTLE_TYPE_TOWER_LINK_MULTI)) { if (gActiveBattler == 1) trainerPicId = GetFrontierTrainerFrontSpriteId(gTrainerBattleOpponent_A); @@ -1343,7 +1343,7 @@ static void OpponentHandleTrainerSlide(void) } else if (gBattleTypeFlags & BATTLE_TYPE_FRONTIER) { - if (gBattleTypeFlags & (BATTLE_TYPE_TWO_OPPONENTS | BATTLE_TYPE_x800000)) + if (gBattleTypeFlags & (BATTLE_TYPE_TWO_OPPONENTS | BATTLE_TYPE_TOWER_LINK_MULTI)) { if (gActiveBattler == 1) trainerPicId = GetFrontierTrainerFrontSpriteId(gTrainerBattleOpponent_A); @@ -1631,7 +1631,7 @@ static void OpponentHandleChoosePokemon(void) battler2 = GetBattlerAtPosition(B_POSITION_OPPONENT_RIGHT); } - if (gBattleTypeFlags & (BATTLE_TYPE_TWO_OPPONENTS | BATTLE_TYPE_x800000)) + if (gBattleTypeFlags & (BATTLE_TYPE_TWO_OPPONENTS | BATTLE_TYPE_TOWER_LINK_MULTI)) { if (gActiveBattler == 1) firstId = 0, lastId = 3; @@ -1768,27 +1768,27 @@ static void OpponentHandleOneReturnValue_Duplicate(void) OpponentBufferExecCompleted(); } -static void OpponentHandleCmd37(void) +static void OpponentHandleClearUnkVar(void) { - gUnknown_02022D0C.field_0 = 0; + gUnusedControllerStruct.unk = 0; OpponentBufferExecCompleted(); } -static void OpponentHandleCmd38(void) +static void OpponentHandleSetUnkVar(void) { - gUnknown_02022D0C.field_0 = gBattleBufferA[gActiveBattler][1]; + gUnusedControllerStruct.unk = gBattleBufferA[gActiveBattler][1]; OpponentBufferExecCompleted(); } -static void OpponentHandleCmd39(void) +static void OpponentHandleClearUnkFlag(void) { - gUnknown_02022D0C.flag_x80 = 0; + gUnusedControllerStruct.flag = 0; OpponentBufferExecCompleted(); } -static void OpponentHandleCmd40(void) +static void OpponentHandleToggleUnkFlag(void) { - gUnknown_02022D0C.flag_x80 ^= 1; + gUnusedControllerStruct.flag ^= 1; OpponentBufferExecCompleted(); } @@ -1857,7 +1857,6 @@ static void OpponentHandleIntroSlide(void) static void OpponentHandleIntroTrainerBallThrow(void) { - u8 paletteNum; u8 taskId; SetSpritePrimaryCoordsFromSecondaryCoords(&gSprites[gBattlerSpriteIds[gActiveBattler]]); diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c index 1d26221fe..ba762fdb4 100644 --- a/src/battle_controller_player.c +++ b/src/battle_controller_player.c @@ -75,10 +75,10 @@ static void PlayerHandleTwoReturnValues(void); static void PlayerHandleChosenMonReturnValue(void); static void PlayerHandleOneReturnValue(void); static void PlayerHandleOneReturnValue_Duplicate(void); -static void PlayerHandleCmd37(void); -static void PlayerHandleCmd38(void); -static void PlayerHandleCmd39(void); -static void PlayerHandleCmd40(void); +static void PlayerHandleClearUnkVar(void); +static void PlayerHandleSetUnkVar(void); +static void PlayerHandleClearUnkFlag(void); +static void PlayerHandleToggleUnkFlag(void); static void PlayerHandleHitAnimation(void); static void PlayerHandleCmd42(void); static void PlayerHandlePlaySE(void); @@ -125,69 +125,69 @@ static void sub_805CE38(void); static void (*const sPlayerBufferCommands[CONTROLLER_CMDS_COUNT])(void) = { - PlayerHandleGetMonData, - PlayerHandleGetRawMonData, - PlayerHandleSetMonData, - PlayerHandleSetRawMonData, - PlayerHandleLoadMonSprite, - PlayerHandleSwitchInAnim, - PlayerHandleReturnMonToBall, - PlayerHandleDrawTrainerPic, - PlayerHandleTrainerSlide, - PlayerHandleTrainerSlideBack, - PlayerHandleFaintAnimation, - PlayerHandlePaletteFade, - PlayerHandleSuccessBallThrowAnim, - PlayerHandleBallThrowAnim, - PlayerHandlePause, - PlayerHandleMoveAnimation, - PlayerHandlePrintString, - PlayerHandlePrintSelectionString, - PlayerHandleChooseAction, - PlayerHandleUnknownYesNoBox, - PlayerHandleChooseMove, - PlayerHandleChooseItem, - PlayerHandleChoosePokemon, - PlayerHandleCmd23, - PlayerHandleHealthBarUpdate, - PlayerHandleExpUpdate, - PlayerHandleStatusIconUpdate, - PlayerHandleStatusAnimation, - PlayerHandleStatusXor, - PlayerHandleDataTransfer, - PlayerHandleDMA3Transfer, - PlayerHandlePlayBGM, - PlayerHandleCmd32, - PlayerHandleTwoReturnValues, - PlayerHandleChosenMonReturnValue, - PlayerHandleOneReturnValue, - PlayerHandleOneReturnValue_Duplicate, - PlayerHandleCmd37, - PlayerHandleCmd38, - PlayerHandleCmd39, - PlayerHandleCmd40, - PlayerHandleHitAnimation, - PlayerHandleCmd42, - PlayerHandlePlaySE, - PlayerHandlePlayFanfareOrBGM, - PlayerHandleFaintingCry, - PlayerHandleIntroSlide, - PlayerHandleIntroTrainerBallThrow, - PlayerHandleDrawPartyStatusSummary, - PlayerHandleHidePartyStatusSummary, - PlayerHandleEndBounceEffect, - PlayerHandleSpriteInvisibility, - PlayerHandleBattleAnimation, - PlayerHandleLinkStandbyMsg, - PlayerHandleResetActionMoveSelection, - PlayerHandleCmd55, - PlayerCmdEnd + [CONTROLLER_GETMONDATA] = PlayerHandleGetMonData, + [CONTROLLER_GETRAWMONDATA] = PlayerHandleGetRawMonData, + [CONTROLLER_SETMONDATA] = PlayerHandleSetMonData, + [CONTROLLER_SETRAWMONDATA] = PlayerHandleSetRawMonData, + [CONTROLLER_LOADMONSPRITE] = PlayerHandleLoadMonSprite, + [CONTROLLER_SWITCHINANIM] = PlayerHandleSwitchInAnim, + [CONTROLLER_RETURNMONTOBALL] = PlayerHandleReturnMonToBall, + [CONTROLLER_DRAWTRAINERPIC] = PlayerHandleDrawTrainerPic, + [CONTROLLER_TRAINERSLIDE] = PlayerHandleTrainerSlide, + [CONTROLLER_TRAINERSLIDEBACK] = PlayerHandleTrainerSlideBack, + [CONTROLLER_FAINTANIMATION] = PlayerHandleFaintAnimation, + [CONTROLLER_PALETTEFADE] = PlayerHandlePaletteFade, + [CONTROLLER_SUCCESSBALLTHROWANIM] = PlayerHandleSuccessBallThrowAnim, + [CONTROLLER_BALLTHROWANIM] = PlayerHandleBallThrowAnim, + [CONTROLLER_PAUSE] = PlayerHandlePause, + [CONTROLLER_MOVEANIMATION] = PlayerHandleMoveAnimation, + [CONTROLLER_PRINTSTRING] = PlayerHandlePrintString, + [CONTROLLER_PRINTSTRINGPLAYERONLY] = PlayerHandlePrintSelectionString, + [CONTROLLER_CHOOSEACTION] = PlayerHandleChooseAction, + [CONTROLLER_UNKNOWNYESNOBOX] = PlayerHandleUnknownYesNoBox, + [CONTROLLER_CHOOSEMOVE] = PlayerHandleChooseMove, + [CONTROLLER_OPENBAG] = PlayerHandleChooseItem, + [CONTROLLER_CHOOSEPOKEMON] = PlayerHandleChoosePokemon, + [CONTROLLER_23] = PlayerHandleCmd23, + [CONTROLLER_HEALTHBARUPDATE] = PlayerHandleHealthBarUpdate, + [CONTROLLER_EXPUPDATE] = PlayerHandleExpUpdate, + [CONTROLLER_STATUSICONUPDATE] = PlayerHandleStatusIconUpdate, + [CONTROLLER_STATUSANIMATION] = PlayerHandleStatusAnimation, + [CONTROLLER_STATUSXOR] = PlayerHandleStatusXor, + [CONTROLLER_DATATRANSFER] = PlayerHandleDataTransfer, + [CONTROLLER_DMA3TRANSFER] = PlayerHandleDMA3Transfer, + [CONTROLLER_PLAYBGM] = PlayerHandlePlayBGM, + [CONTROLLER_32] = PlayerHandleCmd32, + [CONTROLLER_TWORETURNVALUES] = PlayerHandleTwoReturnValues, + [CONTROLLER_CHOSENMONRETURNVALUE] = PlayerHandleChosenMonReturnValue, + [CONTROLLER_ONERETURNVALUE] = PlayerHandleOneReturnValue, + [CONTROLLER_ONERETURNVALUE_DUPLICATE] = PlayerHandleOneReturnValue_Duplicate, + [CONTROLLER_CLEARUNKVAR] = PlayerHandleClearUnkVar, + [CONTROLLER_SETUNKVAR] = PlayerHandleSetUnkVar, + [CONTROLLER_CLEARUNKFLAG] = PlayerHandleClearUnkFlag, + [CONTROLLER_TOGGLEUNKFLAG] = PlayerHandleToggleUnkFlag, + [CONTROLLER_HITANIMATION] = PlayerHandleHitAnimation, + [CONTROLLER_42] = PlayerHandleCmd42, + [CONTROLLER_PLAYSE] = PlayerHandlePlaySE, + [CONTROLLER_PLAYFANFAREORBGM] = PlayerHandlePlayFanfareOrBGM, + [CONTROLLER_FAINTINGCRY] = PlayerHandleFaintingCry, + [CONTROLLER_INTROSLIDE] = PlayerHandleIntroSlide, + [CONTROLLER_INTROTRAINERBALLTHROW] = PlayerHandleIntroTrainerBallThrow, + [CONTROLLER_DRAWPARTYSTATUSSUMMARY] = PlayerHandleDrawPartyStatusSummary, + [CONTROLLER_HIDEPARTYSTATUSSUMMARY] = PlayerHandleHidePartyStatusSummary, + [CONTROLLER_ENDBOUNCE] = PlayerHandleEndBounceEffect, + [CONTROLLER_SPRITEINVISIBILITY] = PlayerHandleSpriteInvisibility, + [CONTROLLER_BATTLEANIMATION] = PlayerHandleBattleAnimation, + [CONTROLLER_LINKSTANDBYMSG] = PlayerHandleLinkStandbyMsg, + [CONTROLLER_RESETACTIONMOVESELECTION] = PlayerHandleResetActionMoveSelection, + [CONTROLLER_55] = PlayerHandleCmd55, + [CONTROLLER_TERMINATOR_NOP] = PlayerCmdEnd }; static const u8 sTargetIdentities[] = {B_POSITION_PLAYER_LEFT, B_POSITION_PLAYER_RIGHT, B_POSITION_OPPONENT_RIGHT, B_POSITION_OPPONENT_LEFT}; // unknown unused data -static const u8 sUnknown_0831C5FC[] = {0x48, 0x48, 0x20, 0x5a, 0x50, 0x50, 0x50, 0x58}; +static const u8 sUnused[] = {0x48, 0x48, 0x20, 0x5a, 0x50, 0x50, 0x50, 0x58}; void nullsub_21(void) { @@ -2821,27 +2821,27 @@ static void PlayerHandleOneReturnValue_Duplicate(void) PlayerBufferExecCompleted(); } -static void PlayerHandleCmd37(void) +static void PlayerHandleClearUnkVar(void) { - gUnknown_02022D0C.field_0 = 0; + gUnusedControllerStruct.unk = 0; PlayerBufferExecCompleted(); } -static void PlayerHandleCmd38(void) +static void PlayerHandleSetUnkVar(void) { - gUnknown_02022D0C.field_0 = gBattleBufferA[gActiveBattler][1]; + gUnusedControllerStruct.unk = gBattleBufferA[gActiveBattler][1]; PlayerBufferExecCompleted(); } -static void PlayerHandleCmd39(void) +static void PlayerHandleClearUnkFlag(void) { - gUnknown_02022D0C.flag_x80 = 0; + gUnusedControllerStruct.flag = 0; PlayerBufferExecCompleted(); } -static void PlayerHandleCmd40(void) +static void PlayerHandleToggleUnkFlag(void) { - gUnknown_02022D0C.flag_x80 ^= 1; + gUnusedControllerStruct.flag ^= 1; PlayerBufferExecCompleted(); } diff --git a/src/battle_controller_player_partner.c b/src/battle_controller_player_partner.c index ca3db1738..ccbfcfb82 100644 --- a/src/battle_controller_player_partner.c +++ b/src/battle_controller_player_partner.c @@ -65,10 +65,10 @@ static void PlayerPartnerHandleTwoReturnValues(void); static void PlayerPartnerHandleChosenMonReturnValue(void); static void PlayerPartnerHandleOneReturnValue(void); static void PlayerPartnerHandleOneReturnValue_Duplicate(void); -static void PlayerPartnerHandleCmd37(void); -static void PlayerPartnerHandleCmd38(void); -static void PlayerPartnerHandleCmd39(void); -static void PlayerPartnerHandleCmd40(void); +static void PlayerPartnerHandleClearUnkVar(void); +static void PlayerPartnerHandleSetUnkVar(void); +static void PlayerPartnerHandleClearUnkFlag(void); +static void PlayerPartnerHandleToggleUnkFlag(void); static void PlayerPartnerHandleHitAnimation(void); static void PlayerPartnerHandleCmd42(void); static void PlayerPartnerHandlePlaySE(void); @@ -105,67 +105,67 @@ static void sub_81BE498(void); static void (*const sPlayerPartnerBufferCommands[CONTROLLER_CMDS_COUNT])(void) = { - PlayerPartnerHandleGetMonData, - PlayerPartnerHandleGetRawMonData, - PlayerPartnerHandleSetMonData, - PlayerPartnerHandleSetRawMonData, - PlayerPartnerHandleLoadMonSprite, - PlayerPartnerHandleSwitchInAnim, - PlayerPartnerHandleReturnMonToBall, - PlayerPartnerHandleDrawTrainerPic, - PlayerPartnerHandleTrainerSlide, - PlayerPartnerHandleTrainerSlideBack, - PlayerPartnerHandleFaintAnimation, - PlayerPartnerHandlePaletteFade, - PlayerPartnerHandleSuccessBallThrowAnim, - PlayerPartnerHandleBallThrowAnim, - PlayerPartnerHandlePause, - PlayerPartnerHandleMoveAnimation, - PlayerPartnerHandlePrintString, - PlayerPartnerHandlePrintSelectionString, - PlayerPartnerHandleChooseAction, - PlayerPartnerHandleUnknownYesNoBox, - PlayerPartnerHandleChooseMove, - PlayerPartnerHandleChooseItem, - PlayerPartnerHandleChoosePokemon, - PlayerPartnerHandleCmd23, - PlayerPartnerHandleHealthBarUpdate, - PlayerPartnerHandleExpUpdate, - PlayerPartnerHandleStatusIconUpdate, - PlayerPartnerHandleStatusAnimation, - PlayerPartnerHandleStatusXor, - PlayerPartnerHandleDataTransfer, - PlayerPartnerHandleDMA3Transfer, - PlayerPartnerHandlePlayBGM, - PlayerPartnerHandleCmd32, - PlayerPartnerHandleTwoReturnValues, - PlayerPartnerHandleChosenMonReturnValue, - PlayerPartnerHandleOneReturnValue, - PlayerPartnerHandleOneReturnValue_Duplicate, - PlayerPartnerHandleCmd37, - PlayerPartnerHandleCmd38, - PlayerPartnerHandleCmd39, - PlayerPartnerHandleCmd40, - PlayerPartnerHandleHitAnimation, - PlayerPartnerHandleCmd42, - PlayerPartnerHandlePlaySE, - PlayerPartnerHandlePlayFanfareOrBGM, - PlayerPartnerHandleFaintingCry, - PlayerPartnerHandleIntroSlide, - PlayerPartnerHandleIntroTrainerBallThrow, - PlayerPartnerHandleDrawPartyStatusSummary, - PlayerPartnerHandleHidePartyStatusSummary, - PlayerPartnerHandleEndBounceEffect, - PlayerPartnerHandleSpriteInvisibility, - PlayerPartnerHandleBattleAnimation, - PlayerPartnerHandleLinkStandbyMsg, - PlayerPartnerHandleResetActionMoveSelection, - PlayerPartnerHandleCmd55, - PlayerPartnerCmdEnd + [CONTROLLER_GETMONDATA] = PlayerPartnerHandleGetMonData, + [CONTROLLER_GETRAWMONDATA] = PlayerPartnerHandleGetRawMonData, + [CONTROLLER_SETMONDATA] = PlayerPartnerHandleSetMonData, + [CONTROLLER_SETRAWMONDATA] = PlayerPartnerHandleSetRawMonData, + [CONTROLLER_LOADMONSPRITE] = PlayerPartnerHandleLoadMonSprite, + [CONTROLLER_SWITCHINANIM] = PlayerPartnerHandleSwitchInAnim, + [CONTROLLER_RETURNMONTOBALL] = PlayerPartnerHandleReturnMonToBall, + [CONTROLLER_DRAWTRAINERPIC] = PlayerPartnerHandleDrawTrainerPic, + [CONTROLLER_TRAINERSLIDE] = PlayerPartnerHandleTrainerSlide, + [CONTROLLER_TRAINERSLIDEBACK] = PlayerPartnerHandleTrainerSlideBack, + [CONTROLLER_FAINTANIMATION] = PlayerPartnerHandleFaintAnimation, + [CONTROLLER_PALETTEFADE] = PlayerPartnerHandlePaletteFade, + [CONTROLLER_SUCCESSBALLTHROWANIM] = PlayerPartnerHandleSuccessBallThrowAnim, + [CONTROLLER_BALLTHROWANIM] = PlayerPartnerHandleBallThrowAnim, + [CONTROLLER_PAUSE] = PlayerPartnerHandlePause, + [CONTROLLER_MOVEANIMATION] = PlayerPartnerHandleMoveAnimation, + [CONTROLLER_PRINTSTRING] = PlayerPartnerHandlePrintString, + [CONTROLLER_PRINTSTRINGPLAYERONLY] = PlayerPartnerHandlePrintSelectionString, + [CONTROLLER_CHOOSEACTION] = PlayerPartnerHandleChooseAction, + [CONTROLLER_UNKNOWNYESNOBOX] = PlayerPartnerHandleUnknownYesNoBox, + [CONTROLLER_CHOOSEMOVE] = PlayerPartnerHandleChooseMove, + [CONTROLLER_OPENBAG] = PlayerPartnerHandleChooseItem, + [CONTROLLER_CHOOSEPOKEMON] = PlayerPartnerHandleChoosePokemon, + [CONTROLLER_23] = PlayerPartnerHandleCmd23, + [CONTROLLER_HEALTHBARUPDATE] = PlayerPartnerHandleHealthBarUpdate, + [CONTROLLER_EXPUPDATE] = PlayerPartnerHandleExpUpdate, + [CONTROLLER_STATUSICONUPDATE] = PlayerPartnerHandleStatusIconUpdate, + [CONTROLLER_STATUSANIMATION] = PlayerPartnerHandleStatusAnimation, + [CONTROLLER_STATUSXOR] = PlayerPartnerHandleStatusXor, + [CONTROLLER_DATATRANSFER] = PlayerPartnerHandleDataTransfer, + [CONTROLLER_DMA3TRANSFER] = PlayerPartnerHandleDMA3Transfer, + [CONTROLLER_PLAYBGM] = PlayerPartnerHandlePlayBGM, + [CONTROLLER_32] = PlayerPartnerHandleCmd32, + [CONTROLLER_TWORETURNVALUES] = PlayerPartnerHandleTwoReturnValues, + [CONTROLLER_CHOSENMONRETURNVALUE] = PlayerPartnerHandleChosenMonReturnValue, + [CONTROLLER_ONERETURNVALUE] = PlayerPartnerHandleOneReturnValue, + [CONTROLLER_ONERETURNVALUE_DUPLICATE] = PlayerPartnerHandleOneReturnValue_Duplicate, + [CONTROLLER_CLEARUNKVAR] = PlayerPartnerHandleClearUnkVar, + [CONTROLLER_SETUNKVAR] = PlayerPartnerHandleSetUnkVar, + [CONTROLLER_CLEARUNKFLAG] = PlayerPartnerHandleClearUnkFlag, + [CONTROLLER_TOGGLEUNKFLAG] = PlayerPartnerHandleToggleUnkFlag, + [CONTROLLER_HITANIMATION] = PlayerPartnerHandleHitAnimation, + [CONTROLLER_42] = PlayerPartnerHandleCmd42, + [CONTROLLER_PLAYSE] = PlayerPartnerHandlePlaySE, + [CONTROLLER_PLAYFANFAREORBGM] = PlayerPartnerHandlePlayFanfareOrBGM, + [CONTROLLER_FAINTINGCRY] = PlayerPartnerHandleFaintingCry, + [CONTROLLER_INTROSLIDE] = PlayerPartnerHandleIntroSlide, + [CONTROLLER_INTROTRAINERBALLTHROW] = PlayerPartnerHandleIntroTrainerBallThrow, + [CONTROLLER_DRAWPARTYSTATUSSUMMARY] = PlayerPartnerHandleDrawPartyStatusSummary, + [CONTROLLER_HIDEPARTYSTATUSSUMMARY] = PlayerPartnerHandleHidePartyStatusSummary, + [CONTROLLER_ENDBOUNCE] = PlayerPartnerHandleEndBounceEffect, + [CONTROLLER_SPRITEINVISIBILITY] = PlayerPartnerHandleSpriteInvisibility, + [CONTROLLER_BATTLEANIMATION] = PlayerPartnerHandleBattleAnimation, + [CONTROLLER_LINKSTANDBYMSG] = PlayerPartnerHandleLinkStandbyMsg, + [CONTROLLER_RESETACTIONMOVESELECTION] = PlayerPartnerHandleResetActionMoveSelection, + [CONTROLLER_55] = PlayerPartnerHandleCmd55, + [CONTROLLER_TERMINATOR_NOP] = PlayerPartnerCmdEnd }; // unknown unused data -static const u8 sUnknown_08617254[] = +static const u8 sUnused[] = { 0x83, 0x4d, 0xf3, 0x5f, 0x6f, 0x4f, 0xeb, 0x3e, 0x67, 0x2e, 0x10, 0x46, 0x8c, 0x3d, 0x28, 0x35, @@ -1678,27 +1678,27 @@ static void PlayerPartnerHandleOneReturnValue_Duplicate(void) PlayerPartnerBufferExecCompleted(); } -static void PlayerPartnerHandleCmd37(void) +static void PlayerPartnerHandleClearUnkVar(void) { - gUnknown_02022D0C.field_0 = 0; + gUnusedControllerStruct.unk = 0; PlayerPartnerBufferExecCompleted(); } -static void PlayerPartnerHandleCmd38(void) +static void PlayerPartnerHandleSetUnkVar(void) { - gUnknown_02022D0C.field_0 = gBattleBufferA[gActiveBattler][1]; + gUnusedControllerStruct.unk = gBattleBufferA[gActiveBattler][1]; PlayerPartnerBufferExecCompleted(); } -static void PlayerPartnerHandleCmd39(void) +static void PlayerPartnerHandleClearUnkFlag(void) { - gUnknown_02022D0C.flag_x80 = 0; + gUnusedControllerStruct.flag = 0; PlayerPartnerBufferExecCompleted(); } -static void PlayerPartnerHandleCmd40(void) +static void PlayerPartnerHandleToggleUnkFlag(void) { - gUnknown_02022D0C.flag_x80 ^= 1; + gUnusedControllerStruct.flag ^= 1; PlayerPartnerBufferExecCompleted(); } diff --git a/src/battle_controller_recorded_opponent.c b/src/battle_controller_recorded_opponent.c index 7bbac36e4..c6e7c238c 100644 --- a/src/battle_controller_recorded_opponent.c +++ b/src/battle_controller_recorded_opponent.c @@ -69,10 +69,10 @@ static void RecordedOpponentHandleTwoReturnValues(void); static void RecordedOpponentHandleChosenMonReturnValue(void); static void RecordedOpponentHandleOneReturnValue(void); static void RecordedOpponentHandleOneReturnValue_Duplicate(void); -static void RecordedOpponentHandleCmd37(void); -static void RecordedOpponentHandleCmd38(void); -static void RecordedOpponentHandleCmd39(void); -static void RecordedOpponentHandleCmd40(void); +static void RecordedOpponentHandleClearUnkVar(void); +static void RecordedOpponentHandleSetUnkVar(void); +static void RecordedOpponentHandleClearUnkFlag(void); +static void RecordedOpponentHandleToggleUnkFlag(void); static void RecordedOpponentHandleHitAnimation(void); static void RecordedOpponentHandleCmd42(void); static void RecordedOpponentHandlePlaySE(void); @@ -104,63 +104,63 @@ static void sub_818975C(void); static void (*const sRecordedOpponentBufferCommands[CONTROLLER_CMDS_COUNT])(void) = { - RecordedOpponentHandleGetMonData, - RecordedOpponentHandleGetRawMonData, - RecordedOpponentHandleSetMonData, - RecordedOpponentHandleSetRawMonData, - RecordedOpponentHandleLoadMonSprite, - RecordedOpponentHandleSwitchInAnim, - RecordedOpponentHandleReturnMonToBall, - RecordedOpponentHandleDrawTrainerPic, - RecordedOpponentHandleTrainerSlide, - RecordedOpponentHandleTrainerSlideBack, - RecordedOpponentHandleFaintAnimation, - RecordedOpponentHandlePaletteFade, - RecordedOpponentHandleSuccessBallThrowAnim, - RecordedOpponentHandleBallThrowAnim, - RecordedOpponentHandlePause, - RecordedOpponentHandleMoveAnimation, - RecordedOpponentHandlePrintString, - RecordedOpponentHandlePrintSelectionString, - RecordedOpponentHandleChooseAction, - RecordedOpponentHandleUnknownYesNoBox, - RecordedOpponentHandleChooseMove, - RecordedOpponentHandleChooseItem, - RecordedOpponentHandleChoosePokemon, - RecordedOpponentHandleCmd23, - RecordedOpponentHandleHealthBarUpdate, - RecordedOpponentHandleExpUpdate, - RecordedOpponentHandleStatusIconUpdate, - RecordedOpponentHandleStatusAnimation, - RecordedOpponentHandleStatusXor, - RecordedOpponentHandleDataTransfer, - RecordedOpponentHandleDMA3Transfer, - RecordedOpponentHandlePlayBGM, - RecordedOpponentHandleCmd32, - RecordedOpponentHandleTwoReturnValues, - RecordedOpponentHandleChosenMonReturnValue, - RecordedOpponentHandleOneReturnValue, - RecordedOpponentHandleOneReturnValue_Duplicate, - RecordedOpponentHandleCmd37, - RecordedOpponentHandleCmd38, - RecordedOpponentHandleCmd39, - RecordedOpponentHandleCmd40, - RecordedOpponentHandleHitAnimation, - RecordedOpponentHandleCmd42, - RecordedOpponentHandlePlaySE, - RecordedOpponentHandlePlayFanfareOrBGM, - RecordedOpponentHandleFaintingCry, - RecordedOpponentHandleIntroSlide, - RecordedOpponentHandleIntroTrainerBallThrow, - RecordedOpponentHandleDrawPartyStatusSummary, - RecordedOpponentHandleHidePartyStatusSummary, - RecordedOpponentHandleEndBounceEffect, - RecordedOpponentHandleSpriteInvisibility, - RecordedOpponentHandleBattleAnimation, - RecordedOpponentHandleLinkStandbyMsg, - RecordedOpponentHandleResetActionMoveSelection, - RecordedOpponentHandleCmd55, - RecordedOpponentCmdEnd + [CONTROLLER_GETMONDATA] = RecordedOpponentHandleGetMonData, + [CONTROLLER_GETRAWMONDATA] = RecordedOpponentHandleGetRawMonData, + [CONTROLLER_SETMONDATA] = RecordedOpponentHandleSetMonData, + [CONTROLLER_SETRAWMONDATA] = RecordedOpponentHandleSetRawMonData, + [CONTROLLER_LOADMONSPRITE] = RecordedOpponentHandleLoadMonSprite, + [CONTROLLER_SWITCHINANIM] = RecordedOpponentHandleSwitchInAnim, + [CONTROLLER_RETURNMONTOBALL] = RecordedOpponentHandleReturnMonToBall, + [CONTROLLER_DRAWTRAINERPIC] = RecordedOpponentHandleDrawTrainerPic, + [CONTROLLER_TRAINERSLIDE] = RecordedOpponentHandleTrainerSlide, + [CONTROLLER_TRAINERSLIDEBACK] = RecordedOpponentHandleTrainerSlideBack, + [CONTROLLER_FAINTANIMATION] = RecordedOpponentHandleFaintAnimation, + [CONTROLLER_PALETTEFADE] = RecordedOpponentHandlePaletteFade, + [CONTROLLER_SUCCESSBALLTHROWANIM] = RecordedOpponentHandleSuccessBallThrowAnim, + [CONTROLLER_BALLTHROWANIM] = RecordedOpponentHandleBallThrowAnim, + [CONTROLLER_PAUSE] = RecordedOpponentHandlePause, + [CONTROLLER_MOVEANIMATION] = RecordedOpponentHandleMoveAnimation, + [CONTROLLER_PRINTSTRING] = RecordedOpponentHandlePrintString, + [CONTROLLER_PRINTSTRINGPLAYERONLY] = RecordedOpponentHandlePrintSelectionString, + [CONTROLLER_CHOOSEACTION] = RecordedOpponentHandleChooseAction, + [CONTROLLER_UNKNOWNYESNOBOX] = RecordedOpponentHandleUnknownYesNoBox, + [CONTROLLER_CHOOSEMOVE] = RecordedOpponentHandleChooseMove, + [CONTROLLER_OPENBAG] = RecordedOpponentHandleChooseItem, + [CONTROLLER_CHOOSEPOKEMON] = RecordedOpponentHandleChoosePokemon, + [CONTROLLER_23] = RecordedOpponentHandleCmd23, + [CONTROLLER_HEALTHBARUPDATE] = RecordedOpponentHandleHealthBarUpdate, + [CONTROLLER_EXPUPDATE] = RecordedOpponentHandleExpUpdate, + [CONTROLLER_STATUSICONUPDATE] = RecordedOpponentHandleStatusIconUpdate, + [CONTROLLER_STATUSANIMATION] = RecordedOpponentHandleStatusAnimation, + [CONTROLLER_STATUSXOR] = RecordedOpponentHandleStatusXor, + [CONTROLLER_DATATRANSFER] = RecordedOpponentHandleDataTransfer, + [CONTROLLER_DMA3TRANSFER] = RecordedOpponentHandleDMA3Transfer, + [CONTROLLER_PLAYBGM] = RecordedOpponentHandlePlayBGM, + [CONTROLLER_32] = RecordedOpponentHandleCmd32, + [CONTROLLER_TWORETURNVALUES] = RecordedOpponentHandleTwoReturnValues, + [CONTROLLER_CHOSENMONRETURNVALUE] = RecordedOpponentHandleChosenMonReturnValue, + [CONTROLLER_ONERETURNVALUE] = RecordedOpponentHandleOneReturnValue, + [CONTROLLER_ONERETURNVALUE_DUPLICATE] = RecordedOpponentHandleOneReturnValue_Duplicate, + [CONTROLLER_CLEARUNKVAR] = RecordedOpponentHandleClearUnkVar, + [CONTROLLER_SETUNKVAR] = RecordedOpponentHandleSetUnkVar, + [CONTROLLER_CLEARUNKFLAG] = RecordedOpponentHandleClearUnkFlag, + [CONTROLLER_TOGGLEUNKFLAG] = RecordedOpponentHandleToggleUnkFlag, + [CONTROLLER_HITANIMATION] = RecordedOpponentHandleHitAnimation, + [CONTROLLER_42] = RecordedOpponentHandleCmd42, + [CONTROLLER_PLAYSE] = RecordedOpponentHandlePlaySE, + [CONTROLLER_PLAYFANFAREORBGM] = RecordedOpponentHandlePlayFanfareOrBGM, + [CONTROLLER_FAINTINGCRY] = RecordedOpponentHandleFaintingCry, + [CONTROLLER_INTROSLIDE] = RecordedOpponentHandleIntroSlide, + [CONTROLLER_INTROTRAINERBALLTHROW] = RecordedOpponentHandleIntroTrainerBallThrow, + [CONTROLLER_DRAWPARTYSTATUSSUMMARY] = RecordedOpponentHandleDrawPartyStatusSummary, + [CONTROLLER_HIDEPARTYSTATUSSUMMARY] = RecordedOpponentHandleHidePartyStatusSummary, + [CONTROLLER_ENDBOUNCE] = RecordedOpponentHandleEndBounceEffect, + [CONTROLLER_SPRITEINVISIBILITY] = RecordedOpponentHandleSpriteInvisibility, + [CONTROLLER_BATTLEANIMATION] = RecordedOpponentHandleBattleAnimation, + [CONTROLLER_LINKSTANDBYMSG] = RecordedOpponentHandleLinkStandbyMsg, + [CONTROLLER_RESETACTIONMOVESELECTION] = RecordedOpponentHandleResetActionMoveSelection, + [CONTROLLER_55] = RecordedOpponentHandleCmd55, + [CONTROLLER_TERMINATOR_NOP] = RecordedOpponentCmdEnd }; static void nullsub_70(void) @@ -1235,7 +1235,7 @@ static void RecordedOpponentHandleDrawTrainerPic(void) } else { - trainerPicId = PlayerGenderToFrontTrainerPicId(gLinkPlayers[gUnknown_0203C7B4 ^ BIT_SIDE].gender); + trainerPicId = PlayerGenderToFrontTrainerPicId(gLinkPlayers[gRecordedBattleMultiplayerId ^ BIT_SIDE].gender); } } @@ -1543,27 +1543,27 @@ static void RecordedOpponentHandleOneReturnValue_Duplicate(void) RecordedOpponentBufferExecCompleted(); } -static void RecordedOpponentHandleCmd37(void) +static void RecordedOpponentHandleClearUnkVar(void) { - gUnknown_02022D0C.field_0 = 0; + gUnusedControllerStruct.unk = 0; RecordedOpponentBufferExecCompleted(); } -static void RecordedOpponentHandleCmd38(void) +static void RecordedOpponentHandleSetUnkVar(void) { - gUnknown_02022D0C.field_0 = gBattleBufferA[gActiveBattler][1]; + gUnusedControllerStruct.unk = gBattleBufferA[gActiveBattler][1]; RecordedOpponentBufferExecCompleted(); } -static void RecordedOpponentHandleCmd39(void) +static void RecordedOpponentHandleClearUnkFlag(void) { - gUnknown_02022D0C.flag_x80 = 0; + gUnusedControllerStruct.flag = 0; RecordedOpponentBufferExecCompleted(); } -static void RecordedOpponentHandleCmd40(void) +static void RecordedOpponentHandleToggleUnkFlag(void) { - gUnknown_02022D0C.flag_x80 ^= 1; + gUnusedControllerStruct.flag ^= 1; RecordedOpponentBufferExecCompleted(); } @@ -1632,7 +1632,6 @@ static void RecordedOpponentHandleIntroSlide(void) static void RecordedOpponentHandleIntroTrainerBallThrow(void) { - u8 paletteNum; u8 taskId; SetSpritePrimaryCoordsFromSecondaryCoords(&gSprites[gBattlerSpriteIds[gActiveBattler]]); diff --git a/src/battle_controller_recorded_player.c b/src/battle_controller_recorded_player.c index 1f4847b00..8f3f1d1f2 100644 --- a/src/battle_controller_recorded_player.c +++ b/src/battle_controller_recorded_player.c @@ -65,10 +65,10 @@ static void RecordedPlayerHandleTwoReturnValues(void); static void RecordedPlayerHandleChosenMonReturnValue(void); static void RecordedPlayerHandleOneReturnValue(void); static void RecordedPlayerHandleOneReturnValue_Duplicate(void); -static void RecordedPlayerHandleCmd37(void); -static void RecordedPlayerHandleCmd38(void); -static void RecordedPlayerHandleCmd39(void); -static void RecordedPlayerHandleCmd40(void); +static void RecordedPlayerHandleClearUnkVar(void); +static void RecordedPlayerHandleSetUnkVar(void); +static void RecordedPlayerHandleClearUnkFlag(void); +static void RecordedPlayerHandleToggleUnkFlag(void); static void RecordedPlayerHandleHitAnimation(void); static void RecordedPlayerHandleCmd42(void); static void RecordedPlayerHandlePlaySE(void); @@ -99,63 +99,63 @@ static void sub_818CDF4(void); static void (*const sRecordedPlayerBufferCommands[CONTROLLER_CMDS_COUNT])(void) = { - RecordedPlayerHandleGetMonData, - RecordedPlayerHandleGetRawMonData, - RecordedPlayerHandleSetMonData, - RecordedPlayerHandleSetRawMonData, - RecordedPlayerHandleLoadMonSprite, - RecordedPlayerHandleSwitchInAnim, - RecordedPlayerHandleReturnMonToBall, - RecordedPlayerHandleDrawTrainerPic, - RecordedPlayerHandleTrainerSlide, - RecordedPlayerHandleTrainerSlideBack, - RecordedPlayerHandleFaintAnimation, - RecordedPlayerHandlePaletteFade, - RecordedPlayerHandleSuccessBallThrowAnim, - RecordedPlayerHandleBallThrowAnim, - RecordedPlayerHandlePause, - RecordedPlayerHandleMoveAnimation, - RecordedPlayerHandlePrintString, - RecordedPlayerHandlePrintSelectionString, - RecordedPlayerHandleChooseAction, - RecordedPlayerHandleUnknownYesNoBox, - RecordedPlayerHandleChooseMove, - RecordedPlayerHandleChooseItem, - RecordedPlayerHandleChoosePokemon, - RecordedPlayerHandleCmd23, - RecordedPlayerHandleHealthBarUpdate, - RecordedPlayerHandleExpUpdate, - RecordedPlayerHandleStatusIconUpdate, - RecordedPlayerHandleStatusAnimation, - RecordedPlayerHandleStatusXor, - RecordedPlayerHandleDataTransfer, - RecordedPlayerHandleDMA3Transfer, - RecordedPlayerHandlePlayBGM, - RecordedPlayerHandleCmd32, - RecordedPlayerHandleTwoReturnValues, - RecordedPlayerHandleChosenMonReturnValue, - RecordedPlayerHandleOneReturnValue, - RecordedPlayerHandleOneReturnValue_Duplicate, - RecordedPlayerHandleCmd37, - RecordedPlayerHandleCmd38, - RecordedPlayerHandleCmd39, - RecordedPlayerHandleCmd40, - RecordedPlayerHandleHitAnimation, - RecordedPlayerHandleCmd42, - RecordedPlayerHandlePlaySE, - RecordedPlayerHandlePlayFanfareOrBGM, - RecordedPlayerHandleFaintingCry, - RecordedPlayerHandleIntroSlide, - RecordedPlayerHandleIntroTrainerBallThrow, - RecordedPlayerHandleDrawPartyStatusSummary, - RecordedPlayerHandleHidePartyStatusSummary, - RecordedPlayerHandleEndBounceEffect, - RecordedPlayerHandleSpriteInvisibility, - RecordedPlayerHandleBattleAnimation, - RecordedPlayerHandleLinkStandbyMsg, - RecordedPlayerHandleResetActionMoveSelection, - RecordedPlayerHandleCmd55, - RecordedPlayerCmdEnd + [CONTROLLER_GETMONDATA] = RecordedPlayerHandleGetMonData, + [CONTROLLER_GETRAWMONDATA] = RecordedPlayerHandleGetRawMonData, + [CONTROLLER_SETMONDATA] = RecordedPlayerHandleSetMonData, + [CONTROLLER_SETRAWMONDATA] = RecordedPlayerHandleSetRawMonData, + [CONTROLLER_LOADMONSPRITE] = RecordedPlayerHandleLoadMonSprite, + [CONTROLLER_SWITCHINANIM] = RecordedPlayerHandleSwitchInAnim, + [CONTROLLER_RETURNMONTOBALL] = RecordedPlayerHandleReturnMonToBall, + [CONTROLLER_DRAWTRAINERPIC] = RecordedPlayerHandleDrawTrainerPic, + [CONTROLLER_TRAINERSLIDE] = RecordedPlayerHandleTrainerSlide, + [CONTROLLER_TRAINERSLIDEBACK] = RecordedPlayerHandleTrainerSlideBack, + [CONTROLLER_FAINTANIMATION] = RecordedPlayerHandleFaintAnimation, + [CONTROLLER_PALETTEFADE] = RecordedPlayerHandlePaletteFade, + [CONTROLLER_SUCCESSBALLTHROWANIM] = RecordedPlayerHandleSuccessBallThrowAnim, + [CONTROLLER_BALLTHROWANIM] = RecordedPlayerHandleBallThrowAnim, + [CONTROLLER_PAUSE] = RecordedPlayerHandlePause, + [CONTROLLER_MOVEANIMATION] = RecordedPlayerHandleMoveAnimation, + [CONTROLLER_PRINTSTRING] = RecordedPlayerHandlePrintString, + [CONTROLLER_PRINTSTRINGPLAYERONLY] = RecordedPlayerHandlePrintSelectionString, + [CONTROLLER_CHOOSEACTION] = RecordedPlayerHandleChooseAction, + [CONTROLLER_UNKNOWNYESNOBOX] = RecordedPlayerHandleUnknownYesNoBox, + [CONTROLLER_CHOOSEMOVE] = RecordedPlayerHandleChooseMove, + [CONTROLLER_OPENBAG] = RecordedPlayerHandleChooseItem, + [CONTROLLER_CHOOSEPOKEMON] = RecordedPlayerHandleChoosePokemon, + [CONTROLLER_23] = RecordedPlayerHandleCmd23, + [CONTROLLER_HEALTHBARUPDATE] = RecordedPlayerHandleHealthBarUpdate, + [CONTROLLER_EXPUPDATE] = RecordedPlayerHandleExpUpdate, + [CONTROLLER_STATUSICONUPDATE] = RecordedPlayerHandleStatusIconUpdate, + [CONTROLLER_STATUSANIMATION] = RecordedPlayerHandleStatusAnimation, + [CONTROLLER_STATUSXOR] = RecordedPlayerHandleStatusXor, + [CONTROLLER_DATATRANSFER] = RecordedPlayerHandleDataTransfer, + [CONTROLLER_DMA3TRANSFER] = RecordedPlayerHandleDMA3Transfer, + [CONTROLLER_PLAYBGM] = RecordedPlayerHandlePlayBGM, + [CONTROLLER_32] = RecordedPlayerHandleCmd32, + [CONTROLLER_TWORETURNVALUES] = RecordedPlayerHandleTwoReturnValues, + [CONTROLLER_CHOSENMONRETURNVALUE] = RecordedPlayerHandleChosenMonReturnValue, + [CONTROLLER_ONERETURNVALUE] = RecordedPlayerHandleOneReturnValue, + [CONTROLLER_ONERETURNVALUE_DUPLICATE] = RecordedPlayerHandleOneReturnValue_Duplicate, + [CONTROLLER_CLEARUNKVAR] = RecordedPlayerHandleClearUnkVar, + [CONTROLLER_SETUNKVAR] = RecordedPlayerHandleSetUnkVar, + [CONTROLLER_CLEARUNKFLAG] = RecordedPlayerHandleClearUnkFlag, + [CONTROLLER_TOGGLEUNKFLAG] = RecordedPlayerHandleToggleUnkFlag, + [CONTROLLER_HITANIMATION] = RecordedPlayerHandleHitAnimation, + [CONTROLLER_42] = RecordedPlayerHandleCmd42, + [CONTROLLER_PLAYSE] = RecordedPlayerHandlePlaySE, + [CONTROLLER_PLAYFANFAREORBGM] = RecordedPlayerHandlePlayFanfareOrBGM, + [CONTROLLER_FAINTINGCRY] = RecordedPlayerHandleFaintingCry, + [CONTROLLER_INTROSLIDE] = RecordedPlayerHandleIntroSlide, + [CONTROLLER_INTROTRAINERBALLTHROW] = RecordedPlayerHandleIntroTrainerBallThrow, + [CONTROLLER_DRAWPARTYSTATUSSUMMARY] = RecordedPlayerHandleDrawPartyStatusSummary, + [CONTROLLER_HIDEPARTYSTATUSSUMMARY] = RecordedPlayerHandleHidePartyStatusSummary, + [CONTROLLER_ENDBOUNCE] = RecordedPlayerHandleEndBounceEffect, + [CONTROLLER_SPRITEINVISIBILITY] = RecordedPlayerHandleSpriteInvisibility, + [CONTROLLER_BATTLEANIMATION] = RecordedPlayerHandleBattleAnimation, + [CONTROLLER_LINKSTANDBYMSG] = RecordedPlayerHandleLinkStandbyMsg, + [CONTROLLER_RESETACTIONMOVESELECTION] = RecordedPlayerHandleResetActionMoveSelection, + [CONTROLLER_55] = RecordedPlayerHandleCmd55, + [CONTROLLER_TERMINATOR_NOP] = RecordedPlayerCmdEnd }; static void nullsub_120(void) @@ -1186,12 +1186,12 @@ static void RecordedPlayerHandleDrawTrainerPic(void) s16 xPos, yPos; u32 trainerPicId; - if (gBattleTypeFlags & BATTLE_TYPE_x2000000) + if (gBattleTypeFlags & BATTLE_TYPE_RECORDED_LINK) { if (gBattleTypeFlags & BATTLE_TYPE_MULTI) trainerPicId = GetActiveBattlerLinkPlayerGender(); else - trainerPicId = gLinkPlayers[gUnknown_0203C7B4].gender; + trainerPicId = gLinkPlayers[gRecordedBattleMultiplayerId].gender; } else { @@ -1560,27 +1560,27 @@ static void RecordedPlayerHandleOneReturnValue_Duplicate(void) RecordedPlayerBufferExecCompleted(); } -static void RecordedPlayerHandleCmd37(void) +static void RecordedPlayerHandleClearUnkVar(void) { - gUnknown_02022D0C.field_0 = 0; + gUnusedControllerStruct.unk = 0; RecordedPlayerBufferExecCompleted(); } -static void RecordedPlayerHandleCmd38(void) +static void RecordedPlayerHandleSetUnkVar(void) { - gUnknown_02022D0C.field_0 = gBattleBufferA[gActiveBattler][1]; + gUnusedControllerStruct.unk = gBattleBufferA[gActiveBattler][1]; RecordedPlayerBufferExecCompleted(); } -static void RecordedPlayerHandleCmd39(void) +static void RecordedPlayerHandleClearUnkFlag(void) { - gUnknown_02022D0C.flag_x80 = 0; + gUnusedControllerStruct.flag = 0; RecordedPlayerBufferExecCompleted(); } -static void RecordedPlayerHandleCmd40(void) +static void RecordedPlayerHandleToggleUnkFlag(void) { - gUnknown_02022D0C.flag_x80 ^= 1; + gUnusedControllerStruct.flag ^= 1; RecordedPlayerBufferExecCompleted(); } @@ -1665,7 +1665,7 @@ static void RecordedPlayerHandleIntroTrainerBallThrow(void) StartSpriteAnim(&gSprites[gBattlerSpriteIds[gActiveBattler]], 1); paletteNum = AllocSpritePalette(0xD6F9); - if (gBattleTypeFlags & BATTLE_TYPE_x2000000) + if (gBattleTypeFlags & BATTLE_TYPE_RECORDED_LINK) trainerPicId = gLinkPlayers[GetBattlerMultiplayerId(gActiveBattler)].gender; else trainerPicId = gSaveBlock2Ptr->playerGender; diff --git a/src/battle_controller_safari.c b/src/battle_controller_safari.c index 9cb427e12..b357c689f 100644 --- a/src/battle_controller_safari.c +++ b/src/battle_controller_safari.c @@ -62,10 +62,10 @@ static void SafariHandleTwoReturnValues(void); static void SafariHandleChosenMonReturnValue(void); static void SafariHandleOneReturnValue(void); static void SafariHandleOneReturnValue_Duplicate(void); -static void SafariHandleCmd37(void); -static void SafariHandleCmd38(void); -static void SafariHandleCmd39(void); -static void SafariHandleCmd40(void); +static void SafariHandleClearUnkVar(void); +static void SafariHandleSetUnkVar(void); +static void SafariHandleClearUnkFlag(void); +static void SafariHandleToggleUnkFlag(void); static void SafariHandleHitAnimation(void); static void SafariHandleCmd42(void); static void SafariHandlePlaySE(void); @@ -89,63 +89,63 @@ static void CompleteWhenChosePokeblock(void); static void (*const sSafariBufferCommands[CONTROLLER_CMDS_COUNT])(void) = { - SafariHandleGetMonData, - SafariHandleGetRawMonData, - SafariHandleSetMonData, - SafariHandleSetRawMonData, - SafariHandleLoadMonSprite, - SafariHandleSwitchInAnim, - SafariHandleReturnMonToBall, - SafariHandleDrawTrainerPic, - SafariHandleTrainerSlide, - SafariHandleTrainerSlideBack, - SafariHandleFaintAnimation, - SafariHandlePaletteFade, - SafariHandleSuccessBallThrowAnim, - SafariHandleBallThrowAnim, - SafariHandlePause, - SafariHandleMoveAnimation, - SafariHandlePrintString, - SafariHandlePrintSelectionString, - SafariHandleChooseAction, - SafariHandleUnknownYesNoBox, - SafariHandleChooseMove, - SafariHandleChooseItem, - SafariHandleChoosePokemon, - SafariHandleCmd23, - SafariHandleHealthBarUpdate, - SafariHandleExpUpdate, - SafariHandleStatusIconUpdate, - SafariHandleStatusAnimation, - SafariHandleStatusXor, - SafariHandleDataTransfer, - SafariHandleDMA3Transfer, - SafariHandlePlayBGM, - SafariHandleCmd32, - SafariHandleTwoReturnValues, - SafariHandleChosenMonReturnValue, - SafariHandleOneReturnValue, - SafariHandleOneReturnValue_Duplicate, - SafariHandleCmd37, - SafariHandleCmd38, - SafariHandleCmd39, - SafariHandleCmd40, - SafariHandleHitAnimation, - SafariHandleCmd42, - SafariHandlePlaySE, - SafariHandlePlayFanfareOrBGM, - SafariHandleFaintingCry, - SafariHandleIntroSlide, - SafariHandleIntroTrainerBallThrow, - SafariHandleDrawPartyStatusSummary, - SafariHandleHidePartyStatusSummary, - SafariHandleEndBounceEffect, - SafariHandleSpriteInvisibility, - SafariHandleBattleAnimation, - SafariHandleLinkStandbyMsg, - SafariHandleResetActionMoveSelection, - SafariHandleCmd55, - SafariCmdEnd + [CONTROLLER_GETMONDATA] = SafariHandleGetMonData, + [CONTROLLER_GETRAWMONDATA] = SafariHandleGetRawMonData, + [CONTROLLER_SETMONDATA] = SafariHandleSetMonData, + [CONTROLLER_SETRAWMONDATA] = SafariHandleSetRawMonData, + [CONTROLLER_LOADMONSPRITE] = SafariHandleLoadMonSprite, + [CONTROLLER_SWITCHINANIM] = SafariHandleSwitchInAnim, + [CONTROLLER_RETURNMONTOBALL] = SafariHandleReturnMonToBall, + [CONTROLLER_DRAWTRAINERPIC] = SafariHandleDrawTrainerPic, + [CONTROLLER_TRAINERSLIDE] = SafariHandleTrainerSlide, + [CONTROLLER_TRAINERSLIDEBACK] = SafariHandleTrainerSlideBack, + [CONTROLLER_FAINTANIMATION] = SafariHandleFaintAnimation, + [CONTROLLER_PALETTEFADE] = SafariHandlePaletteFade, + [CONTROLLER_SUCCESSBALLTHROWANIM] = SafariHandleSuccessBallThrowAnim, + [CONTROLLER_BALLTHROWANIM] = SafariHandleBallThrowAnim, + [CONTROLLER_PAUSE] = SafariHandlePause, + [CONTROLLER_MOVEANIMATION] = SafariHandleMoveAnimation, + [CONTROLLER_PRINTSTRING] = SafariHandlePrintString, + [CONTROLLER_PRINTSTRINGPLAYERONLY] = SafariHandlePrintSelectionString, + [CONTROLLER_CHOOSEACTION] = SafariHandleChooseAction, + [CONTROLLER_UNKNOWNYESNOBOX] = SafariHandleUnknownYesNoBox, + [CONTROLLER_CHOOSEMOVE] = SafariHandleChooseMove, + [CONTROLLER_OPENBAG] = SafariHandleChooseItem, + [CONTROLLER_CHOOSEPOKEMON] = SafariHandleChoosePokemon, + [CONTROLLER_23] = SafariHandleCmd23, + [CONTROLLER_HEALTHBARUPDATE] = SafariHandleHealthBarUpdate, + [CONTROLLER_EXPUPDATE] = SafariHandleExpUpdate, + [CONTROLLER_STATUSICONUPDATE] = SafariHandleStatusIconUpdate, + [CONTROLLER_STATUSANIMATION] = SafariHandleStatusAnimation, + [CONTROLLER_STATUSXOR] = SafariHandleStatusXor, + [CONTROLLER_DATATRANSFER] = SafariHandleDataTransfer, + [CONTROLLER_DMA3TRANSFER] = SafariHandleDMA3Transfer, + [CONTROLLER_PLAYBGM] = SafariHandlePlayBGM, + [CONTROLLER_32] = SafariHandleCmd32, + [CONTROLLER_TWORETURNVALUES] = SafariHandleTwoReturnValues, + [CONTROLLER_CHOSENMONRETURNVALUE] = SafariHandleChosenMonReturnValue, + [CONTROLLER_ONERETURNVALUE] = SafariHandleOneReturnValue, + [CONTROLLER_ONERETURNVALUE_DUPLICATE] = SafariHandleOneReturnValue_Duplicate, + [CONTROLLER_CLEARUNKVAR] = SafariHandleClearUnkVar, + [CONTROLLER_SETUNKVAR] = SafariHandleSetUnkVar, + [CONTROLLER_CLEARUNKFLAG] = SafariHandleClearUnkFlag, + [CONTROLLER_TOGGLEUNKFLAG] = SafariHandleToggleUnkFlag, + [CONTROLLER_HITANIMATION] = SafariHandleHitAnimation, + [CONTROLLER_42] = SafariHandleCmd42, + [CONTROLLER_PLAYSE] = SafariHandlePlaySE, + [CONTROLLER_PLAYFANFAREORBGM] = SafariHandlePlayFanfareOrBGM, + [CONTROLLER_FAINTINGCRY] = SafariHandleFaintingCry, + [CONTROLLER_INTROSLIDE] = SafariHandleIntroSlide, + [CONTROLLER_INTROTRAINERBALLTHROW] = SafariHandleIntroTrainerBallThrow, + [CONTROLLER_DRAWPARTYSTATUSSUMMARY] = SafariHandleDrawPartyStatusSummary, + [CONTROLLER_HIDEPARTYSTATUSSUMMARY] = SafariHandleHidePartyStatusSummary, + [CONTROLLER_ENDBOUNCE] = SafariHandleEndBounceEffect, + [CONTROLLER_SPRITEINVISIBILITY] = SafariHandleSpriteInvisibility, + [CONTROLLER_BATTLEANIMATION] = SafariHandleBattleAnimation, + [CONTROLLER_LINKSTANDBYMSG] = SafariHandleLinkStandbyMsg, + [CONTROLLER_RESETACTIONMOVESELECTION] = SafariHandleResetActionMoveSelection, + [CONTROLLER_55] = SafariHandleCmd55, + [CONTROLLER_TERMINATOR_NOP] = SafariCmdEnd }; static void SpriteCB_Null4(void) @@ -470,8 +470,6 @@ static void SafariHandleChooseMove(void) static void SafariHandleChooseItem(void) { - s32 i; - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK); gBattlerControllerFuncs[gActiveBattler] = SafariOpenPokeblockCase; gBattlerInMenuId = gActiveBattler; @@ -553,22 +551,22 @@ static void SafariHandleOneReturnValue_Duplicate(void) SafariBufferExecCompleted(); } -static void SafariHandleCmd37(void) +static void SafariHandleClearUnkVar(void) { SafariBufferExecCompleted(); } -static void SafariHandleCmd38(void) +static void SafariHandleSetUnkVar(void) { SafariBufferExecCompleted(); } -static void SafariHandleCmd39(void) +static void SafariHandleClearUnkFlag(void) { SafariBufferExecCompleted(); } -static void SafariHandleCmd40(void) +static void SafariHandleToggleUnkFlag(void) { SafariBufferExecCompleted(); } diff --git a/src/battle_controller_wally.c b/src/battle_controller_wally.c index 300837380..18bc5b2eb 100644 --- a/src/battle_controller_wally.c +++ b/src/battle_controller_wally.c @@ -70,10 +70,10 @@ static void WallyHandleTwoReturnValues(void); static void WallyHandleChosenMonReturnValue(void); static void WallyHandleOneReturnValue(void); static void WallyHandleOneReturnValue_Duplicate(void); -static void WallyHandleCmd37(void); -static void WallyHandleCmd38(void); -static void WallyHandleCmd39(void); -static void WallyHandleCmd40(void); +static void WallyHandleClearUnkVar(void); +static void WallyHandleSetUnkVar(void); +static void WallyHandleClearUnkFlag(void); +static void WallyHandleToggleUnkFlag(void); static void WallyHandleHitAnimation(void); static void WallyHandleCmd42(void); static void WallyHandlePlaySE(void); @@ -102,63 +102,63 @@ static void sub_816AC04(u8 taskId); static void (*const sWallyBufferCommands[CONTROLLER_CMDS_COUNT])(void) = { - WallyHandleGetMonData, - WallyHandleGetRawMonData, - WallyHandleSetMonData, - WallyHandleSetRawMonData, - WallyHandleLoadMonSprite, - WallyHandleSwitchInAnim, - WallyHandleReturnMonToBall, - WallyHandleDrawTrainerPic, - WallyHandleTrainerSlide, - WallyHandleTrainerSlideBack, - WallyHandleFaintAnimation, - WallyHandlePaletteFade, - WallyHandleSuccessBallThrowAnim, - WallyHandleBallThrowAnim, - WallyHandlePause, - WallyHandleMoveAnimation, - WallyHandlePrintString, - WallyHandlePrintSelectionString, - WallyHandleChooseAction, - WallyHandleUnknownYesNoBox, - WallyHandleChooseMove, - WallyHandleChooseItem, - WallyHandleChoosePokemon, - WallyHandleCmd23, - WallyHandleHealthBarUpdate, - WallyHandleExpUpdate, - WallyHandleStatusIconUpdate, - WallyHandleStatusAnimation, - WallyHandleStatusXor, - WallyHandleDataTransfer, - WallyHandleDMA3Transfer, - WallyHandlePlayBGM, - WallyHandleCmd32, - WallyHandleTwoReturnValues, - WallyHandleChosenMonReturnValue, - WallyHandleOneReturnValue, - WallyHandleOneReturnValue_Duplicate, - WallyHandleCmd37, - WallyHandleCmd38, - WallyHandleCmd39, - WallyHandleCmd40, - WallyHandleHitAnimation, - WallyHandleCmd42, - WallyHandlePlaySE, - WallyHandlePlayFanfareOrBGM, - WallyHandleFaintingCry, - WallyHandleIntroSlide, - WallyHandleIntroTrainerBallThrow, - WallyHandleDrawPartyStatusSummary, - WallyHandleHidePartyStatusSummary, - WallyHandleEndBounceEffect, - WallyHandleSpriteInvisibility, - WallyHandleBattleAnimation, - WallyHandleLinkStandbyMsg, - WallyHandleResetActionMoveSelection, - WallyHandleCmd55, - WallyCmdEnd + [CONTROLLER_GETMONDATA] = WallyHandleGetMonData, + [CONTROLLER_GETRAWMONDATA] = WallyHandleGetRawMonData, + [CONTROLLER_SETMONDATA] = WallyHandleSetMonData, + [CONTROLLER_SETRAWMONDATA] = WallyHandleSetRawMonData, + [CONTROLLER_LOADMONSPRITE] = WallyHandleLoadMonSprite, + [CONTROLLER_SWITCHINANIM] = WallyHandleSwitchInAnim, + [CONTROLLER_RETURNMONTOBALL] = WallyHandleReturnMonToBall, + [CONTROLLER_DRAWTRAINERPIC] = WallyHandleDrawTrainerPic, + [CONTROLLER_TRAINERSLIDE] = WallyHandleTrainerSlide, + [CONTROLLER_TRAINERSLIDEBACK] = WallyHandleTrainerSlideBack, + [CONTROLLER_FAINTANIMATION] = WallyHandleFaintAnimation, + [CONTROLLER_PALETTEFADE] = WallyHandlePaletteFade, + [CONTROLLER_SUCCESSBALLTHROWANIM] = WallyHandleSuccessBallThrowAnim, + [CONTROLLER_BALLTHROWANIM] = WallyHandleBallThrowAnim, + [CONTROLLER_PAUSE] = WallyHandlePause, + [CONTROLLER_MOVEANIMATION] = WallyHandleMoveAnimation, + [CONTROLLER_PRINTSTRING] = WallyHandlePrintString, + [CONTROLLER_PRINTSTRINGPLAYERONLY] = WallyHandlePrintSelectionString, + [CONTROLLER_CHOOSEACTION] = WallyHandleChooseAction, + [CONTROLLER_UNKNOWNYESNOBOX] = WallyHandleUnknownYesNoBox, + [CONTROLLER_CHOOSEMOVE] = WallyHandleChooseMove, + [CONTROLLER_OPENBAG] = WallyHandleChooseItem, + [CONTROLLER_CHOOSEPOKEMON] = WallyHandleChoosePokemon, + [CONTROLLER_23] = WallyHandleCmd23, + [CONTROLLER_HEALTHBARUPDATE] = WallyHandleHealthBarUpdate, + [CONTROLLER_EXPUPDATE] = WallyHandleExpUpdate, + [CONTROLLER_STATUSICONUPDATE] = WallyHandleStatusIconUpdate, + [CONTROLLER_STATUSANIMATION] = WallyHandleStatusAnimation, + [CONTROLLER_STATUSXOR] = WallyHandleStatusXor, + [CONTROLLER_DATATRANSFER] = WallyHandleDataTransfer, + [CONTROLLER_DMA3TRANSFER] = WallyHandleDMA3Transfer, + [CONTROLLER_PLAYBGM] = WallyHandlePlayBGM, + [CONTROLLER_32] = WallyHandleCmd32, + [CONTROLLER_TWORETURNVALUES] = WallyHandleTwoReturnValues, + [CONTROLLER_CHOSENMONRETURNVALUE] = WallyHandleChosenMonReturnValue, + [CONTROLLER_ONERETURNVALUE] = WallyHandleOneReturnValue, + [CONTROLLER_ONERETURNVALUE_DUPLICATE] = WallyHandleOneReturnValue_Duplicate, + [CONTROLLER_CLEARUNKVAR] = WallyHandleClearUnkVar, + [CONTROLLER_SETUNKVAR] = WallyHandleSetUnkVar, + [CONTROLLER_CLEARUNKFLAG] = WallyHandleClearUnkFlag, + [CONTROLLER_TOGGLEUNKFLAG] = WallyHandleToggleUnkFlag, + [CONTROLLER_HITANIMATION] = WallyHandleHitAnimation, + [CONTROLLER_42] = WallyHandleCmd42, + [CONTROLLER_PLAYSE] = WallyHandlePlaySE, + [CONTROLLER_PLAYFANFAREORBGM] = WallyHandlePlayFanfareOrBGM, + [CONTROLLER_FAINTINGCRY] = WallyHandleFaintingCry, + [CONTROLLER_INTROSLIDE] = WallyHandleIntroSlide, + [CONTROLLER_INTROTRAINERBALLTHROW] = WallyHandleIntroTrainerBallThrow, + [CONTROLLER_DRAWPARTYSTATUSSUMMARY] = WallyHandleDrawPartyStatusSummary, + [CONTROLLER_HIDEPARTYSTATUSSUMMARY] = WallyHandleHidePartyStatusSummary, + [CONTROLLER_ENDBOUNCE] = WallyHandleEndBounceEffect, + [CONTROLLER_SPRITEINVISIBILITY] = WallyHandleSpriteInvisibility, + [CONTROLLER_BATTLEANIMATION] = WallyHandleBattleAnimation, + [CONTROLLER_LINKSTANDBYMSG] = WallyHandleLinkStandbyMsg, + [CONTROLLER_RESETACTIONMOVESELECTION] = WallyHandleResetActionMoveSelection, + [CONTROLLER_55] = WallyHandleCmd55, + [CONTROLLER_TERMINATOR_NOP] = WallyCmdEnd }; static void SpriteCB_Null7(void) @@ -1345,22 +1345,22 @@ static void WallyHandleOneReturnValue_Duplicate(void) WallyBufferExecCompleted(); } -static void WallyHandleCmd37(void) +static void WallyHandleClearUnkVar(void) { WallyBufferExecCompleted(); } -static void WallyHandleCmd38(void) +static void WallyHandleSetUnkVar(void) { WallyBufferExecCompleted(); } -static void WallyHandleCmd39(void) +static void WallyHandleClearUnkFlag(void) { WallyBufferExecCompleted(); } -static void WallyHandleCmd40(void) +static void WallyHandleToggleUnkFlag(void) { WallyBufferExecCompleted(); } diff --git a/src/battle_controllers.c b/src/battle_controllers.c index 3ebc5d3bd..20e638777 100644 --- a/src/battle_controllers.c +++ b/src/battle_controllers.c @@ -17,7 +17,7 @@ static EWRAM_DATA u8 sLinkSendTaskId = 0; static EWRAM_DATA u8 sLinkReceiveTaskId = 0; static EWRAM_DATA u8 sUnknown_02022D0A = 0; -EWRAM_DATA struct UnusedControllerStruct gUnknown_02022D0C = {}; +EWRAM_DATA struct UnusedControllerStruct gUnusedControllerStruct = {}; // Debug? Unused code that writes to it, never read static EWRAM_DATA u8 sBattleBuffersTransferData[0x100] = {}; // this file's funcionts @@ -64,7 +64,7 @@ void SetUpBattleVarsAndBirchZigzagoon(void) if (gBattleTypeFlags & BATTLE_TYPE_FIRST_BATTLE) { ZeroEnemyPartyMons(); - CreateMon(&gEnemyParty[0], SPECIES_ZIGZAGOON, 2, 32, 0, 0, OT_ID_PLAYER_ID, 0); + CreateMon(&gEnemyParty[0], SPECIES_ZIGZAGOON, 2, USE_RANDOM_IVS, 0, 0, OT_ID_PLAYER_ID, 0); i = 0; SetMonData(&gEnemyParty[0], MON_DATA_HELD_ITEM, &i); } @@ -174,9 +174,9 @@ static void InitSinglePlayerBtlControllers(void) if (gBattleTypeFlags & BATTLE_TYPE_RECORDED) { - if (gBattleTypeFlags & BATTLE_TYPE_x2000000) + if (gBattleTypeFlags & BATTLE_TYPE_RECORDED_LINK) { - if (gBattleTypeFlags & BATTLE_TYPE_x80000000) + if (gBattleTypeFlags & BATTLE_TYPE_RECORDED_IS_MASTER) { gBattleMainFunc = BeginBattleIntro; @@ -259,9 +259,9 @@ static void InitSinglePlayerBtlControllers(void) } else if (gBattleTypeFlags & BATTLE_TYPE_MULTI) { - u8 var; // multiplayer Id in a recorded battle? + u8 multiplayerId; - for (var = gUnknown_0203C7B4, i = 0; i < MAX_BATTLERS_COUNT; i++) + for (multiplayerId = gRecordedBattleMultiplayerId, i = 0; i < MAX_BATTLERS_COUNT; i++) { switch (gLinkPlayers[i].id) { @@ -275,7 +275,7 @@ static void InitSinglePlayerBtlControllers(void) break; } - if (i == var) + if (i == multiplayerId) { gBattlerControllerFuncs[gLinkPlayers[i].id] = SetControllerToRecordedPlayer; switch (gLinkPlayers[i].id) @@ -292,8 +292,8 @@ static void InitSinglePlayerBtlControllers(void) break; } } - else if ((!(gLinkPlayers[i].id & 1) && !(gLinkPlayers[var].id & 1)) - || ((gLinkPlayers[i].id & 1) && (gLinkPlayers[var].id & 1))) + else if ((!(gLinkPlayers[i].id & 1) && !(gLinkPlayers[multiplayerId].id & 1)) + || ((gLinkPlayers[i].id & 1) && (gLinkPlayers[multiplayerId].id & 1))) { gBattlerControllerFuncs[gLinkPlayers[i].id] = SetControllerToRecordedPlayer; switch (gLinkPlayers[i].id) @@ -337,7 +337,7 @@ static void InitSinglePlayerBtlControllers(void) gBattlerControllerFuncs[2] = SetControllerToRecordedPlayer; gBattlerPositions[2] = B_POSITION_PLAYER_RIGHT; - if (gBattleTypeFlags & BATTLE_TYPE_x2000000) + if (gBattleTypeFlags & BATTLE_TYPE_RECORDED_LINK) { gBattlerControllerFuncs[1] = SetControllerToRecordedOpponent; gBattlerPositions[1] = B_POSITION_OPPONENT_LEFT; @@ -362,7 +362,7 @@ static void InitSinglePlayerBtlControllers(void) gBattlerControllerFuncs[3] = SetControllerToRecordedPlayer; gBattlerPositions[3] = B_POSITION_PLAYER_RIGHT; - if (gBattleTypeFlags & BATTLE_TYPE_x2000000) + if (gBattleTypeFlags & BATTLE_TYPE_RECORDED_LINK) { gBattlerControllerFuncs[0] = SetControllerToRecordedOpponent; gBattlerPositions[0] = B_POSITION_OPPONENT_LEFT; @@ -825,7 +825,7 @@ void sub_8033648(void) s32 j; u8 *recvBuffer; - if (gReceivedRemoteLinkPlayers != 0 && (gBattleTypeFlags & BATTLE_TYPE_20)) + if (gReceivedRemoteLinkPlayers != 0 && (gBattleTypeFlags & BATTLE_TYPE_LINK_IN_BATTLE)) { DestroyTask_RfuIdle(); for (i = 0; i < GetLinkPlayerCount(); i++) @@ -1282,7 +1282,7 @@ void BtlController_EmitPlayBGM(u8 bufferId, u16 songId, void *unusedDumbDataPara { s32 i; - sBattleBuffersTransferData[0] = CONTROLLER_31; + sBattleBuffersTransferData[0] = CONTROLLER_PLAYBGM; sBattleBuffersTransferData[1] = songId; sBattleBuffersTransferData[2] = (songId & 0xFF00) >> 8; for (i = 0; i < songId; i++) // ???? @@ -1340,37 +1340,37 @@ void BtlController_EmitOneReturnValue_Duplicate(u8 bufferId, u16 b) PrepareBufferDataTransfer(bufferId, sBattleBuffersTransferData, 4); } -void BtlController_EmitCmd37(u8 bufferId) +void BtlController_EmitClearUnkVar(u8 bufferId) { - sBattleBuffersTransferData[0] = CONTROLLER_37; - sBattleBuffersTransferData[1] = CONTROLLER_37; - sBattleBuffersTransferData[2] = CONTROLLER_37; - sBattleBuffersTransferData[3] = CONTROLLER_37; + sBattleBuffersTransferData[0] = CONTROLLER_CLEARUNKVAR; + sBattleBuffersTransferData[1] = CONTROLLER_CLEARUNKVAR; + sBattleBuffersTransferData[2] = CONTROLLER_CLEARUNKVAR; + sBattleBuffersTransferData[3] = CONTROLLER_CLEARUNKVAR; PrepareBufferDataTransfer(bufferId, sBattleBuffersTransferData, 4); } -void BtlController_EmitCmd38(u8 bufferId, u8 b) +void BtlController_EmitSetUnkVar(u8 bufferId, u8 b) { - sBattleBuffersTransferData[0] = CONTROLLER_38; + sBattleBuffersTransferData[0] = CONTROLLER_SETUNKVAR; sBattleBuffersTransferData[1] = b; PrepareBufferDataTransfer(bufferId, sBattleBuffersTransferData, 2); } -void BtlController_EmitCmd39(u8 bufferId) +void BtlController_EmitClearUnkFlag(u8 bufferId) { - sBattleBuffersTransferData[0] = CONTROLLER_39; - sBattleBuffersTransferData[1] = CONTROLLER_39; - sBattleBuffersTransferData[2] = CONTROLLER_39; - sBattleBuffersTransferData[3] = CONTROLLER_39; + sBattleBuffersTransferData[0] = CONTROLLER_CLEARUNKFLAG; + sBattleBuffersTransferData[1] = CONTROLLER_CLEARUNKFLAG; + sBattleBuffersTransferData[2] = CONTROLLER_CLEARUNKFLAG; + sBattleBuffersTransferData[3] = CONTROLLER_CLEARUNKFLAG; PrepareBufferDataTransfer(bufferId, sBattleBuffersTransferData, 4); } -void BtlController_EmitCmd40(u8 bufferId) +void BtlController_EmitToggleUnkFlag(u8 bufferId) { - sBattleBuffersTransferData[0] = CONTROLLER_40; - sBattleBuffersTransferData[1] = CONTROLLER_40; - sBattleBuffersTransferData[2] = CONTROLLER_40; - sBattleBuffersTransferData[3] = CONTROLLER_40; + sBattleBuffersTransferData[0] = CONTROLLER_TOGGLEUNKFLAG; + sBattleBuffersTransferData[1] = CONTROLLER_TOGGLEUNKFLAG; + sBattleBuffersTransferData[2] = CONTROLLER_TOGGLEUNKFLAG; + sBattleBuffersTransferData[3] = CONTROLLER_TOGGLEUNKFLAG; PrepareBufferDataTransfer(bufferId, sBattleBuffersTransferData, 4); } @@ -1394,7 +1394,7 @@ void BtlController_EmitCmd42(u8 bufferId) void BtlController_EmitPlaySE(u8 bufferId, u16 songId) { - sBattleBuffersTransferData[0] = CONTROLLER_EFFECTIVENESSSOUND; + sBattleBuffersTransferData[0] = CONTROLLER_PLAYSE; sBattleBuffersTransferData[1] = songId; sBattleBuffersTransferData[2] = (songId & 0xFF00) >> 8; sBattleBuffersTransferData[3] = 0; diff --git a/src/battle_dome.c b/src/battle_dome.c index de8bb2843..de8fa660e 100644 --- a/src/battle_dome.c +++ b/src/battle_dome.c @@ -2875,7 +2875,7 @@ static u8 GetDomeTrainerMonIvs(u16 trainerId) else if (trainerId <= FRONTIER_TRAINER_TESS) // 200 - 219 fixedIv = 21; else // 220+ (- 299) - fixedIv = 31; + fixedIv = MAX_PER_STAT_IVS; return fixedIv; } diff --git a/src/battle_factory.c b/src/battle_factory.c index a2b1d337a..9ba13b0d3 100644 --- a/src/battle_factory.c +++ b/src/battle_factory.c @@ -25,8 +25,8 @@ static void InitFactoryChallenge(void); static void GetBattleFactoryData(void); static void SetBattleFactoryData(void); static void SaveFactoryChallenge(void); -static void nullsub_75(void); -static void nullsub_123(void); +static void FactoryDummy1(void); +static void FactoryDummy2(void); static void SelectInitialRentalMons(void); static void SwapRentalMons(void); static void SetPerformedRentalSwap(void); @@ -41,8 +41,16 @@ static void RestorePlayerPartyHeldItems(void); static u16 GetFactoryMonId(u8 lvlMode, u8 challengeNum, bool8 arg2); static u8 GetMoveBattleStyle(u16 move); -// Const rom data. -static const u8 sRequiredMoveCounts[] = {3, 3, 3, 2, 2, 2, 2}; +// Number of moves needed on the team to be considered using a certain battle style +static const u8 sRequiredMoveCounts[FACTORY_NUM_STYLES - 1] = { + [FACTORY_STYLE_PREPARATION - 1] = 3, + [FACTORY_STYLE_SLOW_STEADY - 1] = 3, + [FACTORY_STYLE_ENDURANCE - 1] = 3, + [FACTORY_STYLE_HIGH_RISK - 1] = 2, + [FACTORY_STYLE_WEAKENING - 1] = 2, + [FACTORY_STYLE_UNPREDICTABLE - 1] = 2, + [FACTORY_STYLE_WEATHER - 1] = 2 +}; static const u16 sMoves_TotalPreparation[] = { @@ -119,8 +127,8 @@ static void (* const sBattleFactoryFunctions[])(void) = [BATTLE_FACTORY_FUNC_GET_DATA] = GetBattleFactoryData, [BATTLE_FACTORY_FUNC_SET_DATA] = SetBattleFactoryData, [BATTLE_FACTORY_FUNC_SAVE] = SaveFactoryChallenge, - [BATTLE_FACTORY_FUNC_NULL] = nullsub_75, - [BATTLE_FACTORY_FUNC_NULL2] = nullsub_123, + [BATTLE_FACTORY_FUNC_NULL] = FactoryDummy1, + [BATTLE_FACTORY_FUNC_NULL2] = FactoryDummy2, [BATTLE_FACTORY_FUNC_SELECT_RENT_MONS] = SelectInitialRentalMons, [BATTLE_FACTORY_FUNC_SWAP_RENT_MONS] = SwapRentalMons, [BATTLE_FACTORY_FUNC_SET_SWAPPED] = SetPerformedRentalSwap, @@ -266,12 +274,12 @@ static void SaveFactoryChallenge(void) SaveGameFrontier(); } -static void nullsub_75(void) +static void FactoryDummy1(void) { } -static void nullsub_123(void) +static void FactoryDummy2(void) { } @@ -376,10 +384,10 @@ static void SetRentalsToOpponentParty(void) for (i = 0; i < FRONTIER_PARTY_SIZE; i++) { - gSaveBlock2Ptr->frontier.rentalMons[i + 3].monId = gFrontierTempParty[i]; - gSaveBlock2Ptr->frontier.rentalMons[i + 3].ivs = GetBoxMonData(&gEnemyParty[i].box, MON_DATA_ATK_IV, NULL); - gSaveBlock2Ptr->frontier.rentalMons[i + 3].personality = GetMonData(&gEnemyParty[i], MON_DATA_PERSONALITY, NULL); - gSaveBlock2Ptr->frontier.rentalMons[i + 3].abilityNum = GetBoxMonData(&gEnemyParty[i].box, MON_DATA_ABILITY_NUM, NULL); + gSaveBlock2Ptr->frontier.rentalMons[i + FRONTIER_PARTY_SIZE].monId = gFrontierTempParty[i]; + gSaveBlock2Ptr->frontier.rentalMons[i + FRONTIER_PARTY_SIZE].ivs = GetBoxMonData(&gEnemyParty[i].box, MON_DATA_ATK_IV, NULL); + gSaveBlock2Ptr->frontier.rentalMons[i + FRONTIER_PARTY_SIZE].personality = GetMonData(&gEnemyParty[i], MON_DATA_PERSONALITY, NULL); + gSaveBlock2Ptr->frontier.rentalMons[i + FRONTIER_PARTY_SIZE].abilityNum = GetBoxMonData(&gEnemyParty[i].box, MON_DATA_ABILITY_NUM, NULL); SetMonData(&gEnemyParty[i], MON_DATA_HELD_ITEM, &gBattleFrontierHeldItems[gFacilityTrainerMons[gFrontierTempParty[i]].itemTableId]); } } @@ -455,13 +463,13 @@ static void SetPlayerAndOpponentParties(void) case 2: for (i = 0; i < FRONTIER_PARTY_SIZE; i++) { - monId = gSaveBlock2Ptr->frontier.rentalMons[i + 3].monId; - ivs = gSaveBlock2Ptr->frontier.rentalMons[i + 3].ivs; + monId = gSaveBlock2Ptr->frontier.rentalMons[i + FRONTIER_PARTY_SIZE].monId; + ivs = gSaveBlock2Ptr->frontier.rentalMons[i + FRONTIER_PARTY_SIZE].ivs; CreateMon(&gEnemyParty[i], gFacilityTrainerMons[monId].species, monLevel, ivs, - TRUE, gSaveBlock2Ptr->frontier.rentalMons[i + 3].personality, + TRUE, gSaveBlock2Ptr->frontier.rentalMons[i + FRONTIER_PARTY_SIZE].personality, OT_ID_PLAYER_ID, 0); count = 0; @@ -484,7 +492,7 @@ static void SetPlayerAndOpponentParties(void) for (k = 0; k < MAX_MON_MOVES; k++) SetMonMoveAvoidReturn(&gEnemyParty[i], gFacilityTrainerMons[monId].moves[k], k); SetMonData(&gEnemyParty[i], MON_DATA_HELD_ITEM, &gBattleFrontierHeldItems[gFacilityTrainerMons[monId].itemTableId]); - SetMonData(&gEnemyParty[i], MON_DATA_ABILITY_NUM, &gSaveBlock2Ptr->frontier.rentalMons[i + 3].abilityNum); + SetMonData(&gEnemyParty[i], MON_DATA_ABILITY_NUM, &gSaveBlock2Ptr->frontier.rentalMons[i + FRONTIER_PARTY_SIZE].abilityNum); } break; } @@ -639,7 +647,7 @@ static void GetOpponentBattleStyle(void) } } - gSpecialVar_Result = 0; + gSpecialVar_Result = FACTORY_STYLE_NONE; for (i = 1; i < FACTORY_NUM_STYLES; i++) { if (stylePoints[i] >= sRequiredMoveCounts[i - 1]) diff --git a/src/battle_factory_screen.c b/src/battle_factory_screen.c index cbe4fc432..2cacba2a1 100644 --- a/src/battle_factory_screen.c +++ b/src/battle_factory_screen.c @@ -25,52 +25,77 @@ #include "util.h" #include "trainer_pokemon_sprites.h" #include "starter_choose.h" +#include "strings.h" +#include "graphics.h" #include "constants/battle_frontier.h" #include "constants/songs.h" #include "constants/rgb.h" -// Select_ refers to the first Pokemon selection screen where you choose 3 Pokemon. -// Swap_ refers to the consecutive selection screen where you can keep your Pokemon or swap one with beaten trainer's. +// Select_ refers to the first Pokemon selection screen where you choose your initial 3 rental Pokemon. +// Swap_ refers to the subsequent selection screens where you can swap a Pokemon with one from the beaten trainer -#define MENU_SUMMARY 0 -#define MENU_RENT 1 -#define MENU_DESELECT 1 -#define MENU_OTHERS 2 -#define MENU_OPTIONS_COUNT 3 +// Note that, generally, "Action" will refer to the immediate actions that can be taken on each screen, +// i.e. selecting a pokemon or selecting the Cancel button +// The "Options menu" will refer to the popup menu that shows when some actions have been selected + +#define SWAP_PLAYER_SCREEN 0 // The screen where the player selects which of their pokemon to swap away +#define SWAP_ENEMY_SCREEN 1 // The screen where the player selects which new pokemon from the defeated party to swap for #define SELECTABLE_MONS_COUNT 6 -#define TAG_PAL_BALL_GREY 0x64 -#define TAG_PAL_BALL_SELECTED 0x65 -#define TAG_PAL_66 0x66 -#define TAG_PAL_67 0x67 +enum { + PALTAG_BALL_GRAY = 100, + PALTAG_BALL_SELECTED, + PALTAG_INTERFACE, + PALTAG_MON_PIC_BG, +}; -#define TAG_TILE_64 0x64 -#define TAG_TILE_65 0x65 -#define TAG_TILE_66 0x66 -#define TAG_TILE_67 0x67 -#define TAG_TILE_68 0x68 -#define TAG_TILE_69 0x69 -#define TAG_TILE_6A 0x6A -#define TAG_TILE_6B 0x6B -#define TAG_TILE_6C 0x6C -#define TAG_TILE_6D 0x6D +enum { + GFXTAG_BALL = 100, + GFXTAG_ARROW, + GFXTAG_MENU_HIGHLIGHT_LEFT, + GFXTAG_MENU_HIGHLIGHT_RIGHT, + GFXTAG_ACTION_BOX_LEFT, + GFXTAG_ACTION_BOX_RIGHT, + GFXTAG_ACTION_HIGHLIGHT_LEFT, + GFXTAG_ACTION_HIGHLIGHT_MIDDLE, + GFXTAG_ACTION_HIGHLIGHT_RIGHT, + GFXTAG_MON_PIC_BG_ANIM, +}; -struct FactorySelecteableMon +// Tasks in this file universally use data[0] as a state for switches +#define tState data[0] + +// States for both Select/Swap versions of Task_FadeSpeciesName +enum { + FADESTATE_INIT, + FADESTATE_RUN, + FADESTATE_DELAY +}; + +// Return states for the Select Actions +enum { + SELECT_SUMMARY, + SELECT_CONTINUE_CHOOSING, + SELECT_CONFIRM_MONS, + SELECT_INVALID_MON, +}; + +struct FactorySelectableMon { u16 monId; - u16 spriteId; + u16 ballSpriteId; u8 selectedId; // 0 - not selected, 1 - first pokemon, 2 - second pokemon, 3 - third pokemon struct Pokemon monData; }; -struct UnkFactoryStruct +struct FactoryMonPic { - u8 field0; - u8 field1; + u8 monSpriteId; + u8 bgSpriteId; }; -struct FactorySelectMonsStruct +struct FactorySelectScreen { u8 menuCursorPos; u8 menuCursor1SpriteId; @@ -80,206 +105,201 @@ struct FactorySelectMonsStruct u8 selectingMonsState; bool8 fromSummaryScreen; u8 yesNoCursorPos; - u8 unused8; - struct FactorySelecteableMon mons[SELECTABLE_MONS_COUNT]; - struct UnkFactoryStruct unk294[3]; - bool8 unk2A0; + u8 unused; + struct FactorySelectableMon mons[SELECTABLE_MONS_COUNT]; + struct FactoryMonPic monPics[FRONTIER_PARTY_SIZE]; // Array so all chosen mons can be shown at once + bool8 monPicAnimating; u8 fadeSpeciesNameTaskId; - bool8 unk2A2; - u16 unk2A4; - bool8 unk2A6; - u8 unk2A7; - u8 unk2A8; - u8 unk2A9; + bool8 fadeSpeciesNameActive; + u16 speciesNameColorBackup; + bool8 fadeSpeciesNameFadeOut; + u8 fadeSpeciesNameCoeffDelay; + u8 fadeSpeciesNameCoeff; + u8 faceSpeciesNameDelay; }; -// 'Action' refers to the 3 Selectable mons, Cancel, Pknm for swap windows. -#define ACTIONS_PLAYER_SCREEN 0 -#define ACTIONS_ENEMY_SCREEN 1 - -struct SwapActionIdAndFunc +struct SwapScreenAction { u8 id; void (*func)(u8 taskId); }; -struct FactorySwapMonsStruct +struct FactorySwapScreen { u8 menuCursorPos; u8 menuCursor1SpriteId; u8 menuCursor2SpriteId; u8 cursorPos; u8 cursorSpriteId; - u8 ballSpriteIds[3]; - u8 unk8[2][3]; - u8 unkE[2][2]; + u8 ballSpriteIds[FRONTIER_PARTY_SIZE]; + u8 pkmnForSwapButtonSpriteIds[2][3]; // For this and sprite ID array below, [0][i] is the button background, [1][i] is the button highlight + u8 cancelButtonSpriteIds[2][2]; u8 playerMonId; u8 enemyMonId; bool8 inEnemyScreen; bool8 fromSummaryScreen; u8 yesNoCursorPos; u8 actionsCount; - const struct SwapActionIdAndFunc *actionsData; - u8 unused1C[4]; + const struct SwapScreenAction *actionsData; + u8 unused[4]; bool8 monSwapped; u8 fadeSpeciesNameTaskId; - bool8 unk22; - u16 unk24; - bool8 unk26; - u8 unk27; - u8 unk28; - u8 unk29; - struct UnkFactoryStruct unk2C; - bool8 unk30; + bool8 fadeSpeciesNameActive; + u16 speciesNameColorBackup; + bool8 fadeSpeciesNameFadeOut; + u8 fadeSpeciesNameCoeffDelay; + u8 fadeSpeciesNameCoeff; + u8 faceSpeciesNameDelay; + struct FactoryMonPic monPic; + bool8 monPicAnimating; }; -// This file's functions. -static void sub_819A44C(struct Sprite *sprite); +static void SpriteCB_Pokeball(struct Sprite *); +static void SpriteCB_OpenMonPic(struct Sprite *); +static void OpenMonPic(u8 *, bool8 *, bool8); +static void HideMonPic(struct FactoryMonPic, bool8 *); +static void CloseMonPic(struct FactoryMonPic, bool8 *, bool8); +static void Task_OpenMonPic(u8); +static void Task_CloseMonPic(u8); + +// Select screen static void CB2_InitSelectScreen(void); -static void Select_SetWinRegs(s16 mWin0H, s16 nWin0H, s16 mWin0V, s16 nWin0V); +static void Select_SetWinRegs(s16, s16, s16, s16); static void Select_InitMonsData(void); static void Select_InitAllSprites(void); -static void Select_ShowSummaryMonSprite(void); +static void Select_ReshowMonSprite(void); static void Select_PrintSelectMonString(void); static void Select_PrintMonSpecies(void); static void Select_PrintMonCategory(void); static void Select_PrintRentalPkmnString(void); static void Select_CopyMonsToPlayerParty(void); -static void sub_819C4B4(void); +static void Select_ShowChosenMons(void); static void Select_ShowYesNoOptions(void); -static void sub_819C568(void); +static void Select_HideChosenMons(void); static void Select_ShowMenuOptions(void); static void Select_PrintMenuOptions(void); static void Select_PrintYesNoOptions(void); -static void Task_SelectFadeSpeciesName(u8 taskId); -static void sub_819C1D0(u8 taskId); -static void Task_HandleSelectionScreenChooseMons(u8 taskId); -static void Task_HandleSelectionScreenMenu(u8 taskId); -static void CreateFrontierFactorySelectableMons(u8 firstMonId); -static void CreateTentFactorySelectableMons(u8 firstMonId); -static void Select_SetBallSpritePaletteNum(u8 id); -static void sub_819F444(struct UnkFactoryStruct arg0, bool8 *arg1); -static void sub_819B958(u8 windowId); -static void sub_819F2B4(u8 *arg0, bool8 *arg1, bool8 swapScreen); -static void sub_819F3F8(struct UnkFactoryStruct arg0, bool8 *arg1, bool8 swapScreen); +static void Select_Task_FadeSpeciesName(u8); +static void Select_Task_OpenChosenMonPics(u8); +static void Select_Task_HandleChooseMons(u8); +static void Select_Task_HandleMenu(u8); +static void CreateFrontierFactorySelectableMons(u8); +static void CreateSlateportTentSelectableMons(u8); +static void Select_SetBallSpritePaletteNum(u8); +static void Select_ErasePopupMenu(u8); static u8 Select_RunMenuOptionFunc(void); -static u8 sub_819BC9C(void); +static u8 Select_DeclineChosenMons(void); static u8 Select_OptionSummary(void); static u8 Select_OptionOthers(void); static u8 Select_OptionRentDeselect(void); -static bool32 Select_AreSpeciesValid(u16 monId); +static bool32 Select_AreSpeciesValid(u16); + +// Swap screen +static void CB2_InitSwapScreen(void); static void Swap_DestroyAllSprites(void); static void Swap_ShowYesNoOptions(void); -static void sub_819E8EC(void); -static void sub_819EAC0(void); -static void Swap_UpdateYesNoCursorPosition(s8 direction); -static void Swap_UpdateMenuCursorPosition(s8 direction); -static void sub_819EA64(u8 windowId); -static void sub_819D770(u8 taskId); -static void Task_HandleSwapScreenChooseMons(u8 taskId); -static void sub_819D588(u8 taskId); -static void sub_819F7B4(u8 taskId); -static void Swap_PrintOnInfoWindow(const u8 *str); +static void Swap_HideActionButtonHighlights(void); +static void Swap_EraseSpeciesWindow(void); +static void Swap_UpdateYesNoCursorPosition(s8); +static void Swap_UpdateMenuCursorPosition(s8); +static void Swap_ErasePopupMenu(u8); +static void Swap_Task_ScreenInfoTransitionIn(u8); +static void Swap_Task_HandleChooseMons(u8); +static void Swap_Task_ScreenInfoTransitionOut(u8); +static void Swap_PrintOnInfoWindow(const u8 *); static void Swap_ShowMenuOptions(void); static void Swap_PrintMenuOptions(void); static void Swap_PrintYesNoOptions(void); static void Swap_PrintMonSpecies(void); -static void Swap_PrintMonSpecies2(void); -static void Swap_PrintMonSpecies3(void); +static void Swap_PrintMonSpeciesAtFade(void); +static void Swap_PrintMonSpeciesForTransition(void); static void Swap_PrintMonCategory(void); static void Swap_InitAllSprites(void); static void Swap_PrintPkmnSwap(void); -static void sub_819EADC(void); -static void sub_819EAF8(void); -static void CB2_InitSwapScreen(void); +static void Swap_EraseSpeciesAtFadeWindow(void); +static void Swap_EraseActionFadeWindow(void); static void Swap_ShowSummaryMonSprite(void); -static void Swap_UpdateActionCursorPosition(s8 direction); -static void Swap_UpdateBallCursorPosition(s8 direction); -static void Swap_RunMenuOptionFunc(u8 taskId); -static void sub_819F0CC(u8 taskId); -static void sub_819F114(u8 taskId); -static void sub_819F134(u8 taskId); -static void Swap_RunActionFunc(u8 taskId); -static void sub_819F69C(u8 taskId); -static void Task_SwapCantHaveSameMons(u8 taskId); -static void Swap_ShowMonSprite(void); +static void Swap_UpdateActionCursorPosition(s8); +static void Swap_UpdateBallCursorPosition(s8); +static void Swap_RunMenuOptionFunc(u8); +static void Swap_OptionSwap(u8); +static void Swap_OptionSummary(u8); +static void Swap_OptionRechoose(u8); +static void Swap_RunActionFunc(u8); +static void Swap_TaskCantHaveSameMons(u8); +static void Swap_CreateMonSprite(void); static void Swap_PrintActionStrings(void); static void Swap_PrintActionStrings2(void); -static void Swap_PrintOneActionString(u8 which); -static void Swap_InitActions(u8 id); -static void sub_819E838(u8 arg0); -static bool8 Swap_AlreadyHasSameSpecies(u8 monId); -static void sub_819F600(struct Sprite *sprite); -static void Swap_ActionMon(u8 taskId); -static void Swap_ActionCancel(u8 taskId); -static void Swap_ActionPkmnForSwap(u8 taskId); +static void Swap_PrintOneActionString(u8); +static void Swap_InitActions(u8); +static void Swap_HighlightActionButton(u8); +static bool8 Swap_AlreadyHasSameSpecies(u8); +static void Swap_ActionMon(u8); +static void Swap_ActionCancel(u8); +static void Swap_ActionPkmnForSwap(u8); -// Ewram variables static EWRAM_DATA u8 *sSelectMenuTilesetBuffer = NULL; -static EWRAM_DATA u8 *sSelectMonCardBgTilesetBuffer = NULL; +static EWRAM_DATA u8 *sSelectMonPicBgTilesetBuffer = NULL; static EWRAM_DATA u8 *sSelectMenuTilemapBuffer = NULL; -static EWRAM_DATA u8 *sSelectMonCardBgTilemapBuffer = NULL; +static EWRAM_DATA u8 *sSelectMonPicBgTilemapBuffer = NULL; static EWRAM_DATA struct Pokemon *sFactorySelectMons = NULL; static EWRAM_DATA u8 *sSwapMenuTilesetBuffer = NULL; -static EWRAM_DATA u8 *sSwapMonCardBgTilesetBuffer = NULL; +static EWRAM_DATA u8 *sSwapMonPicBgTilesetBuffer = NULL; static EWRAM_DATA u8 *sSwapMenuTilemapBuffer = NULL; -static EWRAM_DATA u8 *sSwapMonCardBgTilemapBuffer = NULL; +static EWRAM_DATA u8 *sSwapMonPicBgTilemapBuffer = NULL; -// IWRAM bss -static struct FactorySelectMonsStruct *sFactorySelectScreen; -static void (*sSwap_CurrentTableFunc)(u8 taskId); -static struct FactorySwapMonsStruct *sFactorySwapScreen; +static struct FactorySelectScreen *sFactorySelectScreen; +static void (*sSwap_CurrentOptionFunc)(u8 taskId); +static struct FactorySwapScreen *sFactorySwapScreen; -// IWRAM common -u8 (*gUnknown_030062E8)(void); +u8 (*gFactorySelect_CurrentOptionFunc)(void); -// Const rom data. -static const u16 gUnknown_0860F13C[] = INCBIN_U16("graphics/unknown/unknown_60F13C.gbapal"); -static const u16 gUnknown_0860F15C[] = INCBIN_U16("graphics/unknown/unknown_60F15C.gbapal"); -static const u16 gUnknown_0860F17C[] = INCBIN_U16("graphics/unknown/unknown_60F17C.gbapal"); -static const u8 gUnknown_0860F1BC[] = INCBIN_U8("graphics/unknown/unknown_60F1BC.4bpp"); -static const u8 gUnknown_0860F3BC[] = INCBIN_U8("graphics/unknown/unknown_60F3BC.4bpp"); -static const u8 gUnknown_0860F43C[] = INCBIN_U8("graphics/unknown/unknown_60F43C.4bpp"); -static const u8 gUnknown_0860F53C[] = INCBIN_U8("graphics/unknown/unknown_60F53C.4bpp"); -static const u8 gUnknown_0860F63C[] = INCBIN_U8("graphics/unknown/unknown_60F63C.4bpp"); -static const u8 gUnknown_0860F6BC[] = INCBIN_U8("graphics/unknown/unknown_60F6BC.4bpp"); -static const u8 gUnknown_0860F7BC[] = INCBIN_U8("graphics/unknown/unknown_60F7BC.4bpp"); -static const u8 gUnknown_0860F83C[] = INCBIN_U8("graphics/unknown/unknown_60F83C.4bpp"); -static const u8 gUnknown_0860F93C[] = INCBIN_U8("graphics/unknown/unknown_60F93C.4bpp"); -static const u8 gUnknown_0860FA3C[] = INCBIN_U8("graphics/unknown/unknown_60FA3C.4bpp"); -static const u8 gUnknown_0861023C[] = INCBIN_U8("graphics/unknown/unknown_61023C.bin"); -static const u8 gUnknown_0861033C[] = INCBIN_U8("graphics/unknown/unknown_61033C.4bpp"); -static const u16 gUnknown_0861039C[] = INCBIN_U16("graphics/unknown/unknown_61039C.gbapal"); +static const u16 sPokeballGray_Pal[] = INCBIN_U16("graphics/battle_frontier/factory_screen/pokeball_gray.gbapal"); +static const u16 sPokeballSelected_Pal[] = INCBIN_U16("graphics/battle_frontier/factory_screen/pokeball_selected.gbapal"); +static const u16 sInterface_Pal[] = INCBIN_U16("graphics/battle_frontier/factory_screen/interface.gbapal"); // Arrow, menu/action highlights, action box, etc +static const u8 sPokeball_Gfx[] = INCBIN_U8( "graphics/battle_frontier/factory_screen/pokeball.4bpp"); // Unused, gPokeballSelection_Gfx used instead +static const u8 sArrow_Gfx[] = INCBIN_U8( "graphics/battle_frontier/factory_screen/arrow.4bpp"); +static const u8 sMenuHighlightLeft_Gfx[] = INCBIN_U8( "graphics/battle_frontier/factory_screen/menu_highlight_left.4bpp"); +static const u8 sMenuHighlightRight_Gfx[] = INCBIN_U8( "graphics/battle_frontier/factory_screen/menu_highlight_right.4bpp"); +static const u8 sActionBoxLeft_Gfx[] = INCBIN_U8( "graphics/battle_frontier/factory_screen/action_box_left.4bpp"); +static const u8 sActionBoxRight_Gfx[] = INCBIN_U8( "graphics/battle_frontier/factory_screen/action_box_right.4bpp"); +static const u8 sActionHighlightLeft_Gfx[] = INCBIN_U8( "graphics/battle_frontier/factory_screen/action_highlight_left.4bpp"); +static const u8 sActionHighlightMiddle_Gfx[] = INCBIN_U8( "graphics/battle_frontier/factory_screen/action_highlight_middle.4bpp"); +static const u8 sActionHighlightRight_Gfx[] = INCBIN_U8( "graphics/battle_frontier/factory_screen/action_highlight_right.4bpp"); +static const u8 sMonPicBgAnim_Gfx[] = INCBIN_U8( "graphics/battle_frontier/factory_screen/mon_pic_bg_anim.4bpp"); +static const u8 sMonPicBg_Tilemap[] = INCBIN_U8( "graphics/battle_frontier/factory_screen/mon_pic_bg.bin"); +static const u8 sMonPicBg_Gfx[] = INCBIN_U8( "graphics/battle_frontier/factory_screen/mon_pic_bg.4bpp"); +static const u16 sMonPicBg_Pal[] = INCBIN_U16("graphics/battle_frontier/factory_screen/mon_pic_bg.gbapal"); -static const struct SpriteSheet gUnknown_086103BC[] = +static const struct SpriteSheet sSelect_SpriteSheets[] = { - {gUnknown_0860F3BC, sizeof(gUnknown_0860F3BC), TAG_TILE_65}, - {gUnknown_0860F43C, sizeof(gUnknown_0860F43C), TAG_TILE_66}, - {gUnknown_0860F53C, sizeof(gUnknown_0860F53C), TAG_TILE_67}, - {gUnknown_0860FA3C, sizeof(gUnknown_0860FA3C), TAG_TILE_6D}, + {sArrow_Gfx, sizeof(sArrow_Gfx), GFXTAG_ARROW}, + {sMenuHighlightLeft_Gfx, sizeof(sMenuHighlightLeft_Gfx), GFXTAG_MENU_HIGHLIGHT_LEFT}, + {sMenuHighlightRight_Gfx, sizeof(sMenuHighlightRight_Gfx), GFXTAG_MENU_HIGHLIGHT_RIGHT}, + {sMonPicBgAnim_Gfx, sizeof(sMonPicBgAnim_Gfx), GFXTAG_MON_PIC_BG_ANIM}, {}, }; -static const struct CompressedSpriteSheet gUnknown_086103E4[] = +static const struct CompressedSpriteSheet sSelect_BallGfx[] = { - {gPokeballSelection_Gfx, 0x800, TAG_TILE_64}, + {gPokeballSelection_Gfx, 0x800, GFXTAG_BALL}, {}, }; -static const struct SpritePalette gUnknown_086103F4[] = +static const struct SpritePalette sSelect_SpritePalettes[] = { - {gUnknown_0860F13C, TAG_PAL_BALL_GREY}, - {gUnknown_0860F15C, TAG_PAL_BALL_SELECTED}, - {gUnknown_0860F17C, TAG_PAL_66}, - {gUnknown_0861039C, TAG_PAL_67}, + {sPokeballGray_Pal, PALTAG_BALL_GRAY}, + {sPokeballSelected_Pal, PALTAG_BALL_SELECTED}, + {sInterface_Pal, PALTAG_INTERFACE}, + {sMonPicBg_Pal, PALTAG_MON_PIC_BG}, {}, }; u8 static (* const sSelect_MenuOptionFuncs[])(void) = { - [MENU_SUMMARY] = Select_OptionSummary, - [MENU_RENT] /*Or Deselect*/ = Select_OptionRentDeselect, - [MENU_OTHERS] = Select_OptionOthers + Select_OptionSummary, + Select_OptionRentDeselect, + Select_OptionOthers }; static const struct BgTemplate sSelect_BgTemplates[] = @@ -313,9 +333,18 @@ static const struct BgTemplate sSelect_BgTemplates[] = }, }; +enum { + SELECT_WIN_TITLE, + SELECT_WIN_SPECIES, + SELECT_WIN_INFO, + SELECT_WIN_OPTIONS, + SELECT_WIN_YES_NO, + SELECT_WIN_MON_CATEGORY, +}; + static const struct WindowTemplate sSelect_WindowTemplates[] = { - { + [SELECT_WIN_TITLE] = { .bg = 0, .tilemapLeft = 0, .tilemapTop = 2, @@ -324,7 +353,7 @@ static const struct WindowTemplate sSelect_WindowTemplates[] = .paletteNum = 15, .baseBlock = 0x0001, }, - { + [SELECT_WIN_SPECIES] = { .bg = 0, .tilemapLeft = 19, .tilemapTop = 2, @@ -333,7 +362,7 @@ static const struct WindowTemplate sSelect_WindowTemplates[] = .paletteNum = 14, .baseBlock = 0x0019, }, - { + [SELECT_WIN_INFO] = { .bg = 0, .tilemapLeft = 0, .tilemapTop = 15, @@ -342,7 +371,7 @@ static const struct WindowTemplate sSelect_WindowTemplates[] = .paletteNum = 15, .baseBlock = 0x002f, }, - { + [SELECT_WIN_OPTIONS] = { .bg = 0, .tilemapLeft = 22, .tilemapTop = 14, @@ -351,7 +380,7 @@ static const struct WindowTemplate sSelect_WindowTemplates[] = .paletteNum = 15, .baseBlock = 0x006b, }, - { + [SELECT_WIN_YES_NO] = { .bg = 0, .tilemapLeft = 22, .tilemapTop = 14, @@ -360,7 +389,7 @@ static const struct WindowTemplate sSelect_WindowTemplates[] = .paletteNum = 15, .baseBlock = 0x009b, }, - { + [SELECT_WIN_MON_CATEGORY] = { .bg = 0, .tilemapLeft = 15, .tilemapTop = 0, @@ -372,12 +401,11 @@ static const struct WindowTemplate sSelect_WindowTemplates[] = DUMMY_WIN_TEMPLATE, }; -static const u16 gUnknown_0861046C[] = INCBIN_U16("graphics/unknown/unknown_61046C.gbapal"); - +static const u16 sSelectText_Pal[] = INCBIN_U16("graphics/battle_frontier/factory_screen/text.gbapal"); static const u8 sMenuOptionTextColors[] = {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_DARK_GREY, TEXT_COLOR_TRANSPARENT}; static const u8 sSpeciesNameTextColors[] = {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_RED, TEXT_COLOR_TRANSPARENT}; -static const struct OamData gUnknown_0861047C = +static const struct OamData sOam_Select_Pokeball = { .y = 0, .affineMode = ST_OAM_AFFINE_OFF, @@ -394,7 +422,7 @@ static const struct OamData gUnknown_0861047C = .affineParam = 0, }; -static const struct OamData gUnknown_08610484 = +static const struct OamData sOam_Select_Arrow = { .y = 0, .affineMode = ST_OAM_AFFINE_OFF, @@ -411,7 +439,7 @@ static const struct OamData gUnknown_08610484 = .affineParam = 0, }; -static const struct OamData gUnknown_0861048C = +static const struct OamData sOam_Select_MenuHighlight = { .y = 0, .affineMode = ST_OAM_AFFINE_OFF, @@ -428,7 +456,7 @@ static const struct OamData gUnknown_0861048C = .affineParam = 0, }; -static const struct OamData gUnknown_08610494 = +static const struct OamData sOam_Select_MonPicBgAnim = { .y = 0, .affineMode = ST_OAM_AFFINE_DOUBLE, @@ -445,25 +473,25 @@ static const struct OamData gUnknown_08610494 = .affineParam = 1, }; -static const union AnimCmd gUnknown_0861049C[] = +static const union AnimCmd sAnim_Select_Interface[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -static const union AnimCmd gUnknown_086104A4[] = +static const union AnimCmd sAnim_Select_MonPicBgAnim[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -static const union AnimCmd gUnknown_086104AC[] = +static const union AnimCmd sAnim_Select_Pokeball_Still[] = { ANIMCMD_FRAME(0, 30), ANIMCMD_END, }; -static const union AnimCmd gUnknown_086104B4[] = +static const union AnimCmd sAnim_Select_Pokeball_Moving[] = { ANIMCMD_FRAME(16, 4), ANIMCMD_FRAME(0, 4), @@ -485,20 +513,20 @@ static const union AnimCmd gUnknown_086104B4[] = ANIMCMD_END, }; -static const union AnimCmd * const gUnknown_086104FC[] = +static const union AnimCmd * const sAnims_Select_Interface[] = { - gUnknown_0861049C, + sAnim_Select_Interface, }; -static const union AnimCmd * const gUnknown_08610500[] = +static const union AnimCmd * const sAnims_Select_MonPicBgAnim[] = { - gUnknown_086104A4, + sAnim_Select_MonPicBgAnim, }; -static const union AnimCmd * const gUnknown_08610504[] = +static const union AnimCmd * const sAnims_Select_Pokeball[] = { - gUnknown_086104AC, - gUnknown_086104B4, + sAnim_Select_Pokeball_Still, + sAnim_Select_Pokeball_Moving, }; static const union AffineAnimCmd gUnknown_0861050C[] = @@ -537,98 +565,98 @@ static const union AffineAnimCmd gUnknown_086105BC[] = AFFINEANIMCMD_END, }; -static const union AffineAnimCmd * const gUnknown_086105CC[] = +static const union AffineAnimCmd * const sAffineAnims_Select_MonPicBgAnim[] = { gUnknown_0861050C, gUnknown_0861056C, gUnknown_086105BC, }; -static const struct SpriteTemplate gUnknown_086105D8 = +static const struct SpriteTemplate sSpriteTemplate_Select_Pokeball = { - .tileTag = TAG_TILE_64, - .paletteTag = TAG_PAL_BALL_GREY, - .oam = &gUnknown_0861047C, - .anims = gUnknown_08610504, + .tileTag = GFXTAG_BALL, + .paletteTag = PALTAG_BALL_GRAY, + .oam = &sOam_Select_Pokeball, + .anims = sAnims_Select_Pokeball, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_819A44C + .callback = SpriteCB_Pokeball }; -static const struct SpriteTemplate gUnknown_086105F0 = +static const struct SpriteTemplate sSpriteTemplate_Select_Arrow = { - .tileTag = TAG_TILE_65, - .paletteTag = TAG_PAL_66, - .oam = &gUnknown_08610484, - .anims = gUnknown_086104FC, + .tileTag = GFXTAG_ARROW, + .paletteTag = PALTAG_INTERFACE, + .oam = &sOam_Select_Arrow, + .anims = sAnims_Select_Interface, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = SpriteCallbackDummy }; -static const struct SpriteTemplate gUnknown_08610608 = +static const struct SpriteTemplate sSpriteTemplate_Select_MenuHighlightLeft = { - .tileTag = TAG_TILE_66, - .paletteTag = TAG_PAL_66, - .oam = &gUnknown_0861048C, - .anims = gUnknown_086104FC, + .tileTag = GFXTAG_MENU_HIGHLIGHT_LEFT, + .paletteTag = PALTAG_INTERFACE, + .oam = &sOam_Select_MenuHighlight, + .anims = sAnims_Select_Interface, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = SpriteCallbackDummy }; -static const struct SpriteTemplate gUnknown_08610620 = +static const struct SpriteTemplate sSpriteTemplate_Select_MenuHighlightRight = { - .tileTag = TAG_TILE_67, - .paletteTag = TAG_PAL_66, - .oam = &gUnknown_0861048C, - .anims = gUnknown_086104FC, + .tileTag = GFXTAG_MENU_HIGHLIGHT_RIGHT, + .paletteTag = PALTAG_INTERFACE, + .oam = &sOam_Select_MenuHighlight, + .anims = sAnims_Select_Interface, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = SpriteCallbackDummy }; -static const struct SpriteTemplate gUnknown_08610638 = +static const struct SpriteTemplate sSpriteTemplate_Select_MonPicBgAnim = { - .tileTag = TAG_TILE_6D, - .paletteTag = TAG_PAL_67, - .oam = &gUnknown_08610494, - .anims = gUnknown_08610500, + .tileTag = GFXTAG_MON_PIC_BG_ANIM, + .paletteTag = PALTAG_MON_PIC_BG, + .oam = &sOam_Select_MonPicBgAnim, + .anims = sAnims_Select_MonPicBgAnim, .images = NULL, - .affineAnims = gUnknown_086105CC, + .affineAnims = sAffineAnims_Select_MonPicBgAnim, .callback = SpriteCallbackDummy }; -static const struct SpriteSheet gUnknown_08610650[] = +static const struct SpriteSheet sSwap_SpriteSheets[] = { - {gUnknown_0860F3BC, sizeof(gUnknown_0860F3BC), TAG_TILE_65}, - {gUnknown_0860F43C, sizeof(gUnknown_0860F43C), TAG_TILE_66}, - {gUnknown_0860F53C, sizeof(gUnknown_0860F53C), TAG_TILE_67}, - {gUnknown_0860F63C, sizeof(gUnknown_0860F63C), TAG_TILE_68}, - {gUnknown_0860F6BC, sizeof(gUnknown_0860F6BC), TAG_TILE_69}, - {gUnknown_0860F7BC, 0x100, TAG_TILE_6A}, - {gUnknown_0860F83C, sizeof(gUnknown_0860F83C), TAG_TILE_6B}, - {gUnknown_0860F93C, sizeof(gUnknown_0860F93C), TAG_TILE_6C}, - {gUnknown_0860FA3C, sizeof(gUnknown_0860FA3C), TAG_TILE_6D}, + {sArrow_Gfx, sizeof(sArrow_Gfx), GFXTAG_ARROW}, + {sMenuHighlightLeft_Gfx, sizeof(sMenuHighlightLeft_Gfx), GFXTAG_MENU_HIGHLIGHT_LEFT}, + {sMenuHighlightRight_Gfx, sizeof(sMenuHighlightRight_Gfx), GFXTAG_MENU_HIGHLIGHT_RIGHT}, + {sActionBoxLeft_Gfx, sizeof(sActionBoxLeft_Gfx), GFXTAG_ACTION_BOX_LEFT}, + {sActionBoxRight_Gfx, sizeof(sActionBoxRight_Gfx), GFXTAG_ACTION_BOX_RIGHT}, + {sActionHighlightLeft_Gfx, 0x100, GFXTAG_ACTION_HIGHLIGHT_LEFT}, + {sActionHighlightMiddle_Gfx, sizeof(sActionHighlightMiddle_Gfx), GFXTAG_ACTION_HIGHLIGHT_MIDDLE}, + {sActionHighlightRight_Gfx, sizeof(sActionHighlightRight_Gfx), GFXTAG_ACTION_HIGHLIGHT_RIGHT}, + {sMonPicBgAnim_Gfx, sizeof(sMonPicBgAnim_Gfx), GFXTAG_MON_PIC_BG_ANIM}, {}, }; -static const struct CompressedSpriteSheet gUnknown_086106A0[] = +static const struct CompressedSpriteSheet sSwap_BallGfx[] = { - {gPokeballSelection_Gfx, 0x800, TAG_TILE_64}, + {gPokeballSelection_Gfx, 0x800, GFXTAG_BALL}, {}, }; -static const struct SpritePalette gUnknown_086106B0[] = +static const struct SpritePalette sSwap_SpritePalettes[] = { - {gUnknown_0860F13C, TAG_PAL_BALL_GREY}, - {gUnknown_0860F15C, TAG_PAL_BALL_SELECTED}, - {gUnknown_0860F17C, TAG_PAL_66}, - {gUnknown_0861039C, TAG_PAL_67}, + {sPokeballGray_Pal, PALTAG_BALL_GRAY}, + {sPokeballSelected_Pal, PALTAG_BALL_SELECTED}, + {sInterface_Pal, PALTAG_INTERFACE}, + {sMonPicBg_Pal, PALTAG_MON_PIC_BG}, {}, }; -static const struct OamData gUnknown_086106D8 = +static const struct OamData sOam_Swap_Pokeball = { .y = 0, .affineMode = ST_OAM_AFFINE_OFF, @@ -645,7 +673,7 @@ static const struct OamData gUnknown_086106D8 = .affineParam = 0, }; -static const struct OamData gUnknown_086106E0 = +static const struct OamData sOam_Swap_Arrow = { .y = 0, .affineMode = ST_OAM_AFFINE_OFF, @@ -662,7 +690,7 @@ static const struct OamData gUnknown_086106E0 = .affineParam = 0, }; -static const struct OamData gUnknown_086106E8 = +static const struct OamData sOam_Swap_MenuHighlight = { .y = 0, .affineMode = ST_OAM_AFFINE_OFF, @@ -679,7 +707,7 @@ static const struct OamData gUnknown_086106E8 = .affineParam = 0, }; -static const struct OamData gUnknown_086106F0 = +static const struct OamData sOam_Swap_MonPicBgAnim = { .y = 0, .affineMode = ST_OAM_AFFINE_DOUBLE, @@ -696,25 +724,25 @@ static const struct OamData gUnknown_086106F0 = .affineParam = 1, }; -static const union AnimCmd gUnknown_086106F8[] = +static const union AnimCmd sAnim_Swap_Interface[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -static const union AnimCmd gUnknown_08610700[] = +static const union AnimCmd sAnim_Swap_MonPicBgAnim[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; -static const union AnimCmd gUnknown_08610708[] = +static const union AnimCmd sAnim_Swap_Pokeball_Still[] = { ANIMCMD_FRAME(0, 30), ANIMCMD_END, }; -static const union AnimCmd gUnknown_08610710[] = +static const union AnimCmd sAnim_Swap_Pokeball_Moving[] = { ANIMCMD_FRAME(16, 4), ANIMCMD_FRAME(0, 4), @@ -736,20 +764,20 @@ static const union AnimCmd gUnknown_08610710[] = ANIMCMD_END, }; -static const union AnimCmd * const gUnknown_08610758[] = +static const union AnimCmd * const sAnims_Swap_Interface[] = { - gUnknown_086106F8, + sAnim_Swap_Interface, }; -static const union AnimCmd * const gUnknown_0861075C[] = +static const union AnimCmd * const sAnims_Swap_MonPicBgAnim[] = { - gUnknown_08610700, + sAnim_Swap_MonPicBgAnim, }; -static const union AnimCmd * const gUnknown_08610760[] = +static const union AnimCmd * const sAnims_Swap_Pokeball[] = { - gUnknown_08610708, - gUnknown_08610710, + sAnim_Swap_Pokeball_Still, + sAnim_Swap_Pokeball_Moving, }; static const union AffineAnimCmd gUnknown_08610768[] = @@ -788,73 +816,73 @@ static const union AffineAnimCmd gUnknown_08610818[] = AFFINEANIMCMD_END, }; -static const union AffineAnimCmd * const gUnknown_08610828[] = +static const union AffineAnimCmd * const sAffineAnims_Swap_MonPicBgAnim[] = { gUnknown_08610768, gUnknown_086107C8, gUnknown_08610818, }; -static const struct SpriteTemplate gUnknown_08610834 = +static const struct SpriteTemplate sSpriteTemplate_Swap_Pokeball = { - .tileTag = TAG_TILE_64, - .paletteTag = TAG_PAL_BALL_GREY, - .oam = &gUnknown_086106D8, - .anims = gUnknown_08610760, + .tileTag = GFXTAG_BALL, + .paletteTag = PALTAG_BALL_GRAY, + .oam = &sOam_Swap_Pokeball, + .anims = sAnims_Swap_Pokeball, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_819A44C + .callback = SpriteCB_Pokeball }; -static const struct SpriteTemplate gUnknown_0861084C = +static const struct SpriteTemplate sSpriteTemplate_Swap_Arrow = { - .tileTag = TAG_TILE_65, - .paletteTag = TAG_PAL_66, - .oam = &gUnknown_086106E0, - .anims = gUnknown_08610758, + .tileTag = GFXTAG_ARROW, + .paletteTag = PALTAG_INTERFACE, + .oam = &sOam_Swap_Arrow, + .anims = sAnims_Swap_Interface, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = SpriteCallbackDummy }; -static const struct SpriteTemplate gUnknown_08610864 = +static const struct SpriteTemplate sSpriteTemplate_Swap_MenuHighlightLeft = { - .tileTag = TAG_TILE_66, - .paletteTag = TAG_PAL_66, - .oam = &gUnknown_086106E8, - .anims = gUnknown_08610758, + .tileTag = GFXTAG_MENU_HIGHLIGHT_LEFT, + .paletteTag = PALTAG_INTERFACE, + .oam = &sOam_Swap_MenuHighlight, + .anims = sAnims_Swap_Interface, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = SpriteCallbackDummy }; -static const struct SpriteTemplate gUnknown_0861087C = +static const struct SpriteTemplate sSpriteTemplate_Swap_MenuHighlightRight = { - .tileTag = TAG_TILE_67, - .paletteTag = TAG_PAL_66, - .oam = &gUnknown_086106E8, - .anims = gUnknown_08610758, + .tileTag = GFXTAG_MENU_HIGHLIGHT_RIGHT, + .paletteTag = PALTAG_INTERFACE, + .oam = &sOam_Swap_MenuHighlight, + .anims = sAnims_Swap_Interface, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = SpriteCallbackDummy }; -static const struct SpriteTemplate gUnknown_08610894 = +static const struct SpriteTemplate sSpriteTemplate_Swap_MonPicBgAnim = { - .tileTag = TAG_TILE_6D, - .paletteTag = TAG_PAL_67, - .oam = &gUnknown_086106F0, - .anims = gUnknown_0861075C, + .tileTag = GFXTAG_MON_PIC_BG_ANIM, + .paletteTag = PALTAG_MON_PIC_BG, + .oam = &sOam_Swap_MonPicBgAnim, + .anims = sAnims_Swap_MonPicBgAnim, .images = NULL, - .affineAnims = gUnknown_08610828, + .affineAnims = sAffineAnims_Swap_MonPicBgAnim, .callback = SpriteCallbackDummy }; void static (* const sSwap_MenuOptionFuncs[])(u8 taskId) = { - sub_819F114, - sub_819F0CC, - sub_819F134, + Swap_OptionSummary, + Swap_OptionSwap, + Swap_OptionRechoose, }; static const struct BgTemplate sSwap_BgTemplates[4] = @@ -897,9 +925,21 @@ static const struct BgTemplate sSwap_BgTemplates[4] = }, }; +enum { + SWAP_WIN_TITLE, + SWAP_WIN_SPECIES, + SWAP_WIN_INFO, + SWAP_WIN_OPTIONS, + SWAP_WIN_YES_NO, + SWAP_WIN_ACTION_FADE, // Used for action text fading out during screen transition + SWAP_WIN_UNUSED, + SWAP_WIN_SPECIES_AT_FADE, // Used to print species name stopped at current fade level + SWAP_WIN_MON_CATEGORY, +}; + static const struct WindowTemplate sSwap_WindowTemplates[] = { - { + [SWAP_WIN_TITLE] = { .bg = 0, .tilemapLeft = 0, .tilemapTop = 2, @@ -908,7 +948,7 @@ static const struct WindowTemplate sSwap_WindowTemplates[] = .paletteNum = 15, .baseBlock = 0x0001, }, - { + [SWAP_WIN_SPECIES] = { .bg = 2, .tilemapLeft = 19, .tilemapTop = 2, @@ -917,7 +957,7 @@ static const struct WindowTemplate sSwap_WindowTemplates[] = .paletteNum = 14, .baseBlock = 0x0019, }, - { + [SWAP_WIN_INFO] = { .bg = 0, .tilemapLeft = 0, .tilemapTop = 15, @@ -926,7 +966,7 @@ static const struct WindowTemplate sSwap_WindowTemplates[] = .paletteNum = 15, .baseBlock = 0x002f, }, - { + [SWAP_WIN_OPTIONS] = { .bg = 0, .tilemapLeft = 21, .tilemapTop = 14, @@ -935,7 +975,7 @@ static const struct WindowTemplate sSwap_WindowTemplates[] = .paletteNum = 15, .baseBlock = 0x006b, }, - { + [SWAP_WIN_YES_NO] = { .bg = 0, .tilemapLeft = 22, .tilemapTop = 14, @@ -944,7 +984,7 @@ static const struct WindowTemplate sSwap_WindowTemplates[] = .paletteNum = 15, .baseBlock = 0x00a1, }, - { + [SWAP_WIN_ACTION_FADE] = { .bg = 2, .tilemapLeft = 21, .tilemapTop = 15, @@ -953,7 +993,7 @@ static const struct WindowTemplate sSwap_WindowTemplates[] = .paletteNum = 14, .baseBlock = 0x006b, }, - { + [SWAP_WIN_UNUSED] = { .bg = 2, .tilemapLeft = 10, .tilemapTop = 2, @@ -962,7 +1002,7 @@ static const struct WindowTemplate sSwap_WindowTemplates[] = .paletteNum = 14, .baseBlock = 0x00c1, }, - { + [SWAP_WIN_SPECIES_AT_FADE] = { .bg = 0, .tilemapLeft = 19, .tilemapTop = 2, @@ -971,7 +1011,7 @@ static const struct WindowTemplate sSwap_WindowTemplates[] = .paletteNum = 15, .baseBlock = 0x00c9, }, - { + [SWAP_WIN_MON_CATEGORY] = { .bg = 0, .tilemapLeft = 15, .tilemapTop = 0, @@ -983,64 +1023,36 @@ static const struct WindowTemplate sSwap_WindowTemplates[] = DUMMY_WIN_TEMPLATE, }; -static const u16 gUnknown_08610918[] = {RGB_BLACK, RGB_BLACK, RGB_WHITE, RGB_BLACK, RGB_RED}; // Palette. +static const u16 sSwapText_Pal[] = INCBIN_U16("graphics/battle_frontier/factory_screen/text.gbapal"); // Identical to sSelectText_Pal static const u8 sSwapMenuOptionsTextColors[] = {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_DARK_GREY, TEXT_COLOR_TRANSPARENT}; static const u8 sSwapSpeciesNameTextColors[] = {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_RED, TEXT_COLOR_TRANSPARENT}; -static const struct SwapActionIdAndFunc sSwap_PlayerScreenActions[] = +#define SWAPACTION_MON 1 +#define SWAPACTION_PKMN_FOR_SWAP 2 +#define SWAPACTION_CANCEL 3 + +static const struct SwapScreenAction sSwap_PlayerScreenActions[] = { - {1, Swap_ActionMon}, - {1, Swap_ActionMon}, - {1, Swap_ActionMon}, - {3, Swap_ActionCancel}, + {.id = SWAPACTION_MON, .func = Swap_ActionMon}, + {.id = SWAPACTION_MON, .func = Swap_ActionMon}, + {.id = SWAPACTION_MON, .func = Swap_ActionMon}, + {.id = SWAPACTION_CANCEL, .func = Swap_ActionCancel}, }; -static const struct SwapActionIdAndFunc sSwap_EnemyScreenActions[] = +static const struct SwapScreenAction sSwap_EnemyScreenActions[] = { - {1, Swap_ActionMon}, - {1, Swap_ActionMon}, - {1, Swap_ActionMon}, - {2, Swap_ActionPkmnForSwap}, - {3, Swap_ActionCancel}, + {.id = SWAPACTION_MON, .func = Swap_ActionMon}, + {.id = SWAPACTION_MON, .func = Swap_ActionMon}, + {.id = SWAPACTION_MON, .func = Swap_ActionMon}, + {.id = SWAPACTION_PKMN_FOR_SWAP, .func = Swap_ActionPkmnForSwap}, + {.id = SWAPACTION_CANCEL, .func = Swap_ActionCancel}, }; -// gfx -extern const u8 gFrontierFactorySelectMenu_Gfx[]; -extern const u8 gFrontierFactorySelectMenu_Tilemap[]; -extern const u16 gFrontierFactorySelectMenu_Pal[]; - -// text -extern const u8 gText_RentalPkmn2[]; -extern const u8 gText_SelectFirstPkmn[]; -extern const u8 gText_SelectSecondPkmn[]; -extern const u8 gText_SelectThirdPkmn[]; -extern const u8 gText_TheseThreePkmnOkay[]; -extern const u8 gText_CantSelectSamePkmn[]; -extern const u8 gText_Summary[]; -extern const u8 gText_Rechoose[]; -extern const u8 gText_Deselect[]; -extern const u8 gText_Rent[]; -extern const u8 gText_Others2[]; -extern const u8 gText_Yes2[]; -extern const u8 gText_Yes3[]; -extern const u8 gText_No2[]; -extern const u8 gText_No3[]; -extern const u8 gText_QuitSwapping[]; -extern const u8 gText_AcceptThisPkmn[]; -extern const u8 gText_SelectPkmnToAccept[]; -extern const u8 gText_SelectPkmnToSwap[]; -extern const u8 gText_PkmnSwap[]; -extern const u8 gText_Swap[]; -extern const u8 gText_Summary2[]; -extern const u8 gText_PkmnForSwap[]; -extern const u8 gText_SamePkmnInPartyAlready[]; -extern const u8 gText_Cancel3[]; - -// code -static void sub_819A44C(struct Sprite *sprite) +static void SpriteCB_Pokeball(struct Sprite *sprite) { - if (sprite->oam.paletteNum == IndexOfSpritePaletteTag(TAG_PAL_BALL_SELECTED)) + if (sprite->oam.paletteNum == IndexOfSpritePaletteTag(PALTAG_BALL_SELECTED)) { + // Pokeball selected, do rocking animation if (sprite->animEnded) { if (sprite->data[0] != 0) @@ -1064,11 +1076,12 @@ static void sub_819A44C(struct Sprite *sprite) } else { + // Pokeball not selected, remain still StartSpriteAnimIfDifferent(sprite, 0); } } -static void Select_CB2(void) +static void CB2_SelectScreen(void) { AnimateSprites(); BuildOamBuffer(); @@ -1077,7 +1090,7 @@ static void Select_CB2(void) RunTasks(); } -static void Select_VblankCb(void) +static void VBlankCB_SelectScreen(void) { LoadOam(); ProcessSpriteCopyRequests(); @@ -1090,6 +1103,27 @@ void DoBattleFactorySelectScreen(void) SetMainCallback2(CB2_InitSelectScreen); } +// Main select states +// States for the main tasks of the Select_ functions after initialization, including: +// Select_Task_OpenSummaryScreen, Select_Task_HandleYesNo, Select_Task_HandleMenu, and Select_Task_HandleChooseMons +// Unnecessarily complicated, could easily have just kept states numbered in each task always starting at 0 +// There's only one instance (Select_Task_HandleChooseMons) where a non-initial case is used +// Select_Task_Exit has its own straightforward states +#define STATE_CHOOSE_MONS_INIT 0 +#define STATE_CHOOSE_MONS_HANDLE_INPUT 1 +#define STATE_MENU_INIT 2 +#define STATE_MENU_HANDLE_INPUT 3 +#define STATE_YESNO_SHOW_OPTIONS 4 +#define STATE_YESNO_HANDLE_INPUT 5 +#define STATE_SUMMARY_FADE 6 +#define STATE_SUMMARY_CLEAN 7 +#define STATE_SUMMARY_SHOW 8 +#define STATE_MENU_SHOW_OPTIONS 9 +#define STATE_YESNO_SHOW_MONS 10 +#define STATE_CHOOSE_MONS_INVALID 11 +#define STATE_MENU_REINIT 12 +#define STATE_MENU_RESHOW 13 + static void CB2_InitSelectScreen(void) { u8 taskId; @@ -1110,9 +1144,9 @@ static void CB2_InitSelectScreen(void) break; case 1: sSelectMenuTilesetBuffer = Alloc(0x440); - sSelectMonCardBgTilesetBuffer = AllocZeroed(0x440); - sSelectMenuTilemapBuffer = Alloc(0x800); - sSelectMonCardBgTilemapBuffer = AllocZeroed(0x800); + sSelectMonPicBgTilesetBuffer = AllocZeroed(0x440); + sSelectMenuTilemapBuffer = Alloc(BG_SCREEN_SIZE); + sSelectMonPicBgTilemapBuffer = AllocZeroed(BG_SCREEN_SIZE); ChangeBgX(0, 0, 0); ChangeBgY(0, 0, 0); ChangeBgX(1, 0, 0); @@ -1137,45 +1171,45 @@ static void CB2_InitSelectScreen(void) ResetTasks(); FreeAllSpritePalettes(); CpuCopy16(gFrontierFactorySelectMenu_Gfx, sSelectMenuTilesetBuffer, 0x440); - CpuCopy16(gUnknown_0861033C, sSelectMonCardBgTilesetBuffer, 0x60); + CpuCopy16(sMonPicBg_Gfx, sSelectMonPicBgTilesetBuffer, 0x60); LoadBgTiles(1, sSelectMenuTilesetBuffer, 0x440, 0); - LoadBgTiles(3, sSelectMonCardBgTilesetBuffer, 0x60, 0); - CpuCopy16(gFrontierFactorySelectMenu_Tilemap, sSelectMenuTilemapBuffer, 0x800); - LoadBgTilemap(1, sSelectMenuTilemapBuffer, 0x800, 0); + LoadBgTiles(3, sSelectMonPicBgTilesetBuffer, 0x60, 0); + CpuCopy16(gFrontierFactorySelectMenu_Tilemap, sSelectMenuTilemapBuffer, BG_SCREEN_SIZE); + LoadBgTilemap(1, sSelectMenuTilemapBuffer, BG_SCREEN_SIZE, 0); LoadPalette(gFrontierFactorySelectMenu_Pal, 0, 0x40); - LoadPalette(gUnknown_0861046C, 0xF0, 8); - LoadPalette(gUnknown_0861046C, 0xE0, 10); - #if MODERN + LoadPalette(sSelectText_Pal, 0xF0, 8); + LoadPalette(sSelectText_Pal, 0xE0, 10); +#ifdef UBFIX if (sFactorySelectScreen && sFactorySelectScreen->fromSummaryScreen) - #else +#else if (sFactorySelectScreen->fromSummaryScreen == TRUE) - #endif - gPlttBufferUnfaded[228] = sFactorySelectScreen->unk2A4; - LoadPalette(gUnknown_0861039C, 0x20, 4); +#endif + gPlttBufferUnfaded[228] = sFactorySelectScreen->speciesNameColorBackup; + LoadPalette(sMonPicBg_Pal, 0x20, 4); gMain.state++; break; case 3: - SetBgTilemapBuffer(3, sSelectMonCardBgTilemapBuffer); - CopyToBgTilemapBufferRect(3, gUnknown_0861023C, 11, 4, 8, 8); - CopyToBgTilemapBufferRect(3, gUnknown_0861023C, 2, 4, 8, 8); - CopyToBgTilemapBufferRect(3, gUnknown_0861023C, 20, 4, 8, 8); + SetBgTilemapBuffer(3, sSelectMonPicBgTilemapBuffer); + CopyToBgTilemapBufferRect(3, sMonPicBg_Tilemap, 11, 4, 8, 8); + CopyToBgTilemapBufferRect(3, sMonPicBg_Tilemap, 2, 4, 8, 8); + CopyToBgTilemapBufferRect(3, sMonPicBg_Tilemap, 20, 4, 8, 8); CopyBgTilemapBufferToVram(3); gMain.state++; break; case 4: - LoadSpritePalettes(gUnknown_086103F4); - LoadSpriteSheets(gUnknown_086103BC); - LoadCompressedSpriteSheet(gUnknown_086103E4); + LoadSpritePalettes(sSelect_SpritePalettes); + LoadSpriteSheets(sSelect_SpriteSheets); + LoadCompressedSpriteSheet(sSelect_BallGfx); ShowBg(0); ShowBg(1); - SetVBlankCallback(Select_VblankCb); - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, RGB_BLACK); + SetVBlankCallback(VBlankCB_SelectScreen); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK); SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_ON | DISPCNT_BG0_ON | DISPCNT_BG1_ON | DISPCNT_OBJ_1D_MAP); - #if MODERN +#ifdef UBFIX if (sFactorySelectScreen && sFactorySelectScreen->fromSummaryScreen) - #else +#else if (sFactorySelectScreen->fromSummaryScreen == TRUE) - #endif +#endif { Select_SetWinRegs(88, 152, 32, 96); ShowBg(3); @@ -1189,54 +1223,54 @@ static void CB2_InitSelectScreen(void) gMain.state++; break; case 5: - #if MODERN +#ifdef UBFIX if (sFactorySelectScreen && sFactorySelectScreen->fromSummaryScreen) - #else +#else if (sFactorySelectScreen->fromSummaryScreen == TRUE) - #endif +#endif sFactorySelectScreen->cursorPos = gLastViewedMonIndex; Select_InitMonsData(); Select_InitAllSprites(); if (sFactorySelectScreen->fromSummaryScreen == TRUE) - Select_ShowSummaryMonSprite(); + Select_ReshowMonSprite(); gMain.state++; break; case 6: Select_PrintSelectMonString(); - PutWindowTilemap(2); + PutWindowTilemap(SELECT_WIN_INFO); gMain.state++; break; case 7: Select_PrintMonCategory(); - PutWindowTilemap(5); + PutWindowTilemap(SELECT_WIN_MON_CATEGORY); gMain.state++; break; case 8: Select_PrintMonSpecies(); - PutWindowTilemap(1); + PutWindowTilemap(SELECT_WIN_SPECIES); gMain.state++; break; case 9: Select_PrintRentalPkmnString(); - PutWindowTilemap(0); + PutWindowTilemap(SELECT_WIN_TITLE); gMain.state++; break; case 10: - sFactorySelectScreen->fadeSpeciesNameTaskId = CreateTask(Task_SelectFadeSpeciesName, 0); + sFactorySelectScreen->fadeSpeciesNameTaskId = CreateTask(Select_Task_FadeSpeciesName, 0); if (!sFactorySelectScreen->fromSummaryScreen) { - gTasks[sFactorySelectScreen->fadeSpeciesNameTaskId].data[0] = 0; - taskId = CreateTask(Task_HandleSelectionScreenChooseMons, 0); - gTasks[taskId].data[0] = 0; + gTasks[sFactorySelectScreen->fadeSpeciesNameTaskId].tState = FADESTATE_INIT; + taskId = CreateTask(Select_Task_HandleChooseMons, 0); + gTasks[taskId].tState = STATE_CHOOSE_MONS_INIT; } else { - gTasks[sFactorySelectScreen->fadeSpeciesNameTaskId].data[0] = 1; - sFactorySelectScreen->unk2A2 = FALSE; - taskId = CreateTask(Task_HandleSelectionScreenMenu, 0); - gTasks[taskId].data[0] = 13; + gTasks[sFactorySelectScreen->fadeSpeciesNameTaskId].tState = FADESTATE_RUN; + sFactorySelectScreen->fadeSpeciesNameActive = FALSE; + taskId = CreateTask(Select_Task_HandleMenu, 0); + gTasks[taskId].tState = STATE_MENU_RESHOW; } - SetMainCallback2(Select_CB2); + SetMainCallback2(CB2_SelectScreen); break; } } @@ -1258,7 +1292,7 @@ static void Select_InitMonsData(void) if (gSaveBlock2Ptr->frontier.lvlMode != FRONTIER_LVL_TENT) CreateFrontierFactorySelectableMons(0); else - CreateTentFactorySelectableMons(0); + CreateSlateportTentSelectableMons(0); } static void Select_InitAllSprites(void) @@ -1268,15 +1302,15 @@ static void Select_InitAllSprites(void) for (i = 0; i < SELECTABLE_MONS_COUNT; i++) { - sFactorySelectScreen->mons[i].spriteId = CreateSprite(&gUnknown_086105D8, (35 * i) + 32, 64, 1); - gSprites[sFactorySelectScreen->mons[i].spriteId].data[0] = 0; + sFactorySelectScreen->mons[i].ballSpriteId = CreateSprite(&sSpriteTemplate_Select_Pokeball, (35 * i) + 32, 64, 1); + gSprites[sFactorySelectScreen->mons[i].ballSpriteId].data[0] = 0; Select_SetBallSpritePaletteNum(i); } cursorPos = sFactorySelectScreen->cursorPos; - x = gSprites[sFactorySelectScreen->mons[cursorPos].spriteId].pos1.x; - sFactorySelectScreen->cursorSpriteId = CreateSprite(&gUnknown_086105F0, x, 88, 0); - sFactorySelectScreen->menuCursor1SpriteId = CreateSprite(&gUnknown_08610608, 176, 112, 0); - sFactorySelectScreen->menuCursor2SpriteId = CreateSprite(&gUnknown_08610620, 176, 144, 0); + x = gSprites[sFactorySelectScreen->mons[cursorPos].ballSpriteId].pos1.x; + sFactorySelectScreen->cursorSpriteId = CreateSprite(&sSpriteTemplate_Select_Arrow, x, 88, 0); + sFactorySelectScreen->menuCursor1SpriteId = CreateSprite(&sSpriteTemplate_Select_MenuHighlightLeft, 176, 112, 0); + sFactorySelectScreen->menuCursor2SpriteId = CreateSprite(&sSpriteTemplate_Select_MenuHighlightRight, 176, 144, 0); gSprites[sFactorySelectScreen->menuCursor1SpriteId].invisible = TRUE; gSprites[sFactorySelectScreen->menuCursor2SpriteId].invisible = TRUE; @@ -1292,7 +1326,7 @@ static void Select_DestroyAllSprites(void) u8 i; for (i = 0; i < SELECTABLE_MONS_COUNT; i++) - DestroySprite(&gSprites[sFactorySelectScreen->mons[i].spriteId]); + DestroySprite(&gSprites[sFactorySelectScreen->mons[i].ballSpriteId]); DestroySprite(&gSprites[sFactorySelectScreen->cursorSpriteId]); DestroySprite(&gSprites[sFactorySelectScreen->menuCursor1SpriteId]); @@ -1318,14 +1352,14 @@ static void Select_UpdateBallCursorPosition(s8 direction) } cursorPos = sFactorySelectScreen->cursorPos; - gSprites[sFactorySelectScreen->cursorSpriteId].pos1.x = gSprites[sFactorySelectScreen->mons[cursorPos].spriteId].pos1.x; + gSprites[sFactorySelectScreen->cursorSpriteId].pos1.x = gSprites[sFactorySelectScreen->mons[cursorPos].ballSpriteId].pos1.x; } static void Select_UpdateMenuCursorPosition(s8 direction) { if (direction > 0) // Move cursor down. { - if (sFactorySelectScreen->menuCursorPos != MENU_OPTIONS_COUNT - 1) + if (sFactorySelectScreen->menuCursorPos != ARRAY_COUNT(sSelect_MenuOptionFuncs) - 1) sFactorySelectScreen->menuCursorPos++; else sFactorySelectScreen->menuCursorPos = 0; @@ -1335,7 +1369,7 @@ static void Select_UpdateMenuCursorPosition(s8 direction) if (sFactorySelectScreen->menuCursorPos != 0) sFactorySelectScreen->menuCursorPos--; else - sFactorySelectScreen->menuCursorPos = MENU_OPTIONS_COUNT - 1; + sFactorySelectScreen->menuCursorPos = ARRAY_COUNT(sSelect_MenuOptionFuncs) - 1; } gSprites[sFactorySelectScreen->menuCursor1SpriteId].pos1.y = (sFactorySelectScreen->menuCursorPos * 16) + 112; @@ -1369,12 +1403,13 @@ static void Select_HandleMonSelectionChange(void) u8 cursorPos = sFactorySelectScreen->cursorPos; if (sFactorySelectScreen->mons[cursorPos].selectedId) // Deselect a mon. { - paletteNum = IndexOfSpritePaletteTag(TAG_PAL_BALL_GREY); - if (sFactorySelectScreen->selectingMonsState == 3 && sFactorySelectScreen->mons[cursorPos].selectedId == 1) + paletteNum = IndexOfSpritePaletteTag(PALTAG_BALL_GRAY); + if (sFactorySelectScreen->selectingMonsState == FRONTIER_PARTY_SIZE + && sFactorySelectScreen->mons[cursorPos].selectedId == 1) { for (i = 0; i < SELECTABLE_MONS_COUNT; i++) { - if (sFactorySelectScreen->mons[i].selectedId == 2) + if (sFactorySelectScreen->mons[i].selectedId == FRONTIER_PARTY_SIZE - 1) break; } if (i == SELECTABLE_MONS_COUNT) @@ -1387,12 +1422,12 @@ static void Select_HandleMonSelectionChange(void) } else // Select a mon. { - paletteNum = IndexOfSpritePaletteTag(TAG_PAL_BALL_SELECTED); + paletteNum = IndexOfSpritePaletteTag(PALTAG_BALL_SELECTED); sFactorySelectScreen->mons[cursorPos].selectedId = sFactorySelectScreen->selectingMonsState; sFactorySelectScreen->selectingMonsState++; } - gSprites[sFactorySelectScreen->mons[cursorPos].spriteId].oam.paletteNum = paletteNum; + gSprites[sFactorySelectScreen->mons[cursorPos].ballSpriteId].oam.paletteNum = paletteNum; } static void Select_SetBallSpritePaletteNum(u8 id) @@ -1400,191 +1435,196 @@ static void Select_SetBallSpritePaletteNum(u8 id) u8 palNum; if (sFactorySelectScreen->mons[id].selectedId) - palNum = IndexOfSpritePaletteTag(TAG_PAL_BALL_SELECTED); + palNum = IndexOfSpritePaletteTag(PALTAG_BALL_SELECTED); else - palNum = IndexOfSpritePaletteTag(TAG_PAL_BALL_GREY); + palNum = IndexOfSpritePaletteTag(PALTAG_BALL_GRAY); - gSprites[sFactorySelectScreen->mons[id].spriteId].oam.paletteNum = palNum; + gSprites[sFactorySelectScreen->mons[id].ballSpriteId].oam.paletteNum = palNum; } -static void Task_FromSelectScreenToSummaryScreen(u8 taskId) +static void Select_Task_OpenSummaryScreen(u8 taskId) { u8 i; u8 currMonId; - switch (gTasks[taskId].data[0]) + switch (gTasks[taskId].tState) { - case 6: + case STATE_SUMMARY_FADE: gPlttBufferUnfaded[228] = gPlttBufferFaded[228]; - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK); - gTasks[taskId].data[0] = 7; + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK); + gTasks[taskId].tState = STATE_SUMMARY_CLEAN; break; - case 7: + case STATE_SUMMARY_CLEAN: if (!gPaletteFade.active) { DestroyTask(sFactorySelectScreen->fadeSpeciesNameTaskId); - sub_819F444(sFactorySelectScreen->unk294[1], &sFactorySelectScreen->unk2A0); + HideMonPic(sFactorySelectScreen->monPics[1], &sFactorySelectScreen->monPicAnimating); Select_DestroyAllSprites(); FREE_AND_SET_NULL(sSelectMenuTilesetBuffer); - FREE_AND_SET_NULL(sSelectMonCardBgTilesetBuffer); + FREE_AND_SET_NULL(sSelectMonPicBgTilesetBuffer); FREE_AND_SET_NULL(sSelectMenuTilemapBuffer); - FREE_AND_SET_NULL(sSelectMonCardBgTilemapBuffer); + FREE_AND_SET_NULL(sSelectMonPicBgTilemapBuffer); FreeAllWindowBuffers(); - gTasks[taskId].data[0] = 8; + gTasks[taskId].tState = STATE_SUMMARY_SHOW; } break; - case 8: - sFactorySelectScreen->unk2A4 = gPlttBufferUnfaded[228]; + case STATE_SUMMARY_SHOW: + sFactorySelectScreen->speciesNameColorBackup = gPlttBufferUnfaded[228]; DestroyTask(taskId); sFactorySelectScreen->fromSummaryScreen = TRUE; currMonId = sFactorySelectScreen->cursorPos; sFactorySelectMons = AllocZeroed(sizeof(struct Pokemon) * SELECTABLE_MONS_COUNT); for (i = 0; i < SELECTABLE_MONS_COUNT; i++) sFactorySelectMons[i] = sFactorySelectScreen->mons[i].monData; - ShowPokemonSummaryScreen(1, sFactorySelectMons, currMonId, SELECTABLE_MONS_COUNT - 1, CB2_InitSelectScreen); + ShowPokemonSummaryScreen(PSS_MODE_LOCK_MOVES, sFactorySelectMons, currMonId, SELECTABLE_MONS_COUNT - 1, CB2_InitSelectScreen); break; } } -static void Task_CloseSelectionScreen(u8 taskId) +static void Select_Task_Exit(u8 taskId) { - if (sFactorySelectScreen->unk2A0 != TRUE) + if (sFactorySelectScreen->monPicAnimating == TRUE) + return; + + switch (gTasks[taskId].tState) { - switch (gTasks[taskId].data[0]) + case 0: + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK); + gTasks[taskId].tState++; + break; + case 1: + if (!UpdatePaletteFade()) { - case 0: - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK); - gTasks[taskId].data[0]++; - break; - case 1: - if (!UpdatePaletteFade()) - { - Select_CopyMonsToPlayerParty(); - DestroyTask(sFactorySelectScreen->fadeSpeciesNameTaskId); - Select_DestroyAllSprites(); - FREE_AND_SET_NULL(sSelectMenuTilesetBuffer); - FREE_AND_SET_NULL(sSelectMenuTilemapBuffer); - FREE_AND_SET_NULL(sSelectMonCardBgTilemapBuffer); - FREE_AND_SET_NULL(sFactorySelectScreen); - FreeAllWindowBuffers(); - SetMainCallback2(CB2_ReturnToFieldContinueScript); - DestroyTask(taskId); - } - break; + Select_CopyMonsToPlayerParty(); + DestroyTask(sFactorySelectScreen->fadeSpeciesNameTaskId); + Select_DestroyAllSprites(); + FREE_AND_SET_NULL(sSelectMenuTilesetBuffer); + FREE_AND_SET_NULL(sSelectMenuTilemapBuffer); + FREE_AND_SET_NULL(sSelectMonPicBgTilemapBuffer); + FREE_AND_SET_NULL(sFactorySelectScreen); + FreeAllWindowBuffers(); + SetMainCallback2(CB2_ReturnToFieldContinueScript); + DestroyTask(taskId); } + break; } } -static void Task_HandleSelectionScreenYesNo(u8 taskId) +// Handles the Yes/No prompt when confirming the 3 selected rental pokemon +static void Select_Task_HandleYesNo(u8 taskId) { - if (sFactorySelectScreen->unk2A0 != TRUE) + if (sFactorySelectScreen->monPicAnimating == TRUE) + return; + + switch (gTasks[taskId].tState) { - switch (gTasks[taskId].data[0]) + case STATE_YESNO_SHOW_MONS: + Select_ShowChosenMons(); + gTasks[taskId].tState = STATE_YESNO_SHOW_OPTIONS; + break; + case STATE_YESNO_SHOW_OPTIONS: + Select_ShowYesNoOptions(); + gTasks[taskId].tState = STATE_YESNO_HANDLE_INPUT; + break; + case STATE_YESNO_HANDLE_INPUT: + if (JOY_NEW(A_BUTTON)) { - case 10: - sub_819C4B4(); - gTasks[taskId].data[0] = 4; - break; - case 4: - Select_ShowYesNoOptions(); - gTasks[taskId].data[0] = 5; - break; - case 5: - if (JOY_NEW(A_BUTTON)) + PlaySE(SE_SELECT); + if (sFactorySelectScreen->yesNoCursorPos == 0) { - PlaySE(SE_SELECT); - if (sFactorySelectScreen->yesNoCursorPos == 0) - { - sub_819C568(); - gTasks[taskId].data[0] = 0; - gTasks[taskId].func = Task_CloseSelectionScreen; - } - else - { - sub_819B958(4); - sub_819BC9C(); - sFactorySelectScreen->unk2A2 = TRUE; - gTasks[taskId].data[0] = 1; - gTasks[taskId].func = Task_HandleSelectionScreenChooseMons; - } + // Selected Yes, confirmed selected pokemon + Select_HideChosenMons(); + gTasks[taskId].tState = 0; + gTasks[taskId].func = Select_Task_Exit; } - else if (JOY_NEW(B_BUTTON)) + else { - PlaySE(SE_SELECT); - sub_819B958(4); - sub_819BC9C(); - sFactorySelectScreen->unk2A2 = TRUE; - gTasks[taskId].data[0] = 1; - gTasks[taskId].func = Task_HandleSelectionScreenChooseMons; + // Selected No, continue choosing pokemon + Select_ErasePopupMenu(SELECT_WIN_YES_NO); + Select_DeclineChosenMons(); + sFactorySelectScreen->fadeSpeciesNameActive = TRUE; + gTasks[taskId].tState = STATE_CHOOSE_MONS_HANDLE_INPUT; + gTasks[taskId].func = Select_Task_HandleChooseMons; } - else if (JOY_REPEAT(DPAD_UP)) - { - PlaySE(SE_SELECT); - Select_UpdateYesNoCursorPosition(-1); - } - else if (JOY_REPEAT(DPAD_DOWN)) - { - PlaySE(SE_SELECT); - Select_UpdateYesNoCursorPosition(1); - } - break; } + else if (JOY_NEW(B_BUTTON)) + { + // Pressed B, Continue choosing pokemon + PlaySE(SE_SELECT); + Select_ErasePopupMenu(SELECT_WIN_YES_NO); + Select_DeclineChosenMons(); + sFactorySelectScreen->fadeSpeciesNameActive = TRUE; + gTasks[taskId].tState = STATE_CHOOSE_MONS_HANDLE_INPUT; + gTasks[taskId].func = Select_Task_HandleChooseMons; + } + else if (JOY_REPEAT(DPAD_UP)) + { + PlaySE(SE_SELECT); + Select_UpdateYesNoCursorPosition(-1); + } + else if (JOY_REPEAT(DPAD_DOWN)) + { + PlaySE(SE_SELECT); + Select_UpdateYesNoCursorPosition(1); + } + break; } } -static void Task_HandleSelectionScreenMenu(u8 taskId) +// Handles the popup menu that shows when a pokemon is selected +static void Select_Task_HandleMenu(u8 taskId) { - switch (gTasks[taskId].data[0]) + switch (gTasks[taskId].tState) { - case 2: + case STATE_MENU_INIT: if (!sFactorySelectScreen->fromSummaryScreen) - sub_819F2B4(&sFactorySelectScreen->unk294[1].field1, &sFactorySelectScreen->unk2A0, FALSE); - gTasks[taskId].data[0] = 9; + OpenMonPic(&sFactorySelectScreen->monPics[1].bgSpriteId, &sFactorySelectScreen->monPicAnimating, FALSE); + gTasks[taskId].tState = STATE_MENU_SHOW_OPTIONS; break; - case 9: - if (sFactorySelectScreen->unk2A0 != TRUE) + case STATE_MENU_SHOW_OPTIONS: + if (sFactorySelectScreen->monPicAnimating != TRUE) { Select_ShowMenuOptions(); sFactorySelectScreen->fromSummaryScreen = FALSE; - gTasks[taskId].data[0] = 3; + gTasks[taskId].tState = STATE_MENU_HANDLE_INPUT; } break; - case 3: + case STATE_MENU_HANDLE_INPUT: if (JOY_NEW(A_BUTTON)) { u8 retVal; PlaySE(SE_SELECT); retVal = Select_RunMenuOptionFunc(); - if (retVal == 1) + if (retVal == SELECT_CONTINUE_CHOOSING) { - sFactorySelectScreen->unk2A2 = TRUE; - gTasks[taskId].data[0] = 1; - gTasks[taskId].func = Task_HandleSelectionScreenChooseMons; + sFactorySelectScreen->fadeSpeciesNameActive = TRUE; + gTasks[taskId].tState = STATE_CHOOSE_MONS_HANDLE_INPUT; + gTasks[taskId].func = Select_Task_HandleChooseMons; } - else if (retVal == 2) + else if (retVal == SELECT_CONFIRM_MONS) { - gTasks[taskId].data[0] = 10; - gTasks[taskId].func = Task_HandleSelectionScreenYesNo; + gTasks[taskId].tState = STATE_YESNO_SHOW_MONS; + gTasks[taskId].func = Select_Task_HandleYesNo; } - else if (retVal == 3) + else if (retVal == SELECT_INVALID_MON) { - gTasks[taskId].data[0] = 11; - gTasks[taskId].func = Task_HandleSelectionScreenChooseMons; + gTasks[taskId].tState = STATE_CHOOSE_MONS_INVALID; + gTasks[taskId].func = Select_Task_HandleChooseMons; } - else + else // SELECT_SUMMARY { - gTasks[taskId].data[0] = 6; - gTasks[taskId].func = Task_FromSelectScreenToSummaryScreen; + gTasks[taskId].tState = STATE_SUMMARY_FADE; + gTasks[taskId].func = Select_Task_OpenSummaryScreen; } } else if (JOY_NEW(B_BUTTON)) { PlaySE(SE_SELECT); - sub_819F3F8(sFactorySelectScreen->unk294[1], &sFactorySelectScreen->unk2A0, FALSE); - sub_819B958(3); - sFactorySelectScreen->unk2A2 = TRUE; - gTasks[taskId].data[0] = 1; - gTasks[taskId].func = Task_HandleSelectionScreenChooseMons; + CloseMonPic(sFactorySelectScreen->monPics[1], &sFactorySelectScreen->monPicAnimating, FALSE); + Select_ErasePopupMenu(SELECT_WIN_OPTIONS); + sFactorySelectScreen->fadeSpeciesNameActive = TRUE; + gTasks[taskId].tState = STATE_CHOOSE_MONS_HANDLE_INPUT; + gTasks[taskId].func = Select_Task_HandleChooseMons; } else if (JOY_REPEAT(DPAD_UP)) { @@ -1597,81 +1637,97 @@ static void Task_HandleSelectionScreenMenu(u8 taskId) Select_UpdateMenuCursorPosition(1); } break; - case 12: + case STATE_MENU_REINIT: if (!gPaletteFade.active) { if (sFactorySelectScreen->fromSummaryScreen == TRUE) { - gPlttBufferFaded[228] = sFactorySelectScreen->unk2A4; + gPlttBufferFaded[228] = sFactorySelectScreen->speciesNameColorBackup; gPlttBufferUnfaded[228] = gPlttBufferUnfaded[244]; } sFactorySelectScreen->fromSummaryScreen = FALSE; - gTasks[taskId].data[0] = 3; + gTasks[taskId].tState = STATE_MENU_HANDLE_INPUT; } break; - case 13: + case STATE_MENU_RESHOW: Select_ShowMenuOptions(); - gTasks[taskId].data[0] = 12; + gTasks[taskId].tState = STATE_MENU_REINIT; break; } } -static void Task_HandleSelectionScreenChooseMons(u8 taskId) +// Handles input on the main selection screen, when no popup menu is open +static void Select_Task_HandleChooseMons(u8 taskId) { - if (sFactorySelectScreen->unk2A0 != TRUE) + if (sFactorySelectScreen->monPicAnimating == TRUE) + return; + + switch (gTasks[taskId].tState) { - switch (gTasks[taskId].data[0]) + case STATE_CHOOSE_MONS_INIT: + if (!gPaletteFade.active) { - case 0: - if (!gPaletteFade.active) - { - gTasks[taskId].data[0] = 1; - sFactorySelectScreen->unk2A2 = TRUE; - } - break; - case 1: - if (JOY_NEW(A_BUTTON)) - { - PlaySE(SE_SELECT); - sFactorySelectScreen->unk2A2 = FALSE; - gTasks[taskId].data[0] = 2; - gTasks[taskId].func = Task_HandleSelectionScreenMenu; - } - else if (JOY_REPEAT(DPAD_LEFT)) - { - PlaySE(SE_SELECT); - Select_UpdateBallCursorPosition(-1); - Select_PrintMonCategory(); - Select_PrintMonSpecies(); - } - else if (JOY_REPEAT(DPAD_RIGHT)) - { - PlaySE(SE_SELECT); - Select_UpdateBallCursorPosition(1); - Select_PrintMonCategory(); - Select_PrintMonSpecies(); - } - break; - case 11: - if (JOY_NEW(A_BUTTON)) - { - PlaySE(SE_SELECT); - sub_819F3F8(sFactorySelectScreen->unk294[1], &sFactorySelectScreen->unk2A0, FALSE); - Select_PrintSelectMonString(); - sFactorySelectScreen->unk2A2 = TRUE; - gTasks[taskId].data[0] = 1; - } - break; + gTasks[taskId].tState = STATE_CHOOSE_MONS_HANDLE_INPUT; + sFactorySelectScreen->fadeSpeciesNameActive = TRUE; } + break; + case STATE_CHOOSE_MONS_HANDLE_INPUT: + if (JOY_NEW(A_BUTTON)) + { + PlaySE(SE_SELECT); + sFactorySelectScreen->fadeSpeciesNameActive = FALSE; + gTasks[taskId].tState = STATE_MENU_INIT; + gTasks[taskId].func = Select_Task_HandleMenu; + } + else if (JOY_REPEAT(DPAD_LEFT)) + { + PlaySE(SE_SELECT); + Select_UpdateBallCursorPosition(-1); + Select_PrintMonCategory(); + Select_PrintMonSpecies(); + } + else if (JOY_REPEAT(DPAD_RIGHT)) + { + PlaySE(SE_SELECT); + Select_UpdateBallCursorPosition(1); + Select_PrintMonCategory(); + Select_PrintMonSpecies(); + } + break; + case STATE_CHOOSE_MONS_INVALID: + if (JOY_NEW(A_BUTTON)) + { + PlaySE(SE_SELECT); + CloseMonPic(sFactorySelectScreen->monPics[1], &sFactorySelectScreen->monPicAnimating, FALSE); + Select_PrintSelectMonString(); + sFactorySelectScreen->fadeSpeciesNameActive = TRUE; + gTasks[taskId].tState = STATE_CHOOSE_MONS_HANDLE_INPUT; + } + break; } } +#undef STATE_CHOOSE_MONS_INIT +#undef STATE_CHOOSE_MONS_HANDLE_INPUT +#undef STATE_MENU_INIT +#undef STATE_MENU_HANDLE_INPUT +#undef STATE_YESNO_SHOW_OPTIONS +#undef STATE_YESNO_HANDLE_INPUT +#undef STATE_SUMMARY_FADE +#undef STATE_SUMMARY_CLEAN +#undef STATE_SUMMARY_SHOW +#undef STATE_MENU_SHOW_OPTIONS +#undef STATE_YESNO_SHOW_MONS +#undef STATE_CHOOSE_MONS_INVALID +#undef STATE_MENU_REINIT +#undef STATE_MENU_RESHOW + static void CreateFrontierFactorySelectableMons(u8 firstMonId) { u8 i, j = 0; u8 ivs = 0; u8 level = 0; - u8 happiness = 0; + u8 friendship = 0; u32 otId = 0; u8 battleMode = VarGet(VAR_FRONTIER_BATTLE_MODE); u8 lvlMode = gSaveBlock2Ptr->frontier.lvlMode; @@ -1702,20 +1758,20 @@ static void CreateFrontierFactorySelectableMons(u8 firstMonId) ivs, gFacilityTrainerMons[monId].evSpread, otId); - happiness = 0; + friendship = 0; for (j = 0; j < MAX_MON_MOVES; j++) SetMonMoveAvoidReturn(&sFactorySelectScreen->mons[i + firstMonId].monData, gFacilityTrainerMons[monId].moves[j], j); - SetMonData(&sFactorySelectScreen->mons[i + firstMonId].monData, MON_DATA_FRIENDSHIP, &happiness); + SetMonData(&sFactorySelectScreen->mons[i + firstMonId].monData, MON_DATA_FRIENDSHIP, &friendship); SetMonData(&sFactorySelectScreen->mons[i + firstMonId].monData, MON_DATA_HELD_ITEM, &gBattleFrontierHeldItems[gFacilityTrainerMons[monId].itemTableId]); } } -static void CreateTentFactorySelectableMons(u8 firstMonId) +static void CreateSlateportTentSelectableMons(u8 firstMonId) { u8 i, j; u8 ivs = 0; u8 level = 30; - u8 happiness = 0; + u8 friendship = 0; u32 otId = 0; gFacilityTrainerMons = gSlateportBattleTentMons; @@ -1732,10 +1788,10 @@ static void CreateTentFactorySelectableMons(u8 firstMonId) ivs, gFacilityTrainerMons[monId].evSpread, otId); - happiness = 0; + friendship = 0; for (j = 0; j < MAX_MON_MOVES; j++) SetMonMoveAvoidReturn(&sFactorySelectScreen->mons[i + firstMonId].monData, gFacilityTrainerMons[monId].moves[j], j); - SetMonData(&sFactorySelectScreen->mons[i + firstMonId].monData, MON_DATA_FRIENDSHIP, &happiness); + SetMonData(&sFactorySelectScreen->mons[i + firstMonId].monData, MON_DATA_FRIENDSHIP, &friendship); SetMonData(&sFactorySelectScreen->mons[i + firstMonId].monData, MON_DATA_HELD_ITEM, &gBattleFrontierHeldItems[gFacilityTrainerMons[monId].itemTableId]); } } @@ -1744,7 +1800,7 @@ static void Select_CopyMonsToPlayerParty(void) { u8 i, j; - for (i = 0; i < 3; i++) + for (i = 0; i < FRONTIER_PARTY_SIZE; i++) { for (j = 0; j < SELECTABLE_MONS_COUNT; j++) { @@ -1793,7 +1849,7 @@ static void Select_ShowYesNoOptions(void) Select_PrintYesNoOptions(); } -static void sub_819B958(u8 windowId) +static void Select_ErasePopupMenu(u8 windowId) { gSprites[sFactorySelectScreen->menuCursor1SpriteId].invisible = TRUE; gSprites[sFactorySelectScreen->menuCursor2SpriteId].invisible = TRUE; @@ -1804,9 +1860,9 @@ static void sub_819B958(u8 windowId) static void Select_PrintRentalPkmnString(void) { - FillWindowPixelBuffer(0, PIXEL_FILL(0)); - AddTextPrinterParameterized(0, 1, gText_RentalPkmn2, 2, 1, 0, NULL); - CopyWindowToVram(0, 3); + FillWindowPixelBuffer(SELECT_WIN_TITLE, PIXEL_FILL(0)); + AddTextPrinterParameterized(SELECT_WIN_TITLE, 1, gText_RentalPkmn2, 2, 1, 0, NULL); + CopyWindowToVram(SELECT_WIN_TITLE, 3); } static void Select_PrintMonSpecies(void) @@ -1815,19 +1871,19 @@ static void Select_PrintMonSpecies(void) u8 x; u8 monId = sFactorySelectScreen->cursorPos; - FillWindowPixelBuffer(1, PIXEL_FILL(0)); + FillWindowPixelBuffer(SELECT_WIN_SPECIES, PIXEL_FILL(0)); species = GetMonData(&sFactorySelectScreen->mons[monId].monData, MON_DATA_SPECIES, NULL); StringCopy(gStringVar4, gSpeciesNames[species]); x = GetStringRightAlignXOffset(1, gStringVar4, 86); - AddTextPrinterParameterized3(1, 1, x, 1, sSpeciesNameTextColors, 0, gStringVar4); - CopyWindowToVram(1, 2); + AddTextPrinterParameterized3(SELECT_WIN_SPECIES, 1, x, 1, sSpeciesNameTextColors, 0, gStringVar4); + CopyWindowToVram(SELECT_WIN_SPECIES, 2); } static void Select_PrintSelectMonString(void) { const u8 *str = NULL; - FillWindowPixelBuffer(2, PIXEL_FILL(0)); + FillWindowPixelBuffer(SELECT_WIN_INFO, PIXEL_FILL(0)); if (sFactorySelectScreen->selectingMonsState == 1) str = gText_SelectFirstPkmn; else if (sFactorySelectScreen->selectingMonsState == 2) @@ -1837,46 +1893,46 @@ static void Select_PrintSelectMonString(void) else str = gText_TheseThreePkmnOkay; - AddTextPrinterParameterized(2, 1, str, 2, 5, 0, NULL); - CopyWindowToVram(2, 2); + AddTextPrinterParameterized(SELECT_WIN_INFO, 1, str, 2, 5, 0, NULL); + CopyWindowToVram(SELECT_WIN_INFO, 2); } static void Select_PrintCantSelectSameMon(void) { - FillWindowPixelBuffer(2, PIXEL_FILL(0)); - AddTextPrinterParameterized(2, 1, gText_CantSelectSamePkmn, 2, 5, 0, NULL); - CopyWindowToVram(2, 2); + FillWindowPixelBuffer(SELECT_WIN_INFO, PIXEL_FILL(0)); + AddTextPrinterParameterized(SELECT_WIN_INFO, 1, gText_CantSelectSamePkmn, 2, 5, 0, NULL); + CopyWindowToVram(SELECT_WIN_INFO, 2); } static void Select_PrintMenuOptions(void) { u8 selectedId = sFactorySelectScreen->mons[sFactorySelectScreen->cursorPos].selectedId; - PutWindowTilemap(3); - FillWindowPixelBuffer(3, PIXEL_FILL(0)); - AddTextPrinterParameterized3(3, 1, 7, 1, sMenuOptionTextColors, 0, gText_Summary); + PutWindowTilemap(SELECT_WIN_OPTIONS); + FillWindowPixelBuffer(SELECT_WIN_OPTIONS, PIXEL_FILL(0)); + AddTextPrinterParameterized3(SELECT_WIN_OPTIONS, 1, 7, 1, sMenuOptionTextColors, 0, gText_Summary); if (selectedId != 0) - AddTextPrinterParameterized3(3, 1, 7, 17, sMenuOptionTextColors, 0, gText_Deselect); + AddTextPrinterParameterized3(SELECT_WIN_OPTIONS, 1, 7, 17, sMenuOptionTextColors, 0, gText_Deselect); else - AddTextPrinterParameterized3(3, 1, 7, 17, sMenuOptionTextColors, 0, gText_Rent); + AddTextPrinterParameterized3(SELECT_WIN_OPTIONS, 1, 7, 17, sMenuOptionTextColors, 0, gText_Rent); - AddTextPrinterParameterized3(3, 1, 7, 33, sMenuOptionTextColors, 0, gText_Others2); - CopyWindowToVram(3, 3); + AddTextPrinterParameterized3(SELECT_WIN_OPTIONS, 1, 7, 33, sMenuOptionTextColors, 0, gText_Others2); + CopyWindowToVram(SELECT_WIN_OPTIONS, 3); } static void Select_PrintYesNoOptions(void) { - PutWindowTilemap(4); - FillWindowPixelBuffer(4, PIXEL_FILL(0)); - AddTextPrinterParameterized3(4, 1, 7, 1, sMenuOptionTextColors, 0, gText_Yes2); - AddTextPrinterParameterized3(4, 1, 7, 17, sMenuOptionTextColors, 0, gText_No2); - CopyWindowToVram(4, 3); + PutWindowTilemap(SELECT_WIN_YES_NO); + FillWindowPixelBuffer(SELECT_WIN_YES_NO, PIXEL_FILL(0)); + AddTextPrinterParameterized3(SELECT_WIN_YES_NO, 1, 7, 1, sMenuOptionTextColors, 0, gText_Yes2); + AddTextPrinterParameterized3(SELECT_WIN_YES_NO, 1, 7, 17, sMenuOptionTextColors, 0, gText_No2); + CopyWindowToVram(SELECT_WIN_YES_NO, 3); } static u8 Select_RunMenuOptionFunc(void) { - gUnknown_030062E8 = sSelect_MenuOptionFuncs[sFactorySelectScreen->menuCursorPos]; - return gUnknown_030062E8(); + gFactorySelect_CurrentOptionFunc = sSelect_MenuOptionFuncs[sFactorySelectScreen->menuCursorPos]; + return gFactorySelect_CurrentOptionFunc(); } static u8 Select_OptionRentDeselect(void) @@ -1886,29 +1942,29 @@ static u8 Select_OptionRentDeselect(void) if (selectedId == 0 && !Select_AreSpeciesValid(monId)) { Select_PrintCantSelectSameMon(); - sub_819B958(3); - return 3; + Select_ErasePopupMenu(SELECT_WIN_OPTIONS); + return SELECT_INVALID_MON; } else { - sub_819F3F8(sFactorySelectScreen->unk294[1], &sFactorySelectScreen->unk2A0, FALSE); + CloseMonPic(sFactorySelectScreen->monPics[1], &sFactorySelectScreen->monPicAnimating, FALSE); Select_HandleMonSelectionChange(); Select_PrintSelectMonString(); - sub_819B958(3); - if (sFactorySelectScreen->selectingMonsState > 3) - return 2; + Select_ErasePopupMenu(SELECT_WIN_OPTIONS); + if (sFactorySelectScreen->selectingMonsState > FRONTIER_PARTY_SIZE) + return SELECT_CONFIRM_MONS; else - return 1; + return SELECT_CONTINUE_CHOOSING; } } -static u8 sub_819BC9C(void) +static u8 Select_DeclineChosenMons(void) { - sub_819C568(); + Select_HideChosenMons(); Select_HandleMonSelectionChange(); Select_PrintSelectMonString(); - sub_819B958(3); - if (sFactorySelectScreen->selectingMonsState > 3) + Select_ErasePopupMenu(SELECT_WIN_OPTIONS); + if (sFactorySelectScreen->selectingMonsState > FRONTIER_PARTY_SIZE) return 2; else return 1; @@ -1916,14 +1972,14 @@ static u8 sub_819BC9C(void) static u8 Select_OptionSummary(void) { - return 0; + return SELECT_SUMMARY; } static u8 Select_OptionOthers(void) { - sub_819F3F8(sFactorySelectScreen->unk294[1], &sFactorySelectScreen->unk2A0, FALSE); - sub_819B958(3); - return 1; + CloseMonPic(sFactorySelectScreen->monPics[1], &sFactorySelectScreen->monPicAnimating, FALSE); + Select_ErasePopupMenu(SELECT_WIN_OPTIONS); + return SELECT_CONTINUE_CHOOSING; } static void Select_PrintMonCategory(void) @@ -1934,17 +1990,17 @@ static void Select_PrintMonCategory(void) u8 monId = sFactorySelectScreen->cursorPos; if (monId < SELECTABLE_MONS_COUNT) { - PutWindowTilemap(5); - FillWindowPixelBuffer(5, PIXEL_FILL(0)); + PutWindowTilemap(SELECT_WIN_MON_CATEGORY); + FillWindowPixelBuffer(SELECT_WIN_MON_CATEGORY, PIXEL_FILL(0)); species = GetMonData(&sFactorySelectScreen->mons[monId].monData, MON_DATA_SPECIES, NULL); CopyMonCategoryText(SpeciesToNationalPokedexNum(species), text); x = GetStringRightAlignXOffset(1, text, 0x76); - AddTextPrinterParameterized(5, 1, text, x, 1, 0, NULL); - CopyWindowToVram(5, 2); + AddTextPrinterParameterized(SELECT_WIN_MON_CATEGORY, 1, text, x, 1, 0, NULL); + CopyWindowToVram(SELECT_WIN_MON_CATEGORY, 2); } } -static void Summary_ShowMonSprite(void) +static void Select_CreateMonSprite(void) { u8 monId = sFactorySelectScreen->cursorPos; struct Pokemon *mon = &sFactorySelectScreen->mons[monId].monData; @@ -1952,44 +2008,44 @@ static void Summary_ShowMonSprite(void) u32 personality = GetMonData(mon, MON_DATA_PERSONALITY, NULL); u32 otId = GetMonData(mon, MON_DATA_OT_ID, NULL); - sFactorySelectScreen->unk294[1].field0 = CreateMonPicSprite(species, otId, personality, TRUE, 88, 32, 15, 0xFFFF); - gSprites[sFactorySelectScreen->unk294[1].field0].centerToCornerVecX = 0; - gSprites[sFactorySelectScreen->unk294[1].field0].centerToCornerVecY = 0; + sFactorySelectScreen->monPics[1].monSpriteId = CreateMonPicSprite(species, otId, personality, TRUE, 88, 32, 15, 0xFFFF); + gSprites[sFactorySelectScreen->monPics[1].monSpriteId].centerToCornerVecX = 0; + gSprites[sFactorySelectScreen->monPics[1].monSpriteId].centerToCornerVecY = 0; - sFactorySelectScreen->unk2A0 = FALSE; + sFactorySelectScreen->monPicAnimating = FALSE; } -static void sub_819BE20(bool8 arg0) +static void Select_SetMonPicAnimating(bool8 animating) { - sFactorySelectScreen->unk2A0 = arg0; + sFactorySelectScreen->monPicAnimating = animating; } -static void Select_ShowSummaryMonSprite(void) +static void Select_ReshowMonSprite(void) { struct Pokemon *mon; u16 species; u32 personality, otId; - sFactorySelectScreen->unk294[1].field1 = CreateSprite(&gUnknown_08610638, 120, 64, 1); - StartSpriteAffineAnim(&gSprites[sFactorySelectScreen->unk294[1].field1], 2); + sFactorySelectScreen->monPics[1].bgSpriteId = CreateSprite(&sSpriteTemplate_Select_MonPicBgAnim, 120, 64, 1); + StartSpriteAffineAnim(&gSprites[sFactorySelectScreen->monPics[1].bgSpriteId], 2); mon = &sFactorySelectScreen->mons[sFactorySelectScreen->cursorPos].monData; species = GetMonData(mon, MON_DATA_SPECIES, NULL); personality = GetMonData(mon, MON_DATA_PERSONALITY, NULL); otId = GetMonData(mon, MON_DATA_OT_ID, NULL); - sFactorySelectScreen->unk294[1].field0 = CreateMonPicSprite(species, otId, personality, TRUE, 88, 32, 15, 0xFFFF); - gSprites[sFactorySelectScreen->unk294[1].field0].centerToCornerVecX = 0; - gSprites[sFactorySelectScreen->unk294[1].field0].centerToCornerVecY = 0; + sFactorySelectScreen->monPics[1].monSpriteId = CreateMonPicSprite(species, otId, personality, TRUE, 88, 32, 15, 0xFFFF); + gSprites[sFactorySelectScreen->monPics[1].monSpriteId].centerToCornerVecX = 0; + gSprites[sFactorySelectScreen->monPics[1].monSpriteId].centerToCornerVecY = 0; - gSprites[sFactorySelectScreen->unk294[1].field1].invisible = TRUE; + gSprites[sFactorySelectScreen->monPics[1].bgSpriteId].invisible = TRUE; } -static void Select_ShowChosenMonsSprites(void) +static void Select_CreateChosenMonsSprites(void) { u8 i, j; - for (i = 0; i < 3; i++) + for (i = 0; i < FRONTIER_PARTY_SIZE; i++) { for (j = 0; j < SELECTABLE_MONS_COUNT; j++) { @@ -2000,66 +2056,80 @@ static void Select_ShowChosenMonsSprites(void) u32 personality = GetMonData(mon, MON_DATA_PERSONALITY, NULL); u32 otId = GetMonData(mon, MON_DATA_OT_ID, NULL); - sFactorySelectScreen->unk294[i].field0 = CreateMonPicSprite(species, otId, personality, TRUE, (i * 72) + 16, 32, i + 13, 0xFFFF); - gSprites[sFactorySelectScreen->unk294[i].field0].centerToCornerVecX = 0; - gSprites[sFactorySelectScreen->unk294[i].field0].centerToCornerVecY = 0; + sFactorySelectScreen->monPics[i].monSpriteId = CreateMonPicSprite(species, otId, personality, TRUE, (i * 72) + 16, 32, i + 13, 0xFFFF); + gSprites[sFactorySelectScreen->monPics[i].monSpriteId].centerToCornerVecX = 0; + gSprites[sFactorySelectScreen->monPics[i].monSpriteId].centerToCornerVecY = 0; break; } } } - sFactorySelectScreen->unk2A0 = FALSE; + sFactorySelectScreen->monPicAnimating = FALSE; } -static void sub_819C040(struct Sprite *sprite) +static void SpriteCB_OpenChosenMonPics(struct Sprite *sprite) { u8 taskId; + // Current sprite is monPics[1] if (sprite->affineAnimEnded - && gSprites[sFactorySelectScreen->unk294[0].field1].affineAnimEnded - && gSprites[sFactorySelectScreen->unk294[2].field1].affineAnimEnded) + && gSprites[sFactorySelectScreen->monPics[0].bgSpriteId].affineAnimEnded + && gSprites[sFactorySelectScreen->monPics[2].bgSpriteId].affineAnimEnded) { sprite->invisible = TRUE; - gSprites[sFactorySelectScreen->unk294[0].field1].invisible = TRUE; - gSprites[sFactorySelectScreen->unk294[2].field1].invisible = TRUE; + gSprites[sFactorySelectScreen->monPics[0].bgSpriteId].invisible = TRUE; + gSprites[sFactorySelectScreen->monPics[2].bgSpriteId].invisible = TRUE; - taskId = CreateTask(sub_819C1D0, 1); + taskId = CreateTask(Select_Task_OpenChosenMonPics, 1); gTasks[taskId].func(taskId); sprite->callback = SpriteCallbackDummy; } } -static void sub_819C100(struct Sprite *sprite) +static void SpriteCB_CloseChosenMonPics(struct Sprite *sprite) { + // Current sprite is monPics[1] if (sprite->affineAnimEnded - && gSprites[sFactorySelectScreen->unk294[0].field1].affineAnimEnded - && gSprites[sFactorySelectScreen->unk294[2].field1].affineAnimEnded) + && gSprites[sFactorySelectScreen->monPics[0].bgSpriteId].affineAnimEnded + && gSprites[sFactorySelectScreen->monPics[2].bgSpriteId].affineAnimEnded) { FreeOamMatrix(sprite->oam.matrixNum); - FreeOamMatrix(gSprites[sFactorySelectScreen->unk294[0].field1].oam.matrixNum); - FreeOamMatrix(gSprites[sFactorySelectScreen->unk294[2].field1].oam.matrixNum); + FreeOamMatrix(gSprites[sFactorySelectScreen->monPics[0].bgSpriteId].oam.matrixNum); + FreeOamMatrix(gSprites[sFactorySelectScreen->monPics[2].bgSpriteId].oam.matrixNum); - sFactorySelectScreen->unk2A0 = FALSE; + sFactorySelectScreen->monPicAnimating = FALSE; - DestroySprite(&gSprites[sFactorySelectScreen->unk294[0].field1]); - DestroySprite(&gSprites[sFactorySelectScreen->unk294[2].field1]); + DestroySprite(&gSprites[sFactorySelectScreen->monPics[0].bgSpriteId]); + DestroySprite(&gSprites[sFactorySelectScreen->monPics[2].bgSpriteId]); DestroySprite(sprite); } } -static void sub_819C1D0(u8 taskId) +// Task data for Select_Task_OpenChosenMonPics, Select_Task_CloseChosenMonPics, Task_CloseMonPic, and Task_OpenMonPic +#define tWinLeft data[3] +#ifndef UBFIX +#define tWinRight data[24] // UB: Typo? Likely meant data[4], 24 is out of bounds +#else +#define tWinRight data[4] +#endif +#define tWinTop data[5] +#define tWinBottom data[8] +#define tSpriteId data[6] // TODO: Clarify, what sprite +#define tIsSwapScreen data[7] + +static void Select_Task_OpenChosenMonPics(u8 taskId) { struct Task *task = &gTasks[taskId]; - switch (task->data[0]) + switch (task->tState) { case 0: - task->data[3] = 16; - task->data[24] = 224; // BUG: writing outside the array's bounds. - task->data[5] = 64; - task->data[8] = 65; + task->tWinLeft = 16; + task->tWinRight = DISPLAY_WIDTH - 16; + task->tWinTop = 64; + task->tWinBottom = 65; SetGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_WIN0_ON); - SetGpuReg(REG_OFFSET_WIN0H, WIN_RANGE(task->data[3], task->data[24])); - SetGpuReg(REG_OFFSET_WIN0V, WIN_RANGE(task->data[5], task->data[8])); + SetGpuReg(REG_OFFSET_WIN0H, WIN_RANGE(task->tWinLeft, task->tWinRight)); + SetGpuReg(REG_OFFSET_WIN0V, WIN_RANGE(task->tWinTop, task->tWinBottom)); SetGpuReg(REG_OFFSET_WININ, WININ_WIN0_BG_ALL | WININ_WIN0_CLR | WININ_WIN0_OBJ); SetGpuReg(REG_OFFSET_WINOUT, WINOUT_WIN01_BG0 | WINOUT_WIN01_BG1 | WINOUT_WIN01_BG2 | WINOUT_WIN01_CLR | WINOUT_WIN01_OBJ); break; @@ -2069,97 +2139,97 @@ static void sub_819C1D0(u8 taskId) SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(11, 4)); break; case 2: - task->data[5] -= 4; - task->data[8] += 4; - if (task->data[5] <= 32 || task->data[8] >= 96) + task->tWinTop -= 4; + task->tWinBottom += 4; + if (task->tWinTop <= 32 || task->tWinBottom >= 96) { - task->data[5] = 32; - task->data[8] = 96; + task->tWinTop = 32; + task->tWinBottom = 96; ClearGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_WIN0_ON); } - SetGpuReg(REG_OFFSET_WIN0V, WIN_RANGE(task->data[5], task->data[8])); - if (task->data[5] != 32) + SetGpuReg(REG_OFFSET_WIN0V, WIN_RANGE(task->tWinTop, task->tWinBottom)); + if (task->tWinTop != 32) return; break; default: DestroyTask(taskId); - Select_ShowChosenMonsSprites(); + Select_CreateChosenMonsSprites(); return; } - task->data[0]++; + task->tState++; } -static void sub_819C2D4(u8 taskId) +static void Select_Task_CloseChosenMonPics(u8 taskId) { struct Task *task = &gTasks[taskId]; - switch (task->data[0]) + switch (task->tState) { + case 0: + task->tWinLeft = 16; + task->tWinRight = DISPLAY_WIDTH - 16; + task->tWinTop = 32; + task->tWinBottom = 96; + SetGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_WIN0_ON); + SetGpuReg(REG_OFFSET_WIN0H, WIN_RANGE(task->tWinLeft, task->tWinRight)); + SetGpuReg(REG_OFFSET_WIN0V, WIN_RANGE(task->tWinTop, task->tWinBottom)); + SetGpuReg(REG_OFFSET_WININ, WININ_WIN0_BG_ALL | WININ_WIN0_CLR | WININ_WIN0_OBJ); + SetGpuReg(REG_OFFSET_WINOUT, WINOUT_WIN01_BG0 | WINOUT_WIN01_BG1 | WINOUT_WIN01_BG2 | WINOUT_WIN01_CLR | WINOUT_WIN01_OBJ); + task->tState++; + break; + case 1: + task->tWinTop += 4; + task->tWinBottom -= 4; + if (task->tWinTop >= 64 || task->tWinBottom <= 65) + { + task->tWinTop = 64; + task->tWinBottom = 65; + } + SetGpuReg(REG_OFFSET_WIN0V, WIN_RANGE(task->tWinTop, task->tWinBottom)); + if (task->tWinTop == 64) + task->tState++; + break; default: HideBg(3); - gSprites[sFactorySelectScreen->unk294[1].field1].invisible = FALSE; - gSprites[sFactorySelectScreen->unk294[1].field1].callback = sub_819C100; - gSprites[sFactorySelectScreen->unk294[0].field1].invisible = FALSE; - gSprites[sFactorySelectScreen->unk294[0].field1].callback = SpriteCallbackDummy; - gSprites[sFactorySelectScreen->unk294[2].field1].invisible = FALSE; - gSprites[sFactorySelectScreen->unk294[2].field1].callback = SpriteCallbackDummy; - StartSpriteAffineAnim(&gSprites[sFactorySelectScreen->unk294[1].field1], 1); - StartSpriteAffineAnim(&gSprites[sFactorySelectScreen->unk294[0].field1], 1); - StartSpriteAffineAnim(&gSprites[sFactorySelectScreen->unk294[2].field1], 1); + gSprites[sFactorySelectScreen->monPics[1].bgSpriteId].invisible = FALSE; + gSprites[sFactorySelectScreen->monPics[1].bgSpriteId].callback = SpriteCB_CloseChosenMonPics; + gSprites[sFactorySelectScreen->monPics[0].bgSpriteId].invisible = FALSE; + gSprites[sFactorySelectScreen->monPics[0].bgSpriteId].callback = SpriteCallbackDummy; + gSprites[sFactorySelectScreen->monPics[2].bgSpriteId].invisible = FALSE; + gSprites[sFactorySelectScreen->monPics[2].bgSpriteId].callback = SpriteCallbackDummy; + StartSpriteAffineAnim(&gSprites[sFactorySelectScreen->monPics[1].bgSpriteId], 1); + StartSpriteAffineAnim(&gSprites[sFactorySelectScreen->monPics[0].bgSpriteId], 1); + StartSpriteAffineAnim(&gSprites[sFactorySelectScreen->monPics[2].bgSpriteId], 1); ClearGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_WIN0_ON); DestroyTask(taskId); break; - case 0: - task->data[3] = 16; - task->data[24] = 224; // BUG: writing outside the array's bounds. - task->data[5] = 32; - task->data[8] = 96; - SetGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_WIN0_ON); - SetGpuReg(REG_OFFSET_WIN0H, WIN_RANGE(task->data[3], task->data[24])); - SetGpuReg(REG_OFFSET_WIN0V, WIN_RANGE(task->data[5], task->data[8])); - SetGpuReg(REG_OFFSET_WININ, WININ_WIN0_BG_ALL | WININ_WIN0_CLR | WININ_WIN0_OBJ); - SetGpuReg(REG_OFFSET_WINOUT, WINOUT_WIN01_BG0 | WINOUT_WIN01_BG1 | WINOUT_WIN01_BG2 | WINOUT_WIN01_CLR | WINOUT_WIN01_OBJ); - task->data[0]++; - break; - case 1: - task->data[5] += 4; - task->data[8] -= 4; - if (task->data[5] >= 64 || task->data[8] <= 65) - { - task->data[5] = 64; - task->data[8] = 65; - } - SetGpuReg(REG_OFFSET_WIN0V, WIN_RANGE(task->data[5], task->data[8])); - if (task->data[5] == 64) - task->data[0]++; - break; } } -static void sub_819C4B4(void) +static void Select_ShowChosenMons(void) { - sFactorySelectScreen->unk294[1].field1 = CreateSprite(&gUnknown_08610638, 120, 64, 1); - sFactorySelectScreen->unk294[0].field1 = CreateSprite(&gUnknown_08610638, 44, 64, 1); - sFactorySelectScreen->unk294[2].field1 = CreateSprite(&gUnknown_08610638, 196, 64, 1); + sFactorySelectScreen->monPics[1].bgSpriteId = CreateSprite(&sSpriteTemplate_Select_MonPicBgAnim, 120, 64, 1); + sFactorySelectScreen->monPics[0].bgSpriteId = CreateSprite(&sSpriteTemplate_Select_MonPicBgAnim, 44, 64, 1); + sFactorySelectScreen->monPics[2].bgSpriteId = CreateSprite(&sSpriteTemplate_Select_MonPicBgAnim, 196, 64, 1); - gSprites[sFactorySelectScreen->unk294[1].field1].callback = sub_819C040; - gSprites[sFactorySelectScreen->unk294[0].field1].callback = SpriteCallbackDummy; - gSprites[sFactorySelectScreen->unk294[2].field1].callback = SpriteCallbackDummy; + gSprites[sFactorySelectScreen->monPics[1].bgSpriteId].callback = SpriteCB_OpenChosenMonPics; + gSprites[sFactorySelectScreen->monPics[0].bgSpriteId].callback = SpriteCallbackDummy; + gSprites[sFactorySelectScreen->monPics[2].bgSpriteId].callback = SpriteCallbackDummy; - sFactorySelectScreen->unk2A0 = TRUE; + sFactorySelectScreen->monPicAnimating = TRUE; } -static void sub_819C568(void) +static void Select_HideChosenMons(void) { u8 taskId; - FreeAndDestroyMonPicSprite(sFactorySelectScreen->unk294[0].field0); - FreeAndDestroyMonPicSprite(sFactorySelectScreen->unk294[1].field0); - FreeAndDestroyMonPicSprite(sFactorySelectScreen->unk294[2].field0); + FreeAndDestroyMonPicSprite(sFactorySelectScreen->monPics[0].monSpriteId); + FreeAndDestroyMonPicSprite(sFactorySelectScreen->monPics[1].monSpriteId); + FreeAndDestroyMonPicSprite(sFactorySelectScreen->monPics[2].monSpriteId); - taskId = CreateTask(sub_819C2D4, 1); + taskId = CreateTask(Select_Task_CloseChosenMonPics, 1); gTasks[taskId].func(taskId); - sFactorySelectScreen->unk2A0 = TRUE; + sFactorySelectScreen->monPicAnimating = TRUE; } static void Select_SetWinRegs(s16 mWin0H, s16 nWin0H, s16 mWin0V, s16 nWin0V) @@ -2190,60 +2260,59 @@ static bool32 Select_AreSpeciesValid(u16 monId) } } } - return TRUE; } -static void Task_SelectFadeSpeciesName(u8 taskId) +static void Select_Task_FadeSpeciesName(u8 taskId) { - switch (gTasks[taskId].data[0]) + switch (gTasks[taskId].tState) { - case 0: - sFactorySelectScreen->unk2A7 = 0; - sFactorySelectScreen->unk2A8 = 0; - sFactorySelectScreen->unk2A6 = TRUE; - gTasks[taskId].data[0] = 1; + case FADESTATE_INIT: + sFactorySelectScreen->fadeSpeciesNameCoeffDelay = 0; + sFactorySelectScreen->fadeSpeciesNameCoeff = 0; + sFactorySelectScreen->fadeSpeciesNameFadeOut = TRUE; + gTasks[taskId].tState = FADESTATE_RUN; break; - case 1: - if (sFactorySelectScreen->unk2A2) + case FADESTATE_RUN: + if (sFactorySelectScreen->fadeSpeciesNameActive) { - if (sFactorySelectScreen->unk2A9) + if (sFactorySelectScreen->faceSpeciesNameDelay) { - gTasks[taskId].data[0] = 2; + gTasks[taskId].tState = FADESTATE_DELAY; } else { - sFactorySelectScreen->unk2A7++; - if (sFactorySelectScreen->unk2A7 > 6) + sFactorySelectScreen->fadeSpeciesNameCoeffDelay++; + if (sFactorySelectScreen->fadeSpeciesNameCoeffDelay > 6) { - sFactorySelectScreen->unk2A7 = 0; - if (!sFactorySelectScreen->unk2A6) - sFactorySelectScreen->unk2A8--; + sFactorySelectScreen->fadeSpeciesNameCoeffDelay = 0; + if (!sFactorySelectScreen->fadeSpeciesNameFadeOut) + sFactorySelectScreen->fadeSpeciesNameCoeff--; else - sFactorySelectScreen->unk2A8++; + sFactorySelectScreen->fadeSpeciesNameCoeff++; } - BlendPalettes(0x4000, sFactorySelectScreen->unk2A8, 0); - if (sFactorySelectScreen->unk2A8 > 5) + BlendPalettes(0x4000, sFactorySelectScreen->fadeSpeciesNameCoeff, 0); + if (sFactorySelectScreen->fadeSpeciesNameCoeff > 5) { - sFactorySelectScreen->unk2A6 = FALSE; + sFactorySelectScreen->fadeSpeciesNameFadeOut = FALSE; } - else if (sFactorySelectScreen->unk2A8 == 0) + else if (sFactorySelectScreen->fadeSpeciesNameCoeff == 0) { - gTasks[taskId].data[0] = 2; - sFactorySelectScreen->unk2A6 = TRUE; + gTasks[taskId].tState = FADESTATE_DELAY; + sFactorySelectScreen->fadeSpeciesNameFadeOut = TRUE; } } } break; - case 2: - if (sFactorySelectScreen->unk2A9 > 14) + case FADESTATE_DELAY: + if (sFactorySelectScreen->faceSpeciesNameDelay > 14) { - sFactorySelectScreen->unk2A9 = 0; - gTasks[taskId].data[0] = 1; + sFactorySelectScreen->faceSpeciesNameDelay = 0; + gTasks[taskId].tState = FADESTATE_RUN; } else { - sFactorySelectScreen->unk2A9++; + sFactorySelectScreen->faceSpeciesNameDelay++; } break; } @@ -2269,233 +2338,257 @@ static void Swap_VblankCb(void) static void CopySwappedMonData(void) { - u8 happiness; + u8 friendship; gPlayerParty[sFactorySwapScreen->playerMonId] = gEnemyParty[sFactorySwapScreen->enemyMonId]; - happiness = 0; - SetMonData(&gPlayerParty[sFactorySwapScreen->playerMonId], MON_DATA_FRIENDSHIP, &happiness); - gSaveBlock2Ptr->frontier.rentalMons[sFactorySwapScreen->playerMonId].monId = gSaveBlock2Ptr->frontier.rentalMons[sFactorySwapScreen->enemyMonId + 3].monId; - gSaveBlock2Ptr->frontier.rentalMons[sFactorySwapScreen->playerMonId].ivs = gSaveBlock2Ptr->frontier.rentalMons[sFactorySwapScreen->enemyMonId + 3].ivs; + friendship = 0; + SetMonData(&gPlayerParty[sFactorySwapScreen->playerMonId], MON_DATA_FRIENDSHIP, &friendship); + gSaveBlock2Ptr->frontier.rentalMons[sFactorySwapScreen->playerMonId].monId = gSaveBlock2Ptr->frontier.rentalMons[sFactorySwapScreen->enemyMonId + FRONTIER_PARTY_SIZE].monId; + gSaveBlock2Ptr->frontier.rentalMons[sFactorySwapScreen->playerMonId].ivs = gSaveBlock2Ptr->frontier.rentalMons[sFactorySwapScreen->enemyMonId + FRONTIER_PARTY_SIZE].ivs; gSaveBlock2Ptr->frontier.rentalMons[sFactorySwapScreen->playerMonId].personality = GetMonData(&gEnemyParty[sFactorySwapScreen->enemyMonId], MON_DATA_PERSONALITY, NULL); gSaveBlock2Ptr->frontier.rentalMons[sFactorySwapScreen->playerMonId].abilityNum = GetBoxMonData(&gEnemyParty[sFactorySwapScreen->enemyMonId].box, MON_DATA_ABILITY_NUM, NULL); } -static void Task_FromSwapScreenToSummaryScreen(u8 taskId) +// Main swap states +// States for the main tasks of the Swap_ functions after initialization, including: +// Swap_Task_OpenSummaryScreen, Swap_Task_HandleYesNo, Swap_Task_HandleMenu, and Swap_Task_HandleChooseMons +// Tasks sharing states was unnecessary, see "Main select states" +#define STATE_CHOOSE_MONS_INIT 0 +#define STATE_CHOOSE_MONS_HANDLE_INPUT 1 +#define STATE_MENU_INIT 2 +#define STATE_MENU_HANDLE_INPUT 3 +#define STATE_YESNO_SHOW 4 +#define STATE_YESNO_HANDLE_INPUT 5 +#define STATE_SUMMARY_FADE 6 +#define STATE_SUMMARY_CLEAN 7 +#define STATE_SUMMARY_SHOW 8 +#define STATE_MENU_SHOW_OPTIONS 9 + +static void Swap_Task_OpenSummaryScreen(u8 taskId) { - switch (gTasks[taskId].data[0]) + switch (gTasks[taskId].tState) { - case 6: - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK); - gTasks[taskId].data[0] = 7; + case STATE_SUMMARY_FADE: + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK); + gTasks[taskId].tState = STATE_SUMMARY_CLEAN; break; - case 7: + case STATE_SUMMARY_CLEAN: if (!gPaletteFade.active) { DestroyTask(sFactorySwapScreen->fadeSpeciesNameTaskId); - sub_819F444(sFactorySwapScreen->unk2C, &sFactorySwapScreen->unk30); + HideMonPic(sFactorySwapScreen->monPic, &sFactorySwapScreen->monPicAnimating); Swap_DestroyAllSprites(); FREE_AND_SET_NULL(sSwapMenuTilesetBuffer); - FREE_AND_SET_NULL(sSwapMonCardBgTilesetBuffer); + FREE_AND_SET_NULL(sSwapMonPicBgTilesetBuffer); FREE_AND_SET_NULL(sSwapMenuTilemapBuffer); - FREE_AND_SET_NULL(sSwapMonCardBgTilemapBuffer); + FREE_AND_SET_NULL(sSwapMonPicBgTilemapBuffer); FreeAllWindowBuffers(); - gTasks[taskId].data[0] = 8; + gTasks[taskId].tState = STATE_SUMMARY_SHOW; } break; - case 8: + case STATE_SUMMARY_SHOW: DestroyTask(taskId); sFactorySwapScreen->fromSummaryScreen = TRUE; - sFactorySwapScreen->unk24 = gPlttBufferUnfaded[244]; - ShowPokemonSummaryScreen(0, gPlayerParty, sFactorySwapScreen->cursorPos, 3 - 1, CB2_InitSwapScreen); + sFactorySwapScreen->speciesNameColorBackup = gPlttBufferUnfaded[244]; + ShowPokemonSummaryScreen(PSS_MODE_NORMAL, gPlayerParty, sFactorySwapScreen->cursorPos, FRONTIER_PARTY_SIZE - 1, CB2_InitSwapScreen); break; } } -static void Task_CloseSwapScreen(u8 taskId) +static void Swap_Task_Exit(u8 taskId) { - if (sFactorySwapScreen->unk30 != TRUE) + if (sFactorySwapScreen->monPicAnimating == TRUE) + return; + + switch (gTasks[taskId].tState) { - switch (gTasks[taskId].data[0]) + case 0: + // Set return value for script + // TRUE if player kept their current pokemon + if (sFactorySwapScreen->monSwapped == TRUE) { - case 0: - if (sFactorySwapScreen->monSwapped == TRUE) - { - gTasks[taskId].data[0]++; - gSpecialVar_Result = 0; - } - else - { - gTasks[taskId].data[0] = 2; - gSpecialVar_Result = 1; - } - break; - case 1: - if (sFactorySwapScreen->monSwapped == TRUE) - { - sFactorySwapScreen->enemyMonId = sFactorySwapScreen->cursorPos; - CopySwappedMonData(); - } - gTasks[taskId].data[0]++; - break; - case 2: - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB_BLACK); - gTasks[taskId].data[0]++; - break; - case 3: - if (!UpdatePaletteFade()) - { - DestroyTask(sFactorySwapScreen->fadeSpeciesNameTaskId); - Swap_DestroyAllSprites(); - FREE_AND_SET_NULL(sSwapMenuTilesetBuffer); - FREE_AND_SET_NULL(sSwapMonCardBgTilesetBuffer); - FREE_AND_SET_NULL(sSwapMenuTilemapBuffer); - FREE_AND_SET_NULL(sSwapMonCardBgTilemapBuffer); - FREE_AND_SET_NULL(sFactorySwapScreen); - FreeAllWindowBuffers(); - SetMainCallback2(CB2_ReturnToFieldContinueScript); - DestroyTask(taskId); - } - break; + gTasks[taskId].tState++; + gSpecialVar_Result = FALSE; } + else + { + gTasks[taskId].tState = 2; + gSpecialVar_Result = TRUE; + } + break; + case 1: + if (sFactorySwapScreen->monSwapped == TRUE) + { + sFactorySwapScreen->enemyMonId = sFactorySwapScreen->cursorPos; + CopySwappedMonData(); + } + gTasks[taskId].tState++; + break; + case 2: + BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK); + gTasks[taskId].tState++; + break; + case 3: + if (!UpdatePaletteFade()) + { + DestroyTask(sFactorySwapScreen->fadeSpeciesNameTaskId); + Swap_DestroyAllSprites(); + FREE_AND_SET_NULL(sSwapMenuTilesetBuffer); + FREE_AND_SET_NULL(sSwapMonPicBgTilesetBuffer); + FREE_AND_SET_NULL(sSwapMenuTilemapBuffer); + FREE_AND_SET_NULL(sSwapMonPicBgTilemapBuffer); + FREE_AND_SET_NULL(sFactorySwapScreen); + FreeAllWindowBuffers(); + SetMainCallback2(CB2_ReturnToFieldContinueScript); + DestroyTask(taskId); + } + break; } } -static void Task_HandleSwapScreenYesNo(u8 taskId) +#define tSaidYes data[1] +#define tFollowUpTaskState data[5] +#define tFollowUpTaskPtrHi data[6] +#define tFollowUpTaskPtrLo data[7] + +static void Swap_Task_HandleYesNo(u8 taskId) { u16 loPtr, hiPtr; - if (sFactorySwapScreen->unk30 != TRUE) + if (sFactorySwapScreen->monPicAnimating == TRUE) + return; + + switch (gTasks[taskId].tState) { - switch (gTasks[taskId].data[0]) + case STATE_YESNO_SHOW: + Swap_ShowYesNoOptions(); + gTasks[taskId].tState = STATE_YESNO_HANDLE_INPUT; + break; + case STATE_YESNO_HANDLE_INPUT: + if (JOY_NEW(A_BUTTON)) { - case 4: - Swap_ShowYesNoOptions(); - gTasks[taskId].data[0] = 5; - break; - case 5: - if (JOY_NEW(A_BUTTON)) + PlaySE(SE_SELECT); + if (sFactorySwapScreen->yesNoCursorPos == 0) { - PlaySE(SE_SELECT); - if (sFactorySwapScreen->yesNoCursorPos == 0) - { - gTasks[taskId].data[1] = 1; - hiPtr = gTasks[taskId].data[6]; - loPtr = gTasks[taskId].data[7]; - gTasks[taskId].func = (void*)((hiPtr << 16) | loPtr); - } - else - { - gTasks[taskId].data[1] = 0; - sub_819EA64(4); - hiPtr = gTasks[taskId].data[6]; - loPtr = gTasks[taskId].data[7]; - gTasks[taskId].func = (void*)((hiPtr << 16) | loPtr); - } - } - else if (JOY_NEW(B_BUTTON)) - { - PlaySE(SE_SELECT); - gTasks[taskId].data[1] = 0; - sub_819EA64(4); - hiPtr = gTasks[taskId].data[6]; - loPtr = gTasks[taskId].data[7]; + // Selected Yes + gTasks[taskId].tSaidYes = TRUE; + hiPtr = gTasks[taskId].tFollowUpTaskPtrHi; + loPtr = gTasks[taskId].tFollowUpTaskPtrLo; gTasks[taskId].func = (void*)((hiPtr << 16) | loPtr); } - else if (JOY_REPEAT(DPAD_UP)) + else { - PlaySE(SE_SELECT); - Swap_UpdateYesNoCursorPosition(-1); + // Selected No + gTasks[taskId].tSaidYes = FALSE; + Swap_ErasePopupMenu(SWAP_WIN_YES_NO); + hiPtr = gTasks[taskId].tFollowUpTaskPtrHi; + loPtr = gTasks[taskId].tFollowUpTaskPtrLo; + gTasks[taskId].func = (void*)((hiPtr << 16) | loPtr); } - else if (JOY_REPEAT(DPAD_DOWN)) - { - PlaySE(SE_SELECT); - Swap_UpdateYesNoCursorPosition(1); - } - break; } + else if (JOY_NEW(B_BUTTON)) + { + PlaySE(SE_SELECT); + gTasks[taskId].tSaidYes = FALSE; + Swap_ErasePopupMenu(SWAP_WIN_YES_NO); + hiPtr = gTasks[taskId].tFollowUpTaskPtrHi; + loPtr = gTasks[taskId].tFollowUpTaskPtrLo; + gTasks[taskId].func = (void*)((hiPtr << 16) | loPtr); + } + else if (JOY_REPEAT(DPAD_UP)) + { + PlaySE(SE_SELECT); + Swap_UpdateYesNoCursorPosition(-1); + } + else if (JOY_REPEAT(DPAD_DOWN)) + { + PlaySE(SE_SELECT); + Swap_UpdateYesNoCursorPosition(1); + } + break; } } -static void sub_819CBDC(u8 taskId) +static void Swap_HandleQuitSwappingResposne(u8 taskId) { - if (gTasks[taskId].data[1] == 1) + if (gTasks[taskId].tSaidYes == TRUE) { - gTasks[taskId].data[0] = 0; - gTasks[taskId].func = Task_CloseSwapScreen; + gTasks[taskId].tState = 0; + gTasks[taskId].func = Swap_Task_Exit; } else { - gTasks[taskId].data[0] = 0; - gTasks[taskId].data[6] = (u32)(Task_HandleSwapScreenChooseMons) >> 16; - gTasks[taskId].data[7] = (u32)(Task_HandleSwapScreenChooseMons); - gTasks[taskId].data[5] = 1; - gTasks[taskId].func = sub_819D770; + gTasks[taskId].tState = 0; + gTasks[taskId].tFollowUpTaskPtrHi = (u32)(Swap_Task_HandleChooseMons) >> 16; + gTasks[taskId].tFollowUpTaskPtrLo = (u32)(Swap_Task_HandleChooseMons); + gTasks[taskId].tFollowUpTaskState = STATE_CHOOSE_MONS_HANDLE_INPUT; + gTasks[taskId].func = Swap_Task_ScreenInfoTransitionIn; } } -static void sub_819CC24(u8 taskId) +static void Swap_AskQuitSwapping(u8 taskId) { - if (gTasks[taskId].data[0] == 0) + if (gTasks[taskId].tState == 0) { Swap_PrintOnInfoWindow(gText_QuitSwapping); sFactorySwapScreen->monSwapped = FALSE; - gTasks[taskId].data[0] = 4; - gTasks[taskId].data[6] = (u32)(sub_819CBDC) >> 16; - gTasks[taskId].data[7] = (u32)(sub_819CBDC); - gTasks[taskId].func = Task_HandleSwapScreenYesNo; + gTasks[taskId].tState = STATE_YESNO_SHOW; + gTasks[taskId].tFollowUpTaskPtrHi = (u32)(Swap_HandleQuitSwappingResposne) >> 16; + gTasks[taskId].tFollowUpTaskPtrLo = (u32)(Swap_HandleQuitSwappingResposne); + gTasks[taskId].func = Swap_Task_HandleYesNo; } } -static void sub_819CC74(u8 taskId) +static void Swap_HandleAcceptMonResponse(u8 taskId) { - sub_819F3F8(sFactorySwapScreen->unk2C, &sFactorySwapScreen->unk30, TRUE); - if (gTasks[taskId].data[1] == 1) + CloseMonPic(sFactorySwapScreen->monPic, &sFactorySwapScreen->monPicAnimating, TRUE); + if (gTasks[taskId].tSaidYes == TRUE) { - gTasks[taskId].data[0] = 0; - gTasks[taskId].func = Task_CloseSwapScreen; + gTasks[taskId].tState = 0; + gTasks[taskId].func = Swap_Task_Exit; } else { - gTasks[taskId].data[0] = 0; - gTasks[taskId].data[6] = (u32)(Task_HandleSwapScreenChooseMons) >> 16; - gTasks[taskId].data[7] = (u32)(Task_HandleSwapScreenChooseMons); - gTasks[taskId].data[5] = 1; - gTasks[taskId].func = sub_819D770; + gTasks[taskId].tState = 0; + gTasks[taskId].tFollowUpTaskPtrHi = (u32)(Swap_Task_HandleChooseMons) >> 16; + gTasks[taskId].tFollowUpTaskPtrLo = (u32)(Swap_Task_HandleChooseMons); + gTasks[taskId].tFollowUpTaskState = STATE_CHOOSE_MONS_HANDLE_INPUT; + gTasks[taskId].func = Swap_Task_ScreenInfoTransitionIn; } } -static void sub_819CCD4(u8 taskId) +static void Swap_AskAcceptMon(u8 taskId) { - if (gTasks[taskId].data[0] == 0) + if (gTasks[taskId].tState == 0) { - sub_819F2B4(&sFactorySwapScreen->unk2C.field1, &sFactorySwapScreen->unk30, TRUE); + OpenMonPic(&sFactorySwapScreen->monPic.bgSpriteId, &sFactorySwapScreen->monPicAnimating, TRUE); Swap_PrintOnInfoWindow(gText_AcceptThisPkmn); sFactorySwapScreen->monSwapped = TRUE; - gTasks[taskId].data[0] = 4; - gTasks[taskId].data[6] = (u32)(sub_819CC74) >> 16; - gTasks[taskId].data[7] = (u32)(sub_819CC74); - gTasks[taskId].func = Task_HandleSwapScreenYesNo; + gTasks[taskId].tState = STATE_YESNO_SHOW; + gTasks[taskId].tFollowUpTaskPtrHi = (u32)(Swap_HandleAcceptMonResponse) >> 16; + gTasks[taskId].tFollowUpTaskPtrLo = (u32)(Swap_HandleAcceptMonResponse); + gTasks[taskId].func = Swap_Task_HandleYesNo; } } -static void Task_HandleSwapScreenMenu(u8 taskId) +static void Swap_Task_HandleMenu(u8 taskId) { - switch (gTasks[taskId].data[0]) + switch (gTasks[taskId].tState) { - case 2: + case STATE_MENU_INIT: if (!sFactorySwapScreen->fromSummaryScreen) - sub_819F2B4(&sFactorySwapScreen->unk2C.field1, &sFactorySwapScreen->unk30, TRUE); - gTasks[taskId].data[0] = 9; + OpenMonPic(&sFactorySwapScreen->monPic.bgSpriteId, &sFactorySwapScreen->monPicAnimating, TRUE); + gTasks[taskId].tState = STATE_MENU_SHOW_OPTIONS; break; - case 9: - if (sFactorySwapScreen->unk30 != TRUE) + case STATE_MENU_SHOW_OPTIONS: + if (sFactorySwapScreen->monPicAnimating != TRUE) { Swap_ShowMenuOptions(); - gTasks[taskId].data[0] = 3; + gTasks[taskId].tState = STATE_MENU_HANDLE_INPUT; } break; - case 3: - if (sFactorySwapScreen->unk30 != TRUE) + case STATE_MENU_HANDLE_INPUT: + if (sFactorySwapScreen->monPicAnimating != TRUE) { if (JOY_NEW(A_BUTTON)) { @@ -2505,13 +2598,13 @@ static void Task_HandleSwapScreenMenu(u8 taskId) else if (JOY_NEW(B_BUTTON)) { PlaySE(SE_SELECT); - sub_819F3F8(sFactorySwapScreen->unk2C, &sFactorySwapScreen->unk30, TRUE); - sub_819EA64(3); - gTasks[taskId].data[0] = 0; - gTasks[taskId].data[6] = (u32)(Task_HandleSwapScreenChooseMons) >> 16; - gTasks[taskId].data[7] = (u32)(Task_HandleSwapScreenChooseMons); - gTasks[taskId].data[5] = 1; - gTasks[taskId].func = sub_819D770; + CloseMonPic(sFactorySwapScreen->monPic, &sFactorySwapScreen->monPicAnimating, TRUE); + Swap_ErasePopupMenu(SWAP_WIN_OPTIONS); + gTasks[taskId].tState = 0; + gTasks[taskId].tFollowUpTaskPtrHi = (u32)(Swap_Task_HandleChooseMons) >> 16; + gTasks[taskId].tFollowUpTaskPtrLo = (u32)(Swap_Task_HandleChooseMons); + gTasks[taskId].tFollowUpTaskState = STATE_CHOOSE_MONS_HANDLE_INPUT; + gTasks[taskId].func = Swap_Task_ScreenInfoTransitionIn; } else if (JOY_REPEAT(DPAD_UP)) { @@ -2526,37 +2619,40 @@ static void Task_HandleSwapScreenMenu(u8 taskId) } } -static void Task_HandleSwapScreenChooseMons(u8 taskId) +// Handles input on the two main swap screens (choosing a current pokeon to get rid of, and choosing a new pokemon to receive) +static void Swap_Task_HandleChooseMons(u8 taskId) { - switch (gTasks[taskId].data[0]) + switch (gTasks[taskId].tState) { - case 0: + case STATE_CHOOSE_MONS_INIT: if (!gPaletteFade.active) { - sFactorySwapScreen->unk22 = TRUE; - gTasks[taskId].data[0] = 1; + sFactorySwapScreen->fadeSpeciesNameActive = TRUE; + gTasks[taskId].tState = STATE_CHOOSE_MONS_HANDLE_INPUT; } break; - case 1: + case STATE_CHOOSE_MONS_HANDLE_INPUT: if (JOY_NEW(A_BUTTON)) { + // Run whatever action is currently selected (a pokeball, the Cancel button, etc.) PlaySE(SE_SELECT); - sFactorySwapScreen->unk22 = FALSE; - Swap_PrintMonSpecies2(); - sub_819EAC0(); + sFactorySwapScreen->fadeSpeciesNameActive = FALSE; + Swap_PrintMonSpeciesAtFade(); + Swap_EraseSpeciesWindow(); Swap_RunActionFunc(taskId); } else if (JOY_NEW(B_BUTTON)) { + // Ask if player wants to quit swapping PlaySE(SE_SELECT); - sFactorySwapScreen->unk22 = FALSE; - Swap_PrintMonSpecies2(); - sub_819EAC0(); - gTasks[taskId].data[6] = (u32)(sub_819CC24) >> 16; - gTasks[taskId].data[7] = (u32)(sub_819CC24); - gTasks[taskId].data[0] = 0; - gTasks[taskId].data[5] = 0; - gTasks[taskId].func = sub_819D588; + sFactorySwapScreen->fadeSpeciesNameActive = FALSE; + Swap_PrintMonSpeciesAtFade(); + Swap_EraseSpeciesWindow(); + gTasks[taskId].tFollowUpTaskPtrHi = (u32)(Swap_AskQuitSwapping) >> 16; + gTasks[taskId].tFollowUpTaskPtrLo = (u32)(Swap_AskQuitSwapping); + gTasks[taskId].tState = 0; + gTasks[taskId].tFollowUpTaskState = 0; + gTasks[taskId].func = Swap_Task_ScreenInfoTransitionOut; } else if (JOY_REPEAT(DPAD_LEFT)) { @@ -2586,116 +2682,121 @@ static void Task_HandleSwapScreenChooseMons(u8 taskId) } } -static void Task_SwapFadeSpeciesName(u8 taskId) +static void Swap_Task_FadeSpeciesName(u8 taskId) { - switch (gTasks[taskId].data[0]) + switch (gTasks[taskId].tState) { - case 0: - sFactorySwapScreen->unk27 = 0; - sFactorySwapScreen->unk28 = 0; - sFactorySwapScreen->unk26 = TRUE; - gTasks[taskId].data[0] = 1; + case FADESTATE_INIT: + sFactorySwapScreen->fadeSpeciesNameCoeffDelay = 0; + sFactorySwapScreen->fadeSpeciesNameCoeff = 0; + sFactorySwapScreen->fadeSpeciesNameFadeOut = TRUE; + gTasks[taskId].tState = FADESTATE_RUN; break; - case 1: - if (sFactorySwapScreen->unk22) + case FADESTATE_RUN: + if (sFactorySwapScreen->fadeSpeciesNameActive) { - if (sFactorySwapScreen->unk29) + if (sFactorySwapScreen->faceSpeciesNameDelay) { - gTasks[taskId].data[0] = 2; + gTasks[taskId].tState = FADESTATE_DELAY; } else { - sFactorySwapScreen->unk27++; - if (sFactorySwapScreen->unk27 > 6) + sFactorySwapScreen->fadeSpeciesNameCoeffDelay++; + if (sFactorySwapScreen->fadeSpeciesNameCoeffDelay > 6) { - sFactorySwapScreen->unk27 = 0; - if (!sFactorySwapScreen->unk26) - sFactorySwapScreen->unk28--; + sFactorySwapScreen->fadeSpeciesNameCoeffDelay = 0; + if (!sFactorySwapScreen->fadeSpeciesNameFadeOut) + sFactorySwapScreen->fadeSpeciesNameCoeff--; else - sFactorySwapScreen->unk28++; + sFactorySwapScreen->fadeSpeciesNameCoeff++; } - BlendPalettes(0x4000, sFactorySwapScreen->unk28, 0); - if (sFactorySwapScreen->unk28 > 5) + BlendPalettes(0x4000, sFactorySwapScreen->fadeSpeciesNameCoeff, 0); + if (sFactorySwapScreen->fadeSpeciesNameCoeff > 5) { - sFactorySwapScreen->unk26 = FALSE; + sFactorySwapScreen->fadeSpeciesNameFadeOut = FALSE; } - else if (sFactorySwapScreen->unk28 == 0) + else if (sFactorySwapScreen->fadeSpeciesNameCoeff == 0) { - gTasks[taskId].data[0] = 2; - sFactorySwapScreen->unk26 = TRUE; + gTasks[taskId].tState = FADESTATE_DELAY; + sFactorySwapScreen->fadeSpeciesNameFadeOut = TRUE; } } } break; - case 2: - if (sFactorySwapScreen->unk29 > 14) + case FADESTATE_DELAY: + if (sFactorySwapScreen->faceSpeciesNameDelay > 14) { - sFactorySwapScreen->unk29 = 0; - gTasks[taskId].data[0] = 1; + sFactorySwapScreen->faceSpeciesNameDelay = 0; + gTasks[taskId].tState = FADESTATE_RUN; } else { - sFactorySwapScreen->unk29++; + sFactorySwapScreen->faceSpeciesNameDelay++; } break; } } -static void Task_SwapFadeSpeciesName2(u8 taskId) +#define tFadeOutFinished data[4] + +static void Swap_Task_FadeOutSpeciesName(u8 taskId) { - switch (gTasks[taskId].data[0]) + switch (gTasks[taskId].tState) { case 0: - sFactorySwapScreen->unk27 = 0; - gTasks[taskId].data[4] = 0; - gTasks[taskId].data[0]++; + sFactorySwapScreen->fadeSpeciesNameCoeffDelay = 0; + gTasks[taskId].tFadeOutFinished = FALSE; + gTasks[taskId].tState++; break; case 1: LoadPalette(&gPlttBufferUnfaded[0xF0], 0xE0, 0xA); - gTasks[taskId].data[0]++; + gTasks[taskId].tState++; break; case 2: - if (sFactorySwapScreen->unk28 > 15) + if (sFactorySwapScreen->fadeSpeciesNameCoeff > 15) { - gTasks[taskId].data[4] = 1; - gTasks[taskId].data[0]++; + gTasks[taskId].tFadeOutFinished = TRUE; + gTasks[taskId].tState++; } - sFactorySwapScreen->unk27++; - if (sFactorySwapScreen->unk27 > 3) + sFactorySwapScreen->fadeSpeciesNameCoeffDelay++; + if (sFactorySwapScreen->fadeSpeciesNameCoeffDelay > 3) { - sFactorySwapScreen->unk27 = 0; + sFactorySwapScreen->fadeSpeciesNameCoeffDelay = 0; gPlttBufferUnfaded[244] = gPlttBufferFaded[228]; - sFactorySwapScreen->unk28++; + sFactorySwapScreen->fadeSpeciesNameCoeff++; } - BlendPalettes(0x4000, sFactorySwapScreen->unk28, 0); + BlendPalettes(0x4000, sFactorySwapScreen->fadeSpeciesNameCoeff, 0); break; } } -static void sub_819D12C(u8 taskId) +// Slide current pokeballs offscreen to the right and new pokeballs onscreen from +// the left during transition between player's/enemy's party screens +#define tBallCycled(i) data[(i) + 1] +static void Swap_Task_SlideCycleBalls(u8 taskId) { s8 i; - u8 var_2C; - bool8 destroyTask; + u8 lastX; + bool8 finished; - switch (gTasks[taskId].data[0]) + switch (gTasks[taskId].tState) { case 0: - gTasks[taskId].data[1] = 0; - gTasks[taskId].data[2] = 0; - gTasks[taskId].data[3] = 0; - gTasks[taskId].data[0] = 1; + gTasks[taskId].tBallCycled(0) = FALSE; + gTasks[taskId].tBallCycled(1) = FALSE; + gTasks[taskId].tBallCycled(2) = FALSE; + gTasks[taskId].tState = 1; break; case 1: - var_2C = 0; - for (i = 2; i >= 0; i--) + lastX = 0; + for (i = FRONTIER_PARTY_SIZE - 1; i >= 0; i--) { - if (i != 2) + if (i != FRONTIER_PARTY_SIZE - 1) { - u8 posX = var_2C - gSprites[sFactorySwapScreen->ballSpriteIds[i]].pos1.x; - if (posX == 16 || gTasks[taskId].data[i + 2] == 1) + u8 posX = lastX - gSprites[sFactorySwapScreen->ballSpriteIds[i]].pos1.x; + if (posX == 16 || gTasks[taskId].tBallCycled(i + 1) == TRUE) { - var_2C = gSprites[sFactorySwapScreen->ballSpriteIds[i]].pos1.x; + lastX = gSprites[sFactorySwapScreen->ballSpriteIds[i]].pos1.x; gSprites[sFactorySwapScreen->ballSpriteIds[i]].pos1.x += 10; } else if (posX > 16) @@ -2705,402 +2806,449 @@ static void sub_819D12C(u8 taskId) } else { - var_2C = gSprites[sFactorySwapScreen->ballSpriteIds[i]].pos1.x; + lastX = gSprites[sFactorySwapScreen->ballSpriteIds[i]].pos1.x; gSprites[sFactorySwapScreen->ballSpriteIds[i]].pos1.x += 10; } - if (gTasks[taskId].data[i + 1] == 1) + if (gTasks[taskId].tBallCycled(i) == TRUE) { + // New ball coming in from left, check if it has reached dest if (gSprites[sFactorySwapScreen->ballSpriteIds[i]].pos1.x > (i * 48) + 72) { + // Overshot dest, set x and finish gSprites[sFactorySwapScreen->ballSpriteIds[i]].pos1.x = (i * 48) + 72; - destroyTask = TRUE; + finished = TRUE; } else if (gSprites[sFactorySwapScreen->ballSpriteIds[i]].pos1.x == (i * 48) + 72) { - destroyTask = TRUE; + finished = TRUE; } else { - destroyTask = FALSE; + finished = FALSE; } } else { - destroyTask = FALSE; + finished = FALSE; } - if (gSprites[sFactorySwapScreen->ballSpriteIds[i]].pos1.x - 16 > 240) + if (gSprites[sFactorySwapScreen->ballSpriteIds[i]].pos1.x - 16 > DISPLAY_WIDTH) { - var_2C = gSprites[sFactorySwapScreen->ballSpriteIds[i]].pos1.x; + // Ball is offscreen right, cycle its palette and move to left side of screen + lastX = gSprites[sFactorySwapScreen->ballSpriteIds[i]].pos1.x; gSprites[sFactorySwapScreen->ballSpriteIds[i]].pos1.x = -16; if (sFactorySwapScreen->inEnemyScreen == TRUE) - gSprites[sFactorySwapScreen->ballSpriteIds[i]].oam.paletteNum = IndexOfSpritePaletteTag(TAG_PAL_BALL_SELECTED); + gSprites[sFactorySwapScreen->ballSpriteIds[i]].oam.paletteNum = IndexOfSpritePaletteTag(PALTAG_BALL_SELECTED); else - gSprites[sFactorySwapScreen->ballSpriteIds[i]].oam.paletteNum = IndexOfSpritePaletteTag(TAG_PAL_BALL_GREY); + gSprites[sFactorySwapScreen->ballSpriteIds[i]].oam.paletteNum = IndexOfSpritePaletteTag(PALTAG_BALL_GRAY); - gTasks[taskId].data[i + 1] = 1; + gTasks[taskId].tBallCycled(i) = TRUE; } } - if (destroyTask == TRUE) + if (finished == TRUE) DestroyTask(taskId); break; } } -static void sub_819D324(u8 taskId) +// For sliding the action buttons (Cancel, Pkmn for Swap) on/off screen + +#define SLIDE_BUTTON_PKMN 0 +#define SLIDE_BUTTON_CANCEL 1 + +#define tTaskId data[1] +#define tSlidingOn data[2] +#define tXIncrement data[3] + +// Data to be used by the task that creates this task +#define tSecondSlideDelay data[2] +#define tSlideFinishedPkmn data[3] +#define tSlideFinishedCancel data[4] + +static void Swap_Task_SlideButtonOnOffScreen(u8 taskId) { u8 i, j; s32 posX = 0; - s8 r4 = gTasks[taskId].data[3]; - bool8 r1; + s8 deltaX = gTasks[taskId].tXIncrement; + bool8 sliding; s16 currPosX; - u8 taskId2; + u8 prevTaskId; - if (gTasks[taskId].data[2] == 1) - r4 *= -1; + if (gTasks[taskId].tSlidingOn == TRUE) + deltaX *= -1; - switch (gTasks[taskId].data[0]) + switch (gTasks[taskId].tState) { - case 0: - currPosX = gSprites[sFactorySwapScreen->unk8[0][0]].pos1.x; - if (!gTasks[taskId].data[2]) + case SLIDE_BUTTON_PKMN: + currPosX = gSprites[sFactorySwapScreen->pkmnForSwapButtonSpriteIds[0][0]].pos1.x; + if (!gTasks[taskId].tSlidingOn) { - if (currPosX + r4 < 240) + // Sliding "Pkmn for Swap" offscreen + if (currPosX + deltaX < DISPLAY_WIDTH) { - r1 = TRUE; + sliding = TRUE; } else { - r1 = FALSE; - posX = 240; + sliding = FALSE; + posX = DISPLAY_WIDTH; } } else { - if (currPosX + r4 > 160) + // Sliding "Pkmn for Swap" onscreen + if (currPosX + deltaX > 160) { - r1 = TRUE; + sliding = TRUE; } else { - r1 = FALSE; + sliding = FALSE; posX = 160; } } - if (r1 == TRUE) + if (sliding == TRUE) { - for (i = 0; i < 3; i++) + // Do movement + for (i = 0; i < ARRAY_COUNT(sFactorySwapScreen->pkmnForSwapButtonSpriteIds[0]); i++) { - for (j = 0; j < 2; j++) - gSprites[sFactorySwapScreen->unk8[j][i]].pos1.x += r4; + for (j = 0; j < ARRAY_COUNT(sFactorySwapScreen->pkmnForSwapButtonSpriteIds); j++) + gSprites[sFactorySwapScreen->pkmnForSwapButtonSpriteIds[j][i]].pos1.x += deltaX; } } else { - for (j = 0; j < 2; j++) + // Set final position + for (j = 0; j < ARRAY_COUNT(sFactorySwapScreen->pkmnForSwapButtonSpriteIds); j++) { - gSprites[sFactorySwapScreen->unk8[j][0]].pos1.x = posX; - gSprites[sFactorySwapScreen->unk8[j][1]].pos1.x = posX + 16; - gSprites[sFactorySwapScreen->unk8[j][2]].pos1.x = posX + 48; + gSprites[sFactorySwapScreen->pkmnForSwapButtonSpriteIds[j][0]].pos1.x = posX; + gSprites[sFactorySwapScreen->pkmnForSwapButtonSpriteIds[j][1]].pos1.x = posX + 16; + gSprites[sFactorySwapScreen->pkmnForSwapButtonSpriteIds[j][2]].pos1.x = posX + 48; } - taskId2 = gTasks[taskId].data[1]; - gTasks[taskId2].data[3] = 1; + prevTaskId = gTasks[taskId].tTaskId; + gTasks[prevTaskId].tSlideFinishedPkmn = TRUE; DestroyTask(taskId); } break; - case 1: - currPosX = gSprites[sFactorySwapScreen->unkE[0][0]].pos1.x; - if (!gTasks[taskId].data[2]) + case SLIDE_BUTTON_CANCEL: + currPosX = gSprites[sFactorySwapScreen->cancelButtonSpriteIds[0][0]].pos1.x; + if (!gTasks[taskId].tSlidingOn) { - if (currPosX + r4 < 240) + // Sliding "Cancel" offscreen + if (currPosX + deltaX < DISPLAY_WIDTH) { - r1 = TRUE; + sliding = TRUE; } else { - r1 = FALSE; - posX = 240; + sliding = FALSE; + posX = DISPLAY_WIDTH; } } else { - if (currPosX + r4 > 192) + // Sliding "Cancel" onscreen + if (currPosX + deltaX > 192) { - r1 = TRUE; + sliding = TRUE; } else { - r1 = FALSE; + sliding = FALSE; posX = 192; } } - if (r1 == TRUE) + if (sliding == TRUE) { - for (i = 0; i < 2; i++) + // Do movement + for (i = 0; i < ARRAY_COUNT(sFactorySwapScreen->cancelButtonSpriteIds); i++) { - for (j = 0; j < 2; j++) - gSprites[sFactorySwapScreen->unkE[j][i]].pos1.x += r4; + for (j = 0; j < ARRAY_COUNT(sFactorySwapScreen->cancelButtonSpriteIds[0]); j++) + gSprites[sFactorySwapScreen->cancelButtonSpriteIds[j][i]].pos1.x += deltaX; } } else { - for (j = 0; j < 2; j++) + // Set final position + for (j = 0; j < ARRAY_COUNT(sFactorySwapScreen->cancelButtonSpriteIds); j++) { - gSprites[sFactorySwapScreen->unkE[j][0]].pos1.x = posX; - gSprites[sFactorySwapScreen->unkE[j][1]].pos1.x = posX + 16; + gSprites[sFactorySwapScreen->cancelButtonSpriteIds[j][0]].pos1.x = posX; + gSprites[sFactorySwapScreen->cancelButtonSpriteIds[j][1]].pos1.x = posX + 16; } - taskId2 = gTasks[taskId].data[1]; - gTasks[taskId2].data[4] = 1; + prevTaskId = gTasks[taskId].tTaskId; + gTasks[prevTaskId].tSlideFinishedCancel = TRUE; DestroyTask(taskId); } break; } } -static void sub_819D588(u8 taskId) +// Slide action buttons offscreen +static void Swap_Task_ScreenInfoTransitionOut(u8 taskId) { - u8 anotherTaskId; - u16 loPtr, hiPtr; + u8 slideTaskId; + u16 hiPtr, loPtr; - switch (gTasks[taskId].data[0]) + switch (gTasks[taskId].tState) { case 0: - LoadPalette(gUnknown_08610918, 0xE0, sizeof(gUnknown_08610918)); + LoadPalette(sSwapText_Pal, 0xE0, sizeof(sSwapText_Pal)); Swap_PrintActionStrings(); - PutWindowTilemap(5); - gTasks[taskId].data[0]++; + PutWindowTilemap(SWAP_WIN_ACTION_FADE); + gTasks[taskId].tState++; break; case 1: - sub_819EA64(3); - gTasks[taskId].data[0]++; + Swap_ErasePopupMenu(SWAP_WIN_OPTIONS); + gTasks[taskId].tState++; break; case 2: - BeginNormalPaletteFade(0x4000, 0, 0, 0x10, gUnknown_0860F13C[37]); - gTasks[taskId].data[0]++; + BeginNormalPaletteFade(0x4000, 0, 0, 16, sPokeballGray_Pal[37]); + gTasks[taskId].tState++; break; case 3: if (!gPaletteFade.active) { - FillWindowPixelBuffer(5, PIXEL_FILL(0)); - CopyWindowToVram(5, 2); + FillWindowPixelBuffer(SWAP_WIN_ACTION_FADE, PIXEL_FILL(0)); + CopyWindowToVram(SWAP_WIN_ACTION_FADE, 2); if (sFactorySwapScreen->inEnemyScreen == TRUE) { - anotherTaskId = CreateTask(sub_819D324, 0); - gTasks[taskId].data[3] = 0; - gTasks[anotherTaskId].data[1] = taskId; - gTasks[anotherTaskId].data[0] = 0; - gTasks[anotherTaskId].data[2] = 0; - gTasks[anotherTaskId].data[3] = 6; - gTasks[taskId].data[2] = 5; - gTasks[taskId].data[0]++; + // Start "Pkmn for Swap" button slide offscreen + slideTaskId = CreateTask(Swap_Task_SlideButtonOnOffScreen, 0); + gTasks[taskId].tSlideFinishedPkmn = FALSE; + gTasks[slideTaskId].tTaskId = taskId; + gTasks[slideTaskId].tState = SLIDE_BUTTON_PKMN; + gTasks[slideTaskId].tSlidingOn = FALSE; + gTasks[slideTaskId].tXIncrement = 6; + gTasks[taskId].tSecondSlideDelay = 5; + gTasks[taskId].tState++; } else { - anotherTaskId = CreateTask(sub_819D324, 0); - gTasks[taskId].data[3] = 1; - gTasks[taskId].data[4] = 0; - gTasks[anotherTaskId].data[1] = taskId; - gTasks[anotherTaskId].data[0] = 1; - gTasks[anotherTaskId].data[2] = 0; - gTasks[anotherTaskId].data[3] = 6; - gTasks[taskId].data[0] += 2; + // Start "Cancel" button slide offscreen + slideTaskId = CreateTask(Swap_Task_SlideButtonOnOffScreen, 0); + gTasks[taskId].tSlideFinishedPkmn = TRUE; + gTasks[taskId].tSlideFinishedCancel = FALSE; + gTasks[slideTaskId].tTaskId = taskId; + gTasks[slideTaskId].tState = SLIDE_BUTTON_CANCEL; + gTasks[slideTaskId].tSlidingOn = FALSE; + gTasks[slideTaskId].tXIncrement = 6; + gTasks[taskId].tState += 2; } } break; case 4: - if (gTasks[taskId].data[2] == 0) + // Start "Cancel" button slide offscreen for screens with both buttons + if (gTasks[taskId].tSecondSlideDelay == 0) { - anotherTaskId = CreateTask(sub_819D324, 0); - gTasks[taskId].data[4] = 0; - gTasks[anotherTaskId].data[1] = taskId; - gTasks[anotherTaskId].data[0] = 1; - gTasks[anotherTaskId].data[2] = 0; - gTasks[anotherTaskId].data[3] = 6; - gTasks[taskId].data[0]++; + slideTaskId = CreateTask(Swap_Task_SlideButtonOnOffScreen, 0); + gTasks[taskId].tSlideFinishedCancel = FALSE; + gTasks[slideTaskId].tTaskId = taskId; + gTasks[slideTaskId].tState = SLIDE_BUTTON_CANCEL; + gTasks[slideTaskId].tSlidingOn = FALSE; + gTasks[slideTaskId].tXIncrement = 6; + gTasks[taskId].tState++; } else { - gTasks[taskId].data[2]--; + gTasks[taskId].tSecondSlideDelay--; } break; case 5: - if (gTasks[taskId].data[3] == 1 && gTasks[taskId].data[4] == 1) + if (gTasks[taskId].tSlideFinishedPkmn == TRUE + && gTasks[taskId].tSlideFinishedCancel == TRUE) { - gTasks[taskId].data[0] = gTasks[taskId].data[5]; - loPtr = gTasks[taskId].data[6]; - hiPtr = gTasks[taskId].data[7]; - gTasks[taskId].func = (void *)((loPtr << 0x10) | (hiPtr)); + gTasks[taskId].tState = gTasks[taskId].tFollowUpTaskState; + hiPtr = gTasks[taskId].tFollowUpTaskPtrHi; + loPtr = gTasks[taskId].tFollowUpTaskPtrLo; + gTasks[taskId].func = (void *)((hiPtr << 16) | (loPtr)); } break; } } -static void sub_819D770(u8 taskId) +// Slide action buttons onscreen, reprint swap dialogue and mon info +static void Swap_Task_ScreenInfoTransitionIn(u8 taskId) { - u8 anotherTaskId; - u16 loPtr, hiPtr; - if (sFactorySwapScreen->unk30 == TRUE) + u8 slideTaskId; + u16 hiPtr, loPtr; + if (sFactorySwapScreen->monPicAnimating == TRUE) return; - switch (gTasks[taskId].data[0]) + switch (gTasks[taskId].tState) { case 0: if (sFactorySwapScreen->inEnemyScreen == TRUE) { - anotherTaskId = CreateTask(sub_819D324, 0); - gTasks[taskId].data[3] = 0; - gTasks[anotherTaskId].data[1] = taskId; - gTasks[anotherTaskId].data[0] = 0; - gTasks[anotherTaskId].data[2] = 1; - gTasks[anotherTaskId].data[3] = 6; - gTasks[taskId].data[2] = 10; - gTasks[taskId].data[0]++; + // Start "Pkmn for Swap" button slide onscreen + slideTaskId = CreateTask(Swap_Task_SlideButtonOnOffScreen, 0); + gTasks[taskId].tSlideFinishedPkmn = FALSE; + gTasks[slideTaskId].tTaskId = taskId; + gTasks[slideTaskId].tState = SLIDE_BUTTON_PKMN; + gTasks[slideTaskId].tSlidingOn = TRUE; + gTasks[slideTaskId].tXIncrement = 6; + gTasks[taskId].tSecondSlideDelay = 10; + gTasks[taskId].tState++; } else { - anotherTaskId = CreateTask(sub_819D324, 0); - gTasks[taskId].data[3] = 1; - gTasks[taskId].data[4] = 0; - gTasks[anotherTaskId].data[1] = taskId; - gTasks[anotherTaskId].data[0] = 1; - gTasks[anotherTaskId].data[2] = 1; - gTasks[anotherTaskId].data[3] = 6; - gTasks[taskId].data[0] += 2; + // Start "Cancel" button slide onscreen + slideTaskId = CreateTask(Swap_Task_SlideButtonOnOffScreen, 0); + gTasks[taskId].tSlideFinishedPkmn = TRUE; + gTasks[taskId].tSlideFinishedCancel = FALSE; + gTasks[slideTaskId].tTaskId = taskId; + gTasks[slideTaskId].tState = SLIDE_BUTTON_CANCEL; + gTasks[slideTaskId].tSlidingOn = TRUE; + gTasks[slideTaskId].tXIncrement = 6; + gTasks[taskId].tState += 2; } break; case 1: - if (gTasks[taskId].data[2] == 0) + // Start "Cancel" button slide onscreen for screens with both buttons + if (gTasks[taskId].tSecondSlideDelay == 0) { - anotherTaskId = CreateTask(sub_819D324, 0); - gTasks[taskId].data[4] = 0; - gTasks[anotherTaskId].data[1] = taskId; - gTasks[anotherTaskId].data[0] = 1; - gTasks[anotherTaskId].data[2] = 1; - gTasks[anotherTaskId].data[3] = 6; - gTasks[taskId].data[0]++; + slideTaskId = CreateTask(Swap_Task_SlideButtonOnOffScreen, 0); + gTasks[taskId].tSlideFinishedCancel = FALSE; + gTasks[slideTaskId].tTaskId = taskId; + gTasks[slideTaskId].tState = SLIDE_BUTTON_CANCEL; + gTasks[slideTaskId].tSlidingOn = TRUE; + gTasks[slideTaskId].tXIncrement = 6; + gTasks[taskId].tState++; } else { - gTasks[taskId].data[2]--; + gTasks[taskId].tSecondSlideDelay--; } break; case 2: - if (gTasks[taskId].data[3] == 1 && gTasks[taskId].data[4] == 1) + if (gTasks[taskId].tSlideFinishedPkmn == TRUE + && gTasks[taskId].tSlideFinishedCancel == TRUE) { - gPlttBufferFaded[226] = gUnknown_0860F13C[37]; + gPlttBufferFaded[226] = sPokeballGray_Pal[37]; Swap_PrintActionStrings(); - PutWindowTilemap(5); - gTasks[taskId].data[0]++; + PutWindowTilemap(SWAP_WIN_ACTION_FADE); + gTasks[taskId].tState++; } break; case 3: - BeginNormalPaletteFade(0x4000, 0, 0x10, 0, gUnknown_0860F13C[37]); - gTasks[taskId].data[0]++; + BeginNormalPaletteFade(0x4000, 0, 16, 0, sPokeballGray_Pal[37]); + gTasks[taskId].tState++; break; case 4: if (!gPaletteFade.active) { Swap_PrintOneActionString(0); - gTasks[taskId].data[0]++; + gTasks[taskId].tState++; } break; case 5: Swap_PrintOneActionString(1); - PutWindowTilemap(3); - gTasks[taskId].data[0]++; + PutWindowTilemap(SWAP_WIN_OPTIONS); + gTasks[taskId].tState++; break; case 6: - FillWindowPixelBuffer(5, PIXEL_FILL(0)); - CopyWindowToVram(5, 2); - gTasks[taskId].data[0]++; + FillWindowPixelBuffer(SWAP_WIN_ACTION_FADE, PIXEL_FILL(0)); + CopyWindowToVram(SWAP_WIN_ACTION_FADE, 2); + gTasks[taskId].tState++; break; case 7: if (!sFactorySwapScreen->inEnemyScreen) Swap_PrintOnInfoWindow(gText_SelectPkmnToSwap); else Swap_PrintOnInfoWindow(gText_SelectPkmnToAccept); - if (sFactorySwapScreen->cursorPos < 3) + if (sFactorySwapScreen->cursorPos < FRONTIER_PARTY_SIZE) gSprites[sFactorySwapScreen->cursorSpriteId].invisible = FALSE; Swap_PrintMonCategory(); - gTasks[taskId].data[0]++; + gTasks[taskId].tState++; break; case 8: - Swap_PrintMonSpecies3(); - sub_819EADC(); - sFactorySwapScreen->unk22 = TRUE; - gTasks[taskId].data[0] = gTasks[taskId].data[5]; - loPtr = gTasks[taskId].data[6]; - hiPtr = gTasks[taskId].data[7]; - gTasks[taskId].func = (void *)((loPtr << 0x10) | (hiPtr)); + Swap_PrintMonSpeciesForTransition(); + Swap_EraseSpeciesAtFadeWindow(); + sFactorySwapScreen->fadeSpeciesNameActive = TRUE; + gTasks[taskId].tState = gTasks[taskId].tFollowUpTaskState; + hiPtr = gTasks[taskId].tFollowUpTaskPtrHi; + loPtr = gTasks[taskId].tFollowUpTaskPtrLo; + gTasks[taskId].func = (void *)((hiPtr << 16) | (loPtr)); break; } } -static void sub_819D9EC(u8 taskId) +#undef tTaskId +#undef tSlidingOn +#undef tXIncrement +#undef tSlideFinishedPkmn +#undef tSlideFinishedCancel + +// For switching between the swap screens with the player's / enemy's parties +static void Swap_Task_SwitchPartyScreen(u8 taskId) { u8 i; - if (sFactorySwapScreen->unk30 == TRUE) + if (sFactorySwapScreen->monPicAnimating == TRUE) return; - switch (gTasks[taskId].data[0]) + switch (gTasks[taskId].tState) { case 0: - Swap_PrintMonSpecies3(); - gTasks[taskId].data[0]++; + Swap_PrintMonSpeciesForTransition(); + gTasks[taskId].tState++; break; case 1: - sub_819EADC(); + Swap_EraseSpeciesAtFadeWindow(); gSprites[sFactorySwapScreen->cursorSpriteId].invisible = TRUE; - gTasks[taskId].data[0]++; + gTasks[taskId].tState++; break; case 2: - CreateTask(sub_819D12C, 0); - gTasks[sFactorySwapScreen->fadeSpeciesNameTaskId].func = Task_SwapFadeSpeciesName2; - gTasks[taskId].data[0]++; + CreateTask(Swap_Task_SlideCycleBalls, 0); + gTasks[sFactorySwapScreen->fadeSpeciesNameTaskId].func = Swap_Task_FadeOutSpeciesName; + gTasks[taskId].tState++; break; case 3: - if (!FuncIsActiveTask(sub_819D12C) && gTasks[sFactorySwapScreen->fadeSpeciesNameTaskId].data[4] == 1) + if (!FuncIsActiveTask(Swap_Task_SlideCycleBalls) + && gTasks[sFactorySwapScreen->fadeSpeciesNameTaskId].tFadeOutFinished == TRUE) { - sub_819EAC0(); + Swap_EraseSpeciesWindow(); if (!sFactorySwapScreen->inEnemyScreen) { - Swap_InitActions(ACTIONS_ENEMY_SCREEN); + Swap_InitActions(SWAP_ENEMY_SCREEN); } else { - Swap_InitActions(ACTIONS_PLAYER_SCREEN); - for (i = 0; i < 3; i++) - gSprites[sFactorySwapScreen->unk8[1][i]].invisible = TRUE; + Swap_InitActions(SWAP_PLAYER_SCREEN); + + // Hide "Pkmn for Swap" button + for (i = 0; i < ARRAY_COUNT(sFactorySwapScreen->pkmnForSwapButtonSpriteIds[0]); i++) + gSprites[sFactorySwapScreen->pkmnForSwapButtonSpriteIds[1][i]].invisible = TRUE; } gSprites[sFactorySwapScreen->cursorSpriteId].pos1.x = gSprites[sFactorySwapScreen->ballSpriteIds[sFactorySwapScreen->cursorPos]].pos1.x; - gTasks[sFactorySwapScreen->fadeSpeciesNameTaskId].func = Task_SwapFadeSpeciesName; - sFactorySwapScreen->unk27 = 0; - sFactorySwapScreen->unk28 = 6; - sFactorySwapScreen->unk26 = FALSE; - gTasks[sFactorySwapScreen->fadeSpeciesNameTaskId].data[0] = 1; - gTasks[taskId].data[0]++; + gTasks[sFactorySwapScreen->fadeSpeciesNameTaskId].func = Swap_Task_FadeSpeciesName; + sFactorySwapScreen->fadeSpeciesNameCoeffDelay = 0; + sFactorySwapScreen->fadeSpeciesNameCoeff = 6; + sFactorySwapScreen->fadeSpeciesNameFadeOut = FALSE; + gTasks[sFactorySwapScreen->fadeSpeciesNameTaskId].tState = FADESTATE_RUN; + gTasks[taskId].tState++; } break; case 4: - gTasks[taskId].data[0] = 0; - gTasks[taskId].data[6] = (u32)(Task_HandleSwapScreenChooseMons) >> 0x10; - gTasks[taskId].data[7] = (u32)(Task_HandleSwapScreenChooseMons); - gTasks[taskId].data[5] = 1; - gTasks[taskId].func = sub_819D770; + gTasks[taskId].tState = 0; + gTasks[taskId].tFollowUpTaskPtrHi = (u32)(Swap_Task_HandleChooseMons) >> 16; + gTasks[taskId].tFollowUpTaskPtrLo = (u32)(Swap_Task_HandleChooseMons); + gTasks[taskId].tFollowUpTaskState = STATE_CHOOSE_MONS_HANDLE_INPUT; + gTasks[taskId].func = Swap_Task_ScreenInfoTransitionIn; break; } } +#undef tFadeOutFinished + static void Swap_InitStruct(void) { if (sFactorySwapScreen == NULL) { sFactorySwapScreen = AllocZeroed(sizeof(*sFactorySwapScreen)); sFactorySwapScreen->cursorPos = 0; - sFactorySwapScreen->unk30 = FALSE; + sFactorySwapScreen->monPicAnimating = FALSE; sFactorySwapScreen->fromSummaryScreen = FALSE; } } @@ -3129,9 +3277,9 @@ static void CB2_InitSwapScreen(void) break; case 1: sSwapMenuTilesetBuffer = Alloc(0x440); - sSwapMonCardBgTilesetBuffer = AllocZeroed(0x440); - sSwapMenuTilemapBuffer = Alloc(0x800); - sSwapMonCardBgTilemapBuffer = AllocZeroed(0x800); + sSwapMonPicBgTilesetBuffer = AllocZeroed(0x440); + sSwapMenuTilemapBuffer = Alloc(BG_SCREEN_SIZE); + sSwapMonPicBgTilemapBuffer = AllocZeroed(BG_SCREEN_SIZE); ChangeBgX(0, 0, 0); ChangeBgY(0, 0, 0); ChangeBgX(1, 0, 0); @@ -3157,36 +3305,36 @@ static void CB2_InitSwapScreen(void) FreeAllSpritePalettes(); ResetAllPicSprites(); CpuCopy16(gFrontierFactorySelectMenu_Gfx, sSwapMenuTilesetBuffer, 0x440); - CpuCopy16(gUnknown_0861033C, sSwapMonCardBgTilesetBuffer, 0x60); + CpuCopy16(sMonPicBg_Gfx, sSwapMonPicBgTilesetBuffer, 0x60); LoadBgTiles(1, sSwapMenuTilesetBuffer, 0x440, 0); - LoadBgTiles(3, sSwapMonCardBgTilesetBuffer, 0x60, 0); - CpuCopy16(gFrontierFactorySelectMenu_Tilemap, sSwapMenuTilemapBuffer, 0x800); - LoadBgTilemap(1, sSwapMenuTilemapBuffer, 0x800, 0); + LoadBgTiles(3, sSwapMonPicBgTilesetBuffer, 0x60, 0); + CpuCopy16(gFrontierFactorySelectMenu_Tilemap, sSwapMenuTilemapBuffer, BG_SCREEN_SIZE); + LoadBgTilemap(1, sSwapMenuTilemapBuffer, BG_SCREEN_SIZE, 0); LoadPalette(gFrontierFactorySelectMenu_Pal, 0, 0x40); - LoadPalette(gUnknown_08610918, 0xF0, sizeof(gUnknown_08610918)); - LoadPalette(gUnknown_08610918, 0xE0, sizeof(gUnknown_08610918)); - LoadPalette(gUnknown_0861039C, 0x20, 4); + LoadPalette(sSwapText_Pal, 0xF0, sizeof(sSwapText_Pal)); + LoadPalette(sSwapText_Pal, 0xE0, sizeof(sSwapText_Pal)); + LoadPalette(sMonPicBg_Pal, 0x20, 4); gMain.state++; break; case 3: - SetBgTilemapBuffer(3, sSwapMonCardBgTilemapBuffer); - CopyToBgTilemapBufferRect(3, gUnknown_0861023C, 11, 4, 8, 8); + SetBgTilemapBuffer(3, sSwapMonPicBgTilemapBuffer); + CopyToBgTilemapBufferRect(3, sMonPicBg_Tilemap, 11, 4, 8, 8); CopyBgTilemapBufferToVram(3); gMain.state++; break; case 4: - LoadSpritePalettes(gUnknown_086106B0); - LoadSpriteSheets(gUnknown_08610650); - LoadCompressedSpriteSheet(gUnknown_086106A0); + LoadSpritePalettes(sSwap_SpritePalettes); + LoadSpriteSheets(sSwap_SpriteSheets); + LoadCompressedSpriteSheet(sSwap_BallGfx); SetVBlankCallback(Swap_VblankCb); gMain.state++; break; case 5: - #if MODERN +#ifdef UBFIX if (sFactorySwapScreen && sFactorySwapScreen->fromSummaryScreen) - #else +#else if (sFactorySwapScreen->fromSummaryScreen == TRUE) - #endif +#endif sFactorySwapScreen->cursorPos = gLastViewedMonIndex; gMain.state++; break; @@ -3195,28 +3343,28 @@ static void CB2_InitSwapScreen(void) Swap_InitAllSprites(); if (sFactorySwapScreen->fromSummaryScreen == TRUE) Swap_ShowSummaryMonSprite(); - Swap_InitActions(ACTIONS_PLAYER_SCREEN); + Swap_InitActions(SWAP_PLAYER_SCREEN); gMain.state++; break; case 7: Swap_PrintOnInfoWindow(gText_SelectPkmnToSwap); - PutWindowTilemap(2); + PutWindowTilemap(SWAP_WIN_INFO); gMain.state++; break; case 8: Swap_PrintMonCategory(); - PutWindowTilemap(8); + PutWindowTilemap(SWAP_WIN_MON_CATEGORY); gMain.state++; break; case 9: if (!sFactorySwapScreen->fromSummaryScreen) Swap_PrintMonSpecies(); - PutWindowTilemap(1); + PutWindowTilemap(SWAP_WIN_SPECIES); gMain.state++; break; case 10: Swap_PrintPkmnSwap(); - PutWindowTilemap(0); + PutWindowTilemap(SWAP_WIN_TITLE); gMain.state++; break; case 11: @@ -3224,16 +3372,16 @@ static void CB2_InitSwapScreen(void) break; case 12: if (sFactorySwapScreen->fromSummaryScreen) - Swap_PrintMonSpecies2(); + Swap_PrintMonSpeciesAtFade(); gMain.state++; break; case 13: Swap_PrintActionStrings2(); - PutWindowTilemap(3); + PutWindowTilemap(SWAP_WIN_OPTIONS); gMain.state++; break; case 14: - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, RGB_BLACK); + BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK); SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_ON | DISPCNT_OBJ_1D_MAP); ShowBg(0); ShowBg(1); @@ -3251,20 +3399,20 @@ static void CB2_InitSwapScreen(void) gMain.state++; break; case 15: - sFactorySwapScreen->fadeSpeciesNameTaskId = CreateTask(Task_SwapFadeSpeciesName, 0); + sFactorySwapScreen->fadeSpeciesNameTaskId = CreateTask(Swap_Task_FadeSpeciesName, 0); if (!sFactorySwapScreen->fromSummaryScreen) { - gTasks[sFactorySwapScreen->fadeSpeciesNameTaskId].data[0] = 0; - taskId = CreateTask(Task_HandleSwapScreenChooseMons, 0); - gTasks[taskId].data[0] = 0; + gTasks[sFactorySwapScreen->fadeSpeciesNameTaskId].tState = FADESTATE_INIT; + taskId = CreateTask(Swap_Task_HandleChooseMons, 0); + gTasks[taskId].tState = STATE_CHOOSE_MONS_INIT; } else { - sub_819EAF8(); - gTasks[sFactorySwapScreen->fadeSpeciesNameTaskId].data[0] = 1; - sFactorySwapScreen->unk22 = FALSE; - taskId = CreateTask(Task_HandleSwapScreenMenu, 0); - gTasks[taskId].data[0] = 2; + Swap_EraseActionFadeWindow(); + gTasks[sFactorySwapScreen->fadeSpeciesNameTaskId].tState = FADESTATE_RUN; + sFactorySwapScreen->fadeSpeciesNameActive = FALSE; + taskId = CreateTask(Swap_Task_HandleMenu, 0); + gTasks[taskId].tState = STATE_MENU_INIT; } SetMainCallback2(Swap_CB2); break; @@ -3277,17 +3425,17 @@ static void Swap_InitAllSprites(void) u8 x; struct SpriteTemplate spriteTemplate; - spriteTemplate = gUnknown_08610834; - spriteTemplate.paletteTag = TAG_PAL_BALL_SELECTED; + spriteTemplate = sSpriteTemplate_Swap_Pokeball; + spriteTemplate.paletteTag = PALTAG_BALL_SELECTED; - for (i = 0; i < 3; i++) + for (i = 0; i < FRONTIER_PARTY_SIZE; i++) { sFactorySwapScreen->ballSpriteIds[i] = CreateSprite(&spriteTemplate, (48 * i) + 72, 64, 1); gSprites[sFactorySwapScreen->ballSpriteIds[i]].data[0] = 0; } - sFactorySwapScreen->cursorSpriteId = CreateSprite(&gUnknown_0861084C, gSprites[sFactorySwapScreen->ballSpriteIds[sFactorySwapScreen->cursorPos]].pos1.x, 88, 0); - sFactorySwapScreen->menuCursor1SpriteId = CreateSprite(&gUnknown_08610864, 176, 112, 0); - sFactorySwapScreen->menuCursor2SpriteId = CreateSprite(&gUnknown_0861087C, 176, 144, 0); + sFactorySwapScreen->cursorSpriteId = CreateSprite(&sSpriteTemplate_Swap_Arrow, gSprites[sFactorySwapScreen->ballSpriteIds[sFactorySwapScreen->cursorPos]].pos1.x, 88, 0); + sFactorySwapScreen->menuCursor1SpriteId = CreateSprite(&sSpriteTemplate_Swap_MenuHighlightLeft, 176, 112, 0); + sFactorySwapScreen->menuCursor2SpriteId = CreateSprite(&sSpriteTemplate_Swap_MenuHighlightRight, 176, 144, 0); gSprites[sFactorySwapScreen->menuCursor1SpriteId].invisible = TRUE; gSprites[sFactorySwapScreen->menuCursor2SpriteId].invisible = TRUE; gSprites[sFactorySwapScreen->menuCursor1SpriteId].centerToCornerVecX = 0; @@ -3296,105 +3444,110 @@ static void Swap_InitAllSprites(void) gSprites[sFactorySwapScreen->menuCursor2SpriteId].centerToCornerVecY = 0; if (sFactorySwapScreen->fromSummaryScreen == TRUE) - x = 240; + x = DISPLAY_WIDTH; else - x = 192; + x = DISPLAY_WIDTH - 48; - spriteTemplate = gUnknown_0861084C; - spriteTemplate.tileTag = TAG_TILE_68; - sFactorySwapScreen->unk8[0][0] = CreateSprite(&spriteTemplate, 240, 120, 10); + // Unusual way to create sprites + // The sprite template for the selector arrow is re-used + // with the tiles swapped out + spriteTemplate = sSpriteTemplate_Swap_Arrow; + spriteTemplate.tileTag = GFXTAG_ACTION_BOX_LEFT; + sFactorySwapScreen->pkmnForSwapButtonSpriteIds[0][0] = CreateSprite(&spriteTemplate, DISPLAY_WIDTH, 120, 10); - spriteTemplate = gUnknown_08610864; - spriteTemplate.tileTag = TAG_TILE_69; - sFactorySwapScreen->unk8[0][1] = CreateSprite(&spriteTemplate, 256, 120, 10); - sFactorySwapScreen->unk8[0][2] = CreateSprite(&spriteTemplate, 288, 120, 10); + spriteTemplate = sSpriteTemplate_Swap_MenuHighlightLeft; + spriteTemplate.tileTag = GFXTAG_ACTION_BOX_RIGHT; + sFactorySwapScreen->pkmnForSwapButtonSpriteIds[0][1] = CreateSprite(&spriteTemplate, DISPLAY_WIDTH + 16, 120, 10); + sFactorySwapScreen->pkmnForSwapButtonSpriteIds[0][2] = CreateSprite(&spriteTemplate, DISPLAY_WIDTH + 48, 120, 10); - spriteTemplate = gUnknown_0861084C; - spriteTemplate.tileTag = TAG_TILE_6A; - sFactorySwapScreen->unk8[1][0] = CreateSprite(&spriteTemplate, 240, 120, 1); + spriteTemplate = sSpriteTemplate_Swap_Arrow; + spriteTemplate.tileTag = GFXTAG_ACTION_HIGHLIGHT_LEFT; + sFactorySwapScreen->pkmnForSwapButtonSpriteIds[1][0] = CreateSprite(&spriteTemplate, DISPLAY_WIDTH, 120, 1); - spriteTemplate = gUnknown_08610864; - spriteTemplate.tileTag = TAG_TILE_6B; - sFactorySwapScreen->unk8[1][1] = CreateSprite(&spriteTemplate, 256, 120, 1); - spriteTemplate.tileTag = TAG_TILE_6C; - sFactorySwapScreen->unk8[1][2] = CreateSprite(&spriteTemplate, 288, 120, 1); + spriteTemplate = sSpriteTemplate_Swap_MenuHighlightLeft; + spriteTemplate.tileTag = GFXTAG_ACTION_HIGHLIGHT_MIDDLE; + sFactorySwapScreen->pkmnForSwapButtonSpriteIds[1][1] = CreateSprite(&spriteTemplate, DISPLAY_WIDTH + 16, 120, 1); + spriteTemplate.tileTag = GFXTAG_ACTION_HIGHLIGHT_RIGHT; + sFactorySwapScreen->pkmnForSwapButtonSpriteIds[1][2] = CreateSprite(&spriteTemplate, DISPLAY_WIDTH + 48, 120, 1); - spriteTemplate = gUnknown_0861084C; - spriteTemplate.tileTag = TAG_TILE_68; - sFactorySwapScreen->unkE[0][0] = CreateSprite(&spriteTemplate, x, 144, 10); + spriteTemplate = sSpriteTemplate_Swap_Arrow; + spriteTemplate.tileTag = GFXTAG_ACTION_BOX_LEFT; + sFactorySwapScreen->cancelButtonSpriteIds[0][0] = CreateSprite(&spriteTemplate, x, 144, 10); - spriteTemplate = gUnknown_08610864; - spriteTemplate.tileTag = TAG_TILE_69; - sFactorySwapScreen->unkE[0][1] = CreateSprite(&spriteTemplate, x + 16, 144, 10); + spriteTemplate = sSpriteTemplate_Swap_MenuHighlightLeft; + spriteTemplate.tileTag = GFXTAG_ACTION_BOX_RIGHT; + sFactorySwapScreen->cancelButtonSpriteIds[0][1] = CreateSprite(&spriteTemplate, x + 16, 144, 10); - spriteTemplate = gUnknown_0861084C; - spriteTemplate.tileTag = TAG_TILE_6A; - sFactorySwapScreen->unkE[1][0] = CreateSprite(&spriteTemplate, x, 144, 1); + spriteTemplate = sSpriteTemplate_Swap_Arrow; + spriteTemplate.tileTag = GFXTAG_ACTION_HIGHLIGHT_LEFT; + sFactorySwapScreen->cancelButtonSpriteIds[1][0] = CreateSprite(&spriteTemplate, x, 144, 1); - spriteTemplate = gUnknown_08610864; - spriteTemplate.tileTag = TAG_TILE_6C; - sFactorySwapScreen->unkE[1][1] = CreateSprite(&spriteTemplate, x + 16, 144, 1); + spriteTemplate = sSpriteTemplate_Swap_MenuHighlightLeft; + spriteTemplate.tileTag = GFXTAG_ACTION_HIGHLIGHT_RIGHT; + sFactorySwapScreen->cancelButtonSpriteIds[1][1] = CreateSprite(&spriteTemplate, x + 16, 144, 1); for (i = 0; i < 2; i++) { - gSprites[sFactorySwapScreen->unk8[i][0]].centerToCornerVecX = 0; - gSprites[sFactorySwapScreen->unk8[i][0]].centerToCornerVecY = 0; - gSprites[sFactorySwapScreen->unk8[i][1]].centerToCornerVecX = 0; - gSprites[sFactorySwapScreen->unk8[i][1]].centerToCornerVecY = 0; - gSprites[sFactorySwapScreen->unk8[i][2]].centerToCornerVecX = 0; - gSprites[sFactorySwapScreen->unk8[i][2]].centerToCornerVecY = 0; - gSprites[sFactorySwapScreen->unkE[i][0]].centerToCornerVecX = 0; - gSprites[sFactorySwapScreen->unkE[i][0]].centerToCornerVecY = 0; - gSprites[sFactorySwapScreen->unkE[i][1]].centerToCornerVecX = 0; - gSprites[sFactorySwapScreen->unkE[i][1]].centerToCornerVecY = 0; + gSprites[sFactorySwapScreen->pkmnForSwapButtonSpriteIds[i][0]].centerToCornerVecX = 0; + gSprites[sFactorySwapScreen->pkmnForSwapButtonSpriteIds[i][0]].centerToCornerVecY = 0; + gSprites[sFactorySwapScreen->pkmnForSwapButtonSpriteIds[i][1]].centerToCornerVecX = 0; + gSprites[sFactorySwapScreen->pkmnForSwapButtonSpriteIds[i][1]].centerToCornerVecY = 0; + gSprites[sFactorySwapScreen->pkmnForSwapButtonSpriteIds[i][2]].centerToCornerVecX = 0; + gSprites[sFactorySwapScreen->pkmnForSwapButtonSpriteIds[i][2]].centerToCornerVecY = 0; + gSprites[sFactorySwapScreen->cancelButtonSpriteIds[i][0]].centerToCornerVecX = 0; + gSprites[sFactorySwapScreen->cancelButtonSpriteIds[i][0]].centerToCornerVecY = 0; + gSprites[sFactorySwapScreen->cancelButtonSpriteIds[i][1]].centerToCornerVecX = 0; + gSprites[sFactorySwapScreen->cancelButtonSpriteIds[i][1]].centerToCornerVecY = 0; - gSprites[sFactorySwapScreen->unk8[i][0]].invisible = TRUE; - gSprites[sFactorySwapScreen->unk8[i][1]].invisible = TRUE; - gSprites[sFactorySwapScreen->unk8[i][2]].invisible = TRUE; - gSprites[sFactorySwapScreen->unkE[i][0]].invisible = TRUE; - gSprites[sFactorySwapScreen->unkE[i][1]].invisible = TRUE; + gSprites[sFactorySwapScreen->pkmnForSwapButtonSpriteIds[i][0]].invisible = TRUE; + gSprites[sFactorySwapScreen->pkmnForSwapButtonSpriteIds[i][1]].invisible = TRUE; + gSprites[sFactorySwapScreen->pkmnForSwapButtonSpriteIds[i][2]].invisible = TRUE; + gSprites[sFactorySwapScreen->cancelButtonSpriteIds[i][0]].invisible = TRUE; + gSprites[sFactorySwapScreen->cancelButtonSpriteIds[i][1]].invisible = TRUE; } - gSprites[sFactorySwapScreen->unkE[0][0]].invisible = FALSE; - gSprites[sFactorySwapScreen->unkE[0][1]].invisible = FALSE; - gSprites[sFactorySwapScreen->unk8[0][0]].invisible = FALSE; - gSprites[sFactorySwapScreen->unk8[0][1]].invisible = FALSE; - gSprites[sFactorySwapScreen->unk8[0][2]].invisible = FALSE; + gSprites[sFactorySwapScreen->cancelButtonSpriteIds[0][0]].invisible = FALSE; + gSprites[sFactorySwapScreen->cancelButtonSpriteIds[0][1]].invisible = FALSE; + gSprites[sFactorySwapScreen->pkmnForSwapButtonSpriteIds[0][0]].invisible = FALSE; + gSprites[sFactorySwapScreen->pkmnForSwapButtonSpriteIds[0][1]].invisible = FALSE; + gSprites[sFactorySwapScreen->pkmnForSwapButtonSpriteIds[0][2]].invisible = FALSE; } static void Swap_DestroyAllSprites(void) { u8 i, j; - for (i = 0; i < 3; i++) + for (i = 0; i < FRONTIER_PARTY_SIZE; i++) DestroySprite(&gSprites[sFactorySwapScreen->ballSpriteIds[i]]); DestroySprite(&gSprites[sFactorySwapScreen->cursorSpriteId]); DestroySprite(&gSprites[sFactorySwapScreen->menuCursor1SpriteId]); DestroySprite(&gSprites[sFactorySwapScreen->menuCursor2SpriteId]); - for (i = 0; i < 2; i++) + for (i = 0; i < ARRAY_COUNT(sFactorySwapScreen->pkmnForSwapButtonSpriteIds); i++) { - for (j = 0; j < 3; j++) - DestroySprite(&gSprites[sFactorySwapScreen->unk8[i][j]]); + for (j = 0; j < ARRAY_COUNT(sFactorySwapScreen->pkmnForSwapButtonSpriteIds[0]); j++) + DestroySprite(&gSprites[sFactorySwapScreen->pkmnForSwapButtonSpriteIds[i][j]]); } - for (i = 0; i < 2; i++) + for (i = 0; i < ARRAY_COUNT(sFactorySwapScreen->cancelButtonSpriteIds); i++) { - for (j = 0; j < 2; j++) - DestroySprite(&gSprites[sFactorySwapScreen->unkE[i][j]]); + for (j = 0; j < ARRAY_COUNT(sFactorySwapScreen->cancelButtonSpriteIds[0]); j++) + DestroySprite(&gSprites[sFactorySwapScreen->cancelButtonSpriteIds[i][j]]); } } static void Swap_HandleActionCursorChange(u8 cursorId) { - if (cursorId < 3) + if (cursorId < FRONTIER_PARTY_SIZE) { + // Cursor is on one of the pokemon gSprites[sFactorySwapScreen->cursorSpriteId].invisible = FALSE; - sub_819E8EC(); + Swap_HideActionButtonHighlights(); gSprites[sFactorySwapScreen->cursorSpriteId].pos1.x = gSprites[sFactorySwapScreen->ballSpriteIds[cursorId]].pos1.x; } else { + // Cursor is on an action button gSprites[sFactorySwapScreen->cursorSpriteId].invisible = TRUE; - sub_819E838(sFactorySwapScreen->actionsData[cursorId].id); + Swap_HighlightActionButton(sFactorySwapScreen->actionsData[cursorId].id); } } @@ -3427,8 +3580,8 @@ static void Swap_UpdateActionCursorPosition(s8 direction) PlaySE(SE_SELECT); if (direction > 0) // Move cursor down. { - if (sFactorySwapScreen->cursorPos < 3) - sFactorySwapScreen->cursorPos = 3; + if (sFactorySwapScreen->cursorPos < FRONTIER_PARTY_SIZE) + sFactorySwapScreen->cursorPos = FRONTIER_PARTY_SIZE; else if (sFactorySwapScreen->cursorPos + 1 != sFactorySwapScreen->actionsCount) sFactorySwapScreen->cursorPos++; else @@ -3436,7 +3589,7 @@ static void Swap_UpdateActionCursorPosition(s8 direction) } else // Move cursor up. { - if (sFactorySwapScreen->cursorPos < 3) + if (sFactorySwapScreen->cursorPos < FRONTIER_PARTY_SIZE) sFactorySwapScreen->cursorPos = sFactorySwapScreen->actionsCount - 1; else if (sFactorySwapScreen->cursorPos != 0) sFactorySwapScreen->cursorPos--; @@ -3474,7 +3627,7 @@ static void Swap_UpdateMenuCursorPosition(s8 direction) PlaySE(SE_SELECT); if (direction > 0) // Move cursor down. { - if (sFactorySwapScreen->menuCursorPos != MENU_OPTIONS_COUNT - 1) + if (sFactorySwapScreen->menuCursorPos != ARRAY_COUNT(sSwap_MenuOptionFuncs) - 1) sFactorySwapScreen->menuCursorPos++; else sFactorySwapScreen->menuCursorPos = 0; @@ -3484,43 +3637,52 @@ static void Swap_UpdateMenuCursorPosition(s8 direction) if (sFactorySwapScreen->menuCursorPos != 0) sFactorySwapScreen->menuCursorPos--; else - sFactorySwapScreen->menuCursorPos = MENU_OPTIONS_COUNT - 1; + sFactorySwapScreen->menuCursorPos = ARRAY_COUNT(sSwap_MenuOptionFuncs) - 1; } gSprites[sFactorySwapScreen->menuCursor1SpriteId].pos1.y = (sFactorySwapScreen->menuCursorPos * 16) + 112; gSprites[sFactorySwapScreen->menuCursor2SpriteId].pos1.y = (sFactorySwapScreen->menuCursorPos * 16) + 112; } -static void sub_819E838(u8 arg0) +static void Swap_HighlightActionButton(u8 actionId) { u8 i; - for (i = 0; i < 3; i++) + for (i = 0; i < ARRAY_COUNT(sFactorySwapScreen->pkmnForSwapButtonSpriteIds[0]); i++) { - if (arg0 == 2) + if (actionId == SWAPACTION_PKMN_FOR_SWAP) { - gSprites[sFactorySwapScreen->unk8[1][i]].invisible = FALSE; - if (i < 2) - gSprites[sFactorySwapScreen->unkE[1][i]].invisible = TRUE; + // Show button highlight on "Pkmn for Swap" + gSprites[sFactorySwapScreen->pkmnForSwapButtonSpriteIds[1][i]].invisible = FALSE; + + // Hide button highlight on Cancel + if (i < ARRAY_COUNT(sFactorySwapScreen->cancelButtonSpriteIds[0])) + gSprites[sFactorySwapScreen->cancelButtonSpriteIds[1][i]].invisible = TRUE; } - else if (arg0 == 3) + else if (actionId == SWAPACTION_CANCEL) { - if (i < 2) - gSprites[sFactorySwapScreen->unkE[1][i]].invisible = FALSE; - gSprites[sFactorySwapScreen->unk8[1][i]].invisible = TRUE; + // Show button highlight on Cancel + if (i < ARRAY_COUNT(sFactorySwapScreen->cancelButtonSpriteIds[0])) + gSprites[sFactorySwapScreen->cancelButtonSpriteIds[1][i]].invisible = FALSE; + + // Hide button highlight on "Pkmn for Swap" + gSprites[sFactorySwapScreen->pkmnForSwapButtonSpriteIds[1][i]].invisible = TRUE; } } } -static void sub_819E8EC(void) +static void Swap_HideActionButtonHighlights(void) { u8 i; - for (i = 0; i < 3; i++) + for (i = 0; i < ARRAY_COUNT(sFactorySwapScreen->pkmnForSwapButtonSpriteIds[0]); i++) { - gSprites[sFactorySwapScreen->unk8[1][i]].invisible = TRUE; - if (i < 2) - gSprites[sFactorySwapScreen->unkE[1][i]].invisible = TRUE; + // Hide button highlight on "Pkmn for Swap" + gSprites[sFactorySwapScreen->pkmnForSwapButtonSpriteIds[1][i]].invisible = TRUE; + + // Hide button highlight on Cancel + if (i < ARRAY_COUNT(sFactorySwapScreen->cancelButtonSpriteIds[0])) + gSprites[sFactorySwapScreen->cancelButtonSpriteIds[1][i]].invisible = TRUE; } } @@ -3557,7 +3719,7 @@ static void Swap_ShowYesNoOptions(void) Swap_PrintYesNoOptions(); } -static void sub_819EA64(u8 windowId) +static void Swap_ErasePopupMenu(u8 windowId) { gSprites[sFactorySwapScreen->menuCursor1SpriteId].invisible = TRUE; gSprites[sFactorySwapScreen->menuCursor2SpriteId].invisible = TRUE; @@ -3566,33 +3728,33 @@ static void sub_819EA64(u8 windowId) ClearWindowTilemap(windowId); } -static void sub_819EAC0(void) +static void Swap_EraseSpeciesWindow(void) { - PutWindowTilemap(1); - FillWindowPixelBuffer(1, PIXEL_FILL(0)); - CopyWindowToVram(1, 2); + PutWindowTilemap(SWAP_WIN_SPECIES); + FillWindowPixelBuffer(SWAP_WIN_SPECIES, PIXEL_FILL(0)); + CopyWindowToVram(SWAP_WIN_SPECIES, 2); } -static void sub_819EADC(void) +static void Swap_EraseSpeciesAtFadeWindow(void) { - PutWindowTilemap(7); - FillWindowPixelBuffer(7, PIXEL_FILL(0)); - CopyWindowToVram(7, 2); + PutWindowTilemap(SWAP_WIN_SPECIES_AT_FADE); + FillWindowPixelBuffer(SWAP_WIN_SPECIES_AT_FADE, PIXEL_FILL(0)); + CopyWindowToVram(SWAP_WIN_SPECIES_AT_FADE, 2); } -static void sub_819EAF8(void) +static void Swap_EraseActionFadeWindow(void) { - sub_819EAC0(); - PutWindowTilemap(5); - FillWindowPixelBuffer(5, PIXEL_FILL(0)); - CopyWindowToVram(5, 2); + Swap_EraseSpeciesWindow(); + PutWindowTilemap(SWAP_WIN_ACTION_FADE); + FillWindowPixelBuffer(SWAP_WIN_ACTION_FADE, PIXEL_FILL(0)); + CopyWindowToVram(SWAP_WIN_ACTION_FADE, 2); } static void Swap_PrintPkmnSwap(void) { - FillWindowPixelBuffer(0, PIXEL_FILL(1)); - AddTextPrinterParameterized(0, 1, gText_PkmnSwap, 2, 1, 0, NULL); - CopyWindowToVram(0, 3); + FillWindowPixelBuffer(SWAP_WIN_TITLE, PIXEL_FILL(1)); + AddTextPrinterParameterized(SWAP_WIN_TITLE, 1, gText_PkmnSwap, 2, 1, 0, NULL); + CopyWindowToVram(SWAP_WIN_TITLE, 3); } static void Swap_PrintMonSpecies(void) @@ -3600,10 +3762,10 @@ static void Swap_PrintMonSpecies(void) u16 species; u8 x; - FillWindowPixelBuffer(1, PIXEL_FILL(0)); - if (sFactorySwapScreen->cursorPos > 2) + FillWindowPixelBuffer(SWAP_WIN_SPECIES, PIXEL_FILL(0)); + if (sFactorySwapScreen->cursorPos >= FRONTIER_PARTY_SIZE) { - CopyWindowToVram(1, 2); + CopyWindowToVram(SWAP_WIN_SPECIES, 2); } else { @@ -3614,35 +3776,35 @@ static void Swap_PrintMonSpecies(void) species = GetMonData(&gEnemyParty[monId], MON_DATA_SPECIES, NULL); StringCopy(gStringVar4, gSpeciesNames[species]); x = GetStringRightAlignXOffset(1, gStringVar4, 86); - AddTextPrinterParameterized3(1, 1, x, 1, sSwapSpeciesNameTextColors, 0, gStringVar4); - CopyWindowToVram(1, 3); + AddTextPrinterParameterized3(SWAP_WIN_SPECIES, 1, x, 1, sSwapSpeciesNameTextColors, 0, gStringVar4); + CopyWindowToVram(SWAP_WIN_SPECIES, 3); } } static void Swap_PrintOnInfoWindow(const u8 *str) { - FillWindowPixelBuffer(2, PIXEL_FILL(0)); - AddTextPrinterParameterized(2, 1, str, 2, 5, 0, NULL); - CopyWindowToVram(2, 2); + FillWindowPixelBuffer(SWAP_WIN_INFO, PIXEL_FILL(0)); + AddTextPrinterParameterized(SWAP_WIN_INFO, 1, str, 2, 5, 0, NULL); + CopyWindowToVram(SWAP_WIN_INFO, 2); } static void Swap_PrintMenuOptions(void) { - PutWindowTilemap(3); - FillWindowPixelBuffer(3, PIXEL_FILL(0)); - AddTextPrinterParameterized3(3, 1, 15, 1, sSwapMenuOptionsTextColors, 0, gText_Summary2); - AddTextPrinterParameterized3(3, 1, 15, 17, sSwapMenuOptionsTextColors, 0, gText_Swap); - AddTextPrinterParameterized3(3, 1, 15, 33, sSwapMenuOptionsTextColors, 0, gText_Rechoose); - CopyWindowToVram(3, 3); + PutWindowTilemap(SWAP_WIN_OPTIONS); + FillWindowPixelBuffer(SWAP_WIN_OPTIONS, PIXEL_FILL(0)); + AddTextPrinterParameterized3(SWAP_WIN_OPTIONS, 1, 15, 1, sSwapMenuOptionsTextColors, 0, gText_Summary2); + AddTextPrinterParameterized3(SWAP_WIN_OPTIONS, 1, 15, 17, sSwapMenuOptionsTextColors, 0, gText_Swap); + AddTextPrinterParameterized3(SWAP_WIN_OPTIONS, 1, 15, 33, sSwapMenuOptionsTextColors, 0, gText_Rechoose); + CopyWindowToVram(SWAP_WIN_OPTIONS, 3); } static void Swap_PrintYesNoOptions(void) { - PutWindowTilemap(4); - FillWindowPixelBuffer(4, PIXEL_FILL(0)); - AddTextPrinterParameterized3(4, 1, 7, 1, sSwapMenuOptionsTextColors, 0, gText_Yes3); - AddTextPrinterParameterized3(4, 1, 7, 17, sSwapMenuOptionsTextColors, 0, gText_No3); - CopyWindowToVram(4, 3); + PutWindowTilemap(SWAP_WIN_YES_NO); + FillWindowPixelBuffer(SWAP_WIN_YES_NO, PIXEL_FILL(0)); + AddTextPrinterParameterized3(SWAP_WIN_YES_NO, 1, 7, 1, sSwapMenuOptionsTextColors, 0, gText_Yes3); + AddTextPrinterParameterized3(SWAP_WIN_YES_NO, 1, 7, 17, sSwapMenuOptionsTextColors, 0, gText_No3); + CopyWindowToVram(SWAP_WIN_YES_NO, 3); } static void Swap_PrintActionString(const u8 *str, u32 y, u32 windowId) @@ -3653,30 +3815,30 @@ static void Swap_PrintActionString(const u8 *str, u32 y, u32 windowId) static void Swap_PrintActionStrings(void) { - FillWindowPixelBuffer(5, PIXEL_FILL(0)); + FillWindowPixelBuffer(SWAP_WIN_ACTION_FADE, PIXEL_FILL(0)); switch (sFactorySwapScreen->inEnemyScreen) { case TRUE: - Swap_PrintActionString(gText_PkmnForSwap, 0, 5); + Swap_PrintActionString(gText_PkmnForSwap, 0, SWAP_WIN_ACTION_FADE); case FALSE: - Swap_PrintActionString(gText_Cancel3, 24, 5); + Swap_PrintActionString(gText_Cancel3, 24, SWAP_WIN_ACTION_FADE); break; } - CopyWindowToVram(5, 3); + CopyWindowToVram(SWAP_WIN_ACTION_FADE, 3); } static void Swap_PrintActionStrings2(void) { - FillWindowPixelBuffer(3, PIXEL_FILL(0)); + FillWindowPixelBuffer(SWAP_WIN_OPTIONS, PIXEL_FILL(0)); switch (sFactorySwapScreen->inEnemyScreen) { case TRUE: - Swap_PrintActionString(gText_PkmnForSwap, 8, 3); + Swap_PrintActionString(gText_PkmnForSwap, 8, SWAP_WIN_OPTIONS); case FALSE: - Swap_PrintActionString(gText_Cancel3, 32, 3); + Swap_PrintActionString(gText_Cancel3, 32, SWAP_WIN_OPTIONS); break; } - CopyWindowToVram(3, 3); + CopyWindowToVram(SWAP_WIN_OPTIONS, 3); } static void Swap_PrintOneActionString(u8 which) @@ -3685,33 +3847,34 @@ static void Swap_PrintOneActionString(u8 which) { case 0: if (sFactorySwapScreen->inEnemyScreen == TRUE) - Swap_PrintActionString(gText_PkmnForSwap, 8, 3); + Swap_PrintActionString(gText_PkmnForSwap, 8, SWAP_WIN_OPTIONS); break; case 1: - Swap_PrintActionString(gText_Cancel3, 32, 3); + Swap_PrintActionString(gText_Cancel3, 32, SWAP_WIN_OPTIONS); break; } - CopyWindowToVram(3, 3); + CopyWindowToVram(SWAP_WIN_OPTIONS, 3); } -static void Swap_PrintMonSpecies2(void) +// For printing the species name once its selected. Keep the current fade but don't keep fading in and out +static void Swap_PrintMonSpeciesAtFade(void) { u16 species; u8 x; u16 pal[5]; - CpuCopy16(gUnknown_08610918, pal, 8); + CpuCopy16(sSwapText_Pal, pal, 8); if (!sFactorySwapScreen->fromSummaryScreen) pal[4] = gPlttBufferFaded[228]; else - pal[4] = sFactorySwapScreen->unk24; - LoadPalette(pal, 0xF0, 0xA); + pal[4] = sFactorySwapScreen->speciesNameColorBackup; + LoadPalette(pal, 0xF0, sizeof(sSwapText_Pal)); - PutWindowTilemap(7); - FillWindowPixelBuffer(7, PIXEL_FILL(0)); - if (sFactorySwapScreen->cursorPos > 2) + PutWindowTilemap(SWAP_WIN_SPECIES_AT_FADE); + FillWindowPixelBuffer(SWAP_WIN_SPECIES_AT_FADE, PIXEL_FILL(0)); + if (sFactorySwapScreen->cursorPos >= FRONTIER_PARTY_SIZE) { - CopyWindowToVram(7, 3); + CopyWindowToVram(SWAP_WIN_SPECIES_AT_FADE, 3); } else { @@ -3722,22 +3885,23 @@ static void Swap_PrintMonSpecies2(void) species = GetMonData(&gEnemyParty[monId], MON_DATA_SPECIES, NULL); StringCopy(gStringVar4, gSpeciesNames[species]); x = GetStringRightAlignXOffset(1, gStringVar4, 86); - AddTextPrinterParameterized3(7, 1, x, 1, sSwapSpeciesNameTextColors, 0, gStringVar4); - CopyWindowToVram(7, 3); + AddTextPrinterParameterized3(SWAP_WIN_SPECIES_AT_FADE, 1, x, 1, sSwapSpeciesNameTextColors, 0, gStringVar4); + CopyWindowToVram(SWAP_WIN_SPECIES_AT_FADE, 3); } } -static void Swap_PrintMonSpecies3(void) +// Reprints the species name over the faded one after a transition +static void Swap_PrintMonSpeciesForTransition(void) { u16 species; u8 x; - LoadPalette(gUnknown_08610918, 0xE0, sizeof(gUnknown_08610918)); - CpuCopy16(gPlttBufferUnfaded + 240, gPlttBufferFaded + 224, 10); + LoadPalette(sSwapText_Pal, 0xE0, sizeof(sSwapText_Pal)); + CpuCopy16(&gPlttBufferUnfaded[240], &gPlttBufferFaded[224], 10); - if (sFactorySwapScreen->cursorPos > 2) + if (sFactorySwapScreen->cursorPos >= FRONTIER_PARTY_SIZE) { - CopyWindowToVram(1, 2); + CopyWindowToVram(SWAP_WIN_SPECIES, 2); } else { @@ -3748,8 +3912,8 @@ static void Swap_PrintMonSpecies3(void) species = GetMonData(&gEnemyParty[monId], MON_DATA_SPECIES, NULL); StringCopy(gStringVar4, gSpeciesNames[species]); x = GetStringRightAlignXOffset(1, gStringVar4, 86); - AddTextPrinterParameterized3(1, 1, x, 1, sSwapSpeciesNameTextColors, 0, gStringVar4); - CopyWindowToVram(1, 3); + AddTextPrinterParameterized3(SWAP_WIN_SPECIES, 1, x, 1, sSwapSpeciesNameTextColors, 0, gStringVar4); + CopyWindowToVram(SWAP_WIN_SPECIES, 3); } } @@ -3760,22 +3924,22 @@ static void Swap_PrintMonCategory(void) u8 x; u8 monId = sFactorySwapScreen->cursorPos; - FillWindowPixelBuffer(8, PIXEL_FILL(0)); - if (monId > 2) + FillWindowPixelBuffer(SWAP_WIN_MON_CATEGORY, PIXEL_FILL(0)); + if (monId >= FRONTIER_PARTY_SIZE) { - CopyWindowToVram(8, 2); + CopyWindowToVram(SWAP_WIN_MON_CATEGORY, 2); } else { - PutWindowTilemap(8); + PutWindowTilemap(SWAP_WIN_MON_CATEGORY); if (!sFactorySwapScreen->inEnemyScreen) species = GetMonData(&gPlayerParty[monId], MON_DATA_SPECIES, NULL); else species = GetMonData(&gEnemyParty[monId], MON_DATA_SPECIES, NULL); CopyMonCategoryText(SpeciesToNationalPokedexNum(species), text); x = GetStringRightAlignXOffset(1, text, 0x76); - AddTextPrinterParameterized(8, 1, text, x, 1, 0, NULL); - CopyWindowToVram(8, 2); + AddTextPrinterParameterized(SWAP_WIN_MON_CATEGORY, 1, text, x, 1, 0, NULL); + CopyWindowToVram(SWAP_WIN_MON_CATEGORY, 2); } } @@ -3785,13 +3949,13 @@ static void Swap_InitActions(u8 id) { switch (id) { - case ACTIONS_PLAYER_SCREEN: + case SWAP_PLAYER_SCREEN: sFactorySwapScreen->inEnemyScreen = FALSE; sFactorySwapScreen->cursorPos = 0; sFactorySwapScreen->actionsCount = ARRAY_COUNT(sSwap_PlayerScreenActions); sFactorySwapScreen->actionsData = sSwap_PlayerScreenActions; break; - case ACTIONS_ENEMY_SCREEN: + case SWAP_ENEMY_SCREEN: sFactorySwapScreen->inEnemyScreen = TRUE; sFactorySwapScreen->cursorPos = 0; sFactorySwapScreen->actionsCount = ARRAY_COUNT(sSwap_EnemyScreenActions); @@ -3803,92 +3967,94 @@ static void Swap_InitActions(u8 id) static void Swap_RunMenuOptionFunc(u8 taskId) { - sSwap_CurrentTableFunc = sSwap_MenuOptionFuncs[sFactorySwapScreen->menuCursorPos]; - sSwap_CurrentTableFunc(taskId); + sSwap_CurrentOptionFunc = sSwap_MenuOptionFuncs[sFactorySwapScreen->menuCursorPos]; + sSwap_CurrentOptionFunc(taskId); } -static void sub_819F0CC(u8 taskId) +static void Swap_OptionSwap(u8 taskId) { - sub_819F3F8(sFactorySwapScreen->unk2C, &sFactorySwapScreen->unk30, TRUE); + CloseMonPic(sFactorySwapScreen->monPic, &sFactorySwapScreen->monPicAnimating, TRUE); sFactorySwapScreen->playerMonId = sFactorySwapScreen->cursorPos; - sub_819EA64(3); - gTasks[taskId].data[0] = 0; - gTasks[taskId].func = sub_819D9EC; + Swap_ErasePopupMenu(SWAP_WIN_OPTIONS); + gTasks[taskId].tState = 0; + gTasks[taskId].func = Swap_Task_SwitchPartyScreen; } -static void sub_819F114(u8 taskId) +static void Swap_OptionSummary(u8 taskId) { - gTasks[taskId].data[0] = 6; - gTasks[taskId].func = Task_FromSwapScreenToSummaryScreen; + gTasks[taskId].tState = STATE_SUMMARY_FADE; + gTasks[taskId].func = Swap_Task_OpenSummaryScreen; } -static void sub_819F134(u8 taskId) +static void Swap_OptionRechoose(u8 taskId) { - sub_819F3F8(sFactorySwapScreen->unk2C, &sFactorySwapScreen->unk30, TRUE); - sub_819EA64(3); - gTasks[taskId].data[0] = 0; - gTasks[taskId].data[6] = (u32)(Task_HandleSwapScreenChooseMons) >> 0x10; - gTasks[taskId].data[7] = (u32)(Task_HandleSwapScreenChooseMons); - gTasks[taskId].data[5] = 1; - gTasks[taskId].func = sub_819D770; + CloseMonPic(sFactorySwapScreen->monPic, &sFactorySwapScreen->monPicAnimating, TRUE); + Swap_ErasePopupMenu(SWAP_WIN_OPTIONS); + gTasks[taskId].tState = 0; + gTasks[taskId].tFollowUpTaskPtrHi = (u32)(Swap_Task_HandleChooseMons) >> 16; + gTasks[taskId].tFollowUpTaskPtrLo = (u32)(Swap_Task_HandleChooseMons); + gTasks[taskId].tFollowUpTaskState = STATE_CHOOSE_MONS_HANDLE_INPUT; + gTasks[taskId].func = Swap_Task_ScreenInfoTransitionIn; } static void Swap_RunActionFunc(u8 taskId) { - sSwap_CurrentTableFunc = sFactorySwapScreen->actionsData[sFactorySwapScreen->cursorPos].func; - sSwap_CurrentTableFunc(taskId); + sSwap_CurrentOptionFunc = sFactorySwapScreen->actionsData[sFactorySwapScreen->cursorPos].func; + sSwap_CurrentOptionFunc(taskId); } static void Swap_ActionCancel(u8 taskId) { - gTasks[taskId].data[6] = (u32)(sub_819CC24) >> 0x10; - gTasks[taskId].data[7] = (u32)(sub_819CC24); - gTasks[taskId].data[0] = 0; - gTasks[taskId].data[5] = 0; - gTasks[taskId].func = sub_819D588; + gTasks[taskId].tFollowUpTaskPtrHi = (u32)(Swap_AskQuitSwapping) >> 16; + gTasks[taskId].tFollowUpTaskPtrLo = (u32)(Swap_AskQuitSwapping); + gTasks[taskId].tState = 0; + gTasks[taskId].tFollowUpTaskState = 0; + gTasks[taskId].func = Swap_Task_ScreenInfoTransitionOut; } static void Swap_ActionPkmnForSwap(u8 taskId) { - gTasks[taskId].data[6] = (u32)(sub_819D9EC) >> 0x10; - gTasks[taskId].data[7] = (u32)(sub_819D9EC); - gTasks[taskId].data[5] = 0; - gTasks[taskId].data[0] = 0; - gTasks[taskId].func = sub_819D588; + gTasks[taskId].tFollowUpTaskPtrHi = (u32)(Swap_Task_SwitchPartyScreen) >> 16; + gTasks[taskId].tFollowUpTaskPtrLo = (u32)(Swap_Task_SwitchPartyScreen); + gTasks[taskId].tFollowUpTaskState = 0; + gTasks[taskId].tState = 0; + gTasks[taskId].func = Swap_Task_ScreenInfoTransitionOut; } static void Swap_ActionMon(u8 taskId) { if (!sFactorySwapScreen->inEnemyScreen) { - gTasks[taskId].data[6] = (u32)(Task_HandleSwapScreenMenu) >> 0x10; - gTasks[taskId].data[7] = (u32)(Task_HandleSwapScreenMenu); - gTasks[taskId].data[5] = 2; + gTasks[taskId].tFollowUpTaskPtrHi = (u32)(Swap_Task_HandleMenu) >> 16; + gTasks[taskId].tFollowUpTaskPtrLo = (u32)(Swap_Task_HandleMenu); + gTasks[taskId].tFollowUpTaskState = STATE_MENU_INIT; } else if (Swap_AlreadyHasSameSpecies(sFactorySwapScreen->cursorPos) == TRUE) { - sub_819F2B4(&sFactorySwapScreen->unk2C.field1, &sFactorySwapScreen->unk30, TRUE); - gTasks[taskId].data[0] = 0; - gTasks[taskId].data[5] = 1; - gTasks[taskId].func = Task_SwapCantHaveSameMons; + OpenMonPic(&sFactorySwapScreen->monPic.bgSpriteId, &sFactorySwapScreen->monPicAnimating, TRUE); + gTasks[taskId].tState = 0; + gTasks[taskId].tFollowUpTaskState = STATE_CHOOSE_MONS_HANDLE_INPUT; + gTasks[taskId].func = Swap_TaskCantHaveSameMons; return; } else { - gTasks[taskId].data[6] = (u32)(sub_819CCD4) >> 0x10; - gTasks[taskId].data[7] = (u32)(sub_819CCD4); - gTasks[taskId].data[5] = 0; + gTasks[taskId].tFollowUpTaskPtrHi = (u32)(Swap_AskAcceptMon) >> 16; + gTasks[taskId].tFollowUpTaskPtrLo = (u32)(Swap_AskAcceptMon); + gTasks[taskId].tFollowUpTaskState = 0; } - gTasks[taskId].data[0] = 0; - gTasks[taskId].func = sub_819D588; + gTasks[taskId].tState = 0; + gTasks[taskId].func = Swap_Task_ScreenInfoTransitionOut; } -static void sub_819F2B4(u8 *arg0, bool8 *arg1, bool8 swapScreen) +#define sIsSwapScreen data[7] + +static void OpenMonPic(u8 *spriteId, bool8 *animating, bool8 swapScreen) { - *arg0 = CreateSprite(&gUnknown_08610894, 120, 64, 1); - gSprites[*arg0].callback = sub_819F600; - gSprites[*arg0].data[7] = swapScreen; - *arg1 = TRUE; + *spriteId = CreateSprite(&sSpriteTemplate_Swap_MonPicBgAnim, 120, 64, 1); + gSprites[*spriteId].callback = SpriteCB_OpenMonPic; + gSprites[*spriteId].sIsSwapScreen = swapScreen; + *animating = TRUE; } static void Swap_ShowSummaryMonSprite(void) @@ -3897,83 +4063,83 @@ static void Swap_ShowSummaryMonSprite(void) u16 species; u32 personality, otId; - sFactorySwapScreen->unk2C.field1 = CreateSprite(&gUnknown_08610894, 120, 64, 1); - StartSpriteAffineAnim(&gSprites[sFactorySwapScreen->unk2C.field1], 2); + sFactorySwapScreen->monPic.bgSpriteId = CreateSprite(&sSpriteTemplate_Swap_MonPicBgAnim, 120, 64, 1); + StartSpriteAffineAnim(&gSprites[sFactorySwapScreen->monPic.bgSpriteId], 2); mon = &gPlayerParty[sFactorySwapScreen->cursorPos]; species = GetMonData(mon, MON_DATA_SPECIES, NULL); personality = GetMonData(mon, MON_DATA_PERSONALITY, NULL); otId = GetMonData(mon, MON_DATA_OT_ID, NULL); - #ifdef BUGFIX - sFactorySwapScreen->unk2C.field0 = CreateMonPicSprite(species, otId, personality, TRUE, 88, 32, 15, 0xFFFF); - #else - sFactorySwapScreen->unk2C.field0 = CreateMonPicSprite(species, personality, otId, TRUE, 88, 32, 15, 0xFFFF); - #endif - gSprites[sFactorySwapScreen->unk2C.field0].centerToCornerVecX = 0; - gSprites[sFactorySwapScreen->unk2C.field0].centerToCornerVecY = 0; +#ifdef BUGFIX + sFactorySwapScreen->monPic.monSpriteId = CreateMonPicSprite(species, otId, personality, TRUE, 88, 32, 15, 0xFFFF); +#else + sFactorySwapScreen->monPic.monSpriteId = CreateMonPicSprite(species, personality, otId, TRUE, 88, 32, 15, 0xFFFF); +#endif + gSprites[sFactorySwapScreen->monPic.monSpriteId].centerToCornerVecX = 0; + gSprites[sFactorySwapScreen->monPic.monSpriteId].centerToCornerVecY = 0; - gSprites[sFactorySwapScreen->unk2C.field1].invisible = TRUE; + gSprites[sFactorySwapScreen->monPic.bgSpriteId].invisible = TRUE; } -static void sub_819F3F8(struct UnkFactoryStruct arg0, bool8 *arg1, bool8 swapScreen) +static void CloseMonPic(struct FactoryMonPic pic, bool8 *animating, bool8 swapScreen) { u8 taskId; - FreeAndDestroyMonPicSprite(arg0.field0); - taskId = CreateTask(sub_819F7B4, 1); - gTasks[taskId].data[7] = swapScreen; - gTasks[taskId].data[6] = arg0.field1; + FreeAndDestroyMonPicSprite(pic.monSpriteId); + taskId = CreateTask(Task_CloseMonPic, 1); + gTasks[taskId].tIsSwapScreen = swapScreen; + gTasks[taskId].tSpriteId = pic.bgSpriteId; gTasks[taskId].func(taskId); - *arg1 = TRUE; + *animating = TRUE; } -static void sub_819F444(struct UnkFactoryStruct arg0, bool8 *arg1) +static void HideMonPic(struct FactoryMonPic pic, bool8 *animating) { - FreeAndDestroyMonPicSprite(arg0.field0); - FreeOamMatrix(gSprites[arg0.field1].oam.matrixNum); - DestroySprite(&gSprites[arg0.field1]); - *arg1 = FALSE; + FreeAndDestroyMonPicSprite(pic.monSpriteId); + FreeOamMatrix(gSprites[pic.bgSpriteId].oam.matrixNum); + DestroySprite(&gSprites[pic.bgSpriteId]); + *animating = FALSE; } -static void Task_SwapCantHaveSameMons(u8 taskId) +static void Swap_TaskCantHaveSameMons(u8 taskId) { - if (sFactorySwapScreen->unk30 == TRUE) + if (sFactorySwapScreen->monPicAnimating == TRUE) return; - switch (gTasks[taskId].data[0]) + switch (gTasks[taskId].tState) { case 0: Swap_PrintOnInfoWindow(gText_SamePkmnInPartyAlready); sFactorySwapScreen->monSwapped = FALSE; - gTasks[taskId].data[0]++; + gTasks[taskId].tState++; break; case 1: if (JOY_NEW(A_BUTTON) || JOY_NEW(B_BUTTON)) { PlaySE(SE_SELECT); - sub_819F3F8(sFactorySwapScreen->unk2C, &sFactorySwapScreen->unk30, TRUE); - gTasks[taskId].data[0]++; + CloseMonPic(sFactorySwapScreen->monPic, &sFactorySwapScreen->monPicAnimating, TRUE); + gTasks[taskId].tState++; } break; case 2: - if (sFactorySwapScreen->unk30 != TRUE) + if (sFactorySwapScreen->monPicAnimating != TRUE) { - FillWindowPixelBuffer(5, PIXEL_FILL(0)); - CopyWindowToVram(5, 2); - gTasks[taskId].data[0]++; + FillWindowPixelBuffer(SWAP_WIN_ACTION_FADE, PIXEL_FILL(0)); + CopyWindowToVram(SWAP_WIN_ACTION_FADE, 2); + gTasks[taskId].tState++; } break; case 3: Swap_PrintOnInfoWindow(gText_SelectPkmnToAccept); - gTasks[taskId].data[0]++; + gTasks[taskId].tState++; break; case 4: - Swap_PrintMonSpecies3(); - sub_819EADC(); - sFactorySwapScreen->unk22 = TRUE; - gTasks[taskId].data[0] = gTasks[taskId].data[5]; - gTasks[taskId].func = Task_HandleSwapScreenChooseMons; + Swap_PrintMonSpeciesForTransition(); + Swap_EraseSpeciesAtFadeWindow(); + sFactorySwapScreen->fadeSpeciesNameActive = TRUE; + gTasks[taskId].tState = gTasks[taskId].tFollowUpTaskState; + gTasks[taskId].func = Swap_Task_HandleChooseMons; break; } } @@ -3983,7 +4149,7 @@ static bool8 Swap_AlreadyHasSameSpecies(u8 monId) u8 i; u16 species = GetMonData(&gEnemyParty[monId], MON_DATA_SPECIES, NULL); - for (i = 0; i < 3; i++) + for (i = 0; i < FRONTIER_PARTY_SIZE; i++) { if (i != sFactorySwapScreen->playerMonId && (u16)(GetMonData(&gPlayerParty[i], MON_DATA_SPECIES, NULL)) == species) return TRUE; @@ -3991,120 +4157,126 @@ static bool8 Swap_AlreadyHasSameSpecies(u8 monId) return FALSE; } -static void sub_819F600(struct Sprite *sprite) +static void SpriteCB_OpenMonPic(struct Sprite *sprite) { u8 taskId; if (sprite->affineAnimEnded) { sprite->invisible = TRUE; - taskId = CreateTask(sub_819F69C, 1); - gTasks[taskId].data[7] = sprite->data[7]; + taskId = CreateTask(Task_OpenMonPic, 1); + gTasks[taskId].tIsSwapScreen = sprite->sIsSwapScreen; gTasks[taskId].func(taskId); sprite->callback = SpriteCallbackDummy; } } -static void sub_819F654(struct Sprite *sprite) +static void SpriteCB_CloseMonPic(struct Sprite *sprite) { if (sprite->affineAnimEnded) { FreeOamMatrix(sprite->oam.matrixNum); - if (sprite->data[7] == TRUE) - sFactorySwapScreen->unk30 = FALSE; + if (sprite->sIsSwapScreen == TRUE) + sFactorySwapScreen->monPicAnimating = FALSE; else - sub_819BE20(FALSE); + Select_SetMonPicAnimating(FALSE); DestroySprite(sprite); } } -static void sub_819F69C(u8 taskId) +static void Task_OpenMonPic(u8 taskId) { struct Task *task = &gTasks[taskId]; - switch (task->data[0]) + switch (task->tState) { case 0: - task->data[3] = 88; - task->data[24] = 152; // BUG: writing outside the array's bounds. - task->data[5] = 64; - task->data[8] = 65; + // Init + task->tWinLeft = 88; + task->tWinRight = DISPLAY_WIDTH - 88; + task->tWinTop = 64; + task->tWinBottom = 65; SetGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_WIN0_ON); - SetGpuReg(REG_OFFSET_WIN0H, WIN_RANGE(task->data[3], task->data[24])); - SetGpuReg(REG_OFFSET_WIN0V, WIN_RANGE(task->data[5], task->data[8])); + SetGpuReg(REG_OFFSET_WIN0H, WIN_RANGE(task->tWinLeft, task->tWinRight)); + SetGpuReg(REG_OFFSET_WIN0V, WIN_RANGE(task->tWinTop, task->tWinBottom)); SetGpuReg(REG_OFFSET_WININ, WININ_WIN0_BG_ALL | WININ_WIN0_CLR | WININ_WIN0_OBJ); SetGpuReg(REG_OFFSET_WINOUT, WINOUT_WIN01_BG0 | WINOUT_WIN01_BG1 | WINOUT_WIN01_BG2 | WINOUT_WIN01_CLR | WINOUT_WIN01_OBJ); break; case 1: + // Show mon pic bg ShowBg(3); SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT1_BG3 | BLDCNT_EFFECT_BLEND | BLDCNT_TGT2_BG1 | BLDCNT_TGT2_OBJ); SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(11, 4)); break; case 2: - task->data[5] -= 4; - task->data[8] += 4; - if (task->data[5] <= 32 || task->data[8] >= 96) + // Animate mon pic bg + task->tWinTop -= 4; + task->tWinBottom += 4; + if (task->tWinTop <= 32 || task->tWinBottom >= 96) { - task->data[5] = 32; - task->data[8] = 96; + task->tWinTop = 32; + task->tWinBottom = 96; } - SetGpuReg(REG_OFFSET_WIN0V, WIN_RANGE(task->data[5], task->data[8])); - if (task->data[5] != 32) + SetGpuReg(REG_OFFSET_WIN0V, WIN_RANGE(task->tWinTop, task->tWinBottom)); + if (task->tWinTop != 32) return; break; default: DestroyTask(taskId); // UB: Should not use the task after it has been deleted. - if (gTasks[taskId].data[7] == TRUE) - Swap_ShowMonSprite(); + if (gTasks[taskId].tIsSwapScreen == TRUE) + Swap_CreateMonSprite(); else - Summary_ShowMonSprite(); + Select_CreateMonSprite(); return; } - task->data[0]++; + task->tState++; } -static void sub_819F7B4(u8 taskId) +static void Task_CloseMonPic(u8 taskId) { struct Task *task = &gTasks[taskId]; - switch (task->data[0]) + switch (task->tState) { + case 0: + // Init + task->tWinLeft = 88; + task->tWinRight = DISPLAY_WIDTH - 88; + task->tWinTop = 32; + task->tWinBottom = 96; + SetGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_WIN0_ON); + SetGpuReg(REG_OFFSET_WIN0H, WIN_RANGE(task->tWinLeft, task->tWinRight)); + SetGpuReg(REG_OFFSET_WIN0V, WIN_RANGE(task->tWinTop, task->tWinBottom)); + SetGpuReg(REG_OFFSET_WININ, WININ_WIN0_BG_ALL | WININ_WIN0_CLR | WININ_WIN0_OBJ); + SetGpuReg(REG_OFFSET_WINOUT, WINOUT_WIN01_BG0 | WINOUT_WIN01_BG1 | WINOUT_WIN01_BG2 | WINOUT_WIN01_CLR | WINOUT_WIN01_OBJ); + task->tState++; + break; + case 1: + // Animate bg + task->tWinTop += 4; + task->tWinBottom -= 4; + if (task->tWinTop >= 64 || task->tWinBottom <= 65) + { + task->tWinTop = 64; + task->tWinBottom = 65; + } + SetGpuReg(REG_OFFSET_WIN0V, WIN_RANGE(task->tWinTop, task->tWinBottom)); + if (task->tWinTop == 64) + task->tState++; + break; default: + // Hide bg HideBg(3); - gSprites[task->data[6]].data[7] = task->data[7]; - gSprites[task->data[6]].invisible = FALSE; - gSprites[task->data[6]].callback = sub_819F654; - StartSpriteAffineAnim(&gSprites[task->data[6]], 1); + gSprites[task->tSpriteId].sIsSwapScreen = task->tIsSwapScreen; + gSprites[task->tSpriteId].invisible = FALSE; + gSprites[task->tSpriteId].callback = SpriteCB_CloseMonPic; + StartSpriteAffineAnim(&gSprites[task->tSpriteId], 1); ClearGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_WIN0_ON); DestroyTask(taskId); break; - case 0: - task->data[3] = 88; - task->data[24] = 152; // BUG: writing outside the array's bounds. - task->data[5] = 32; - task->data[8] = 96; - SetGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_WIN0_ON); - SetGpuReg(REG_OFFSET_WIN0H, WIN_RANGE(task->data[3], task->data[24])); - SetGpuReg(REG_OFFSET_WIN0V, WIN_RANGE(task->data[5], task->data[8])); - SetGpuReg(REG_OFFSET_WININ, WININ_WIN0_BG_ALL | WININ_WIN0_CLR | WININ_WIN0_OBJ); - SetGpuReg(REG_OFFSET_WINOUT, WINOUT_WIN01_BG0 | WINOUT_WIN01_BG1 | WINOUT_WIN01_BG2 | WINOUT_WIN01_CLR | WINOUT_WIN01_OBJ); - task->data[0]++; - break; - case 1: - task->data[5] += 4; - task->data[8] -= 4; - if (task->data[5] >= 64 || task->data[8] <= 65) - { - task->data[5] = 64; - task->data[8] = 65; - } - SetGpuReg(REG_OFFSET_WIN0V, WIN_RANGE(task->data[5], task->data[8])); - if (task->data[5] == 64) - task->data[0]++; - break; } } -static void Swap_ShowMonSprite(void) +static void Swap_CreateMonSprite(void) { struct Pokemon *mon; u16 species; @@ -4119,9 +4291,9 @@ static void Swap_ShowMonSprite(void) personality = GetMonData(mon, MON_DATA_PERSONALITY, NULL); otId = GetMonData(mon, MON_DATA_OT_ID, NULL); - sFactorySwapScreen->unk2C.field0 = CreateMonPicSprite(species, otId, personality, TRUE, 88, 32, 15, 0xFFFF); - gSprites[sFactorySwapScreen->unk2C.field0].centerToCornerVecX = 0; - gSprites[sFactorySwapScreen->unk2C.field0].centerToCornerVecY = 0; + sFactorySwapScreen->monPic.monSpriteId = CreateMonPicSprite(species, otId, personality, TRUE, 88, 32, 15, 0xFFFF); + gSprites[sFactorySwapScreen->monPic.monSpriteId].centerToCornerVecX = 0; + gSprites[sFactorySwapScreen->monPic.monSpriteId].centerToCornerVecY = 0; - sFactorySwapScreen->unk30 = FALSE; + sFactorySwapScreen->monPicAnimating = FALSE; } diff --git a/src/battle_gfx_sfx_util.c b/src/battle_gfx_sfx_util.c index a1712a027..d09b7f018 100644 --- a/src/battle_gfx_sfx_util.c +++ b/src/battle_gfx_sfx_util.c @@ -988,11 +988,11 @@ void BattleLoadSubstituteOrMonSpriteGfx(u8 battlerId, bool8 loadMonSprite) position = GetBattlerPosition(battlerId); if (IsContest()) - LZDecompressVram(gSubstituteDollTilemap, gMonSpritesGfxPtr->sprites.ptr[position]); + LZDecompressVram(gSubstituteDollBackGfx, gMonSpritesGfxPtr->sprites.ptr[position]); else if (GetBattlerSide(battlerId) != B_SIDE_PLAYER) - LZDecompressVram(gSubstituteDollGfx, gMonSpritesGfxPtr->sprites.ptr[position]); + LZDecompressVram(gSubstituteDollFrontGfx, gMonSpritesGfxPtr->sprites.ptr[position]); else - LZDecompressVram(gSubstituteDollTilemap, gMonSpritesGfxPtr->sprites.ptr[position]); + LZDecompressVram(gSubstituteDollBackGfx, gMonSpritesGfxPtr->sprites.ptr[position]); for (i = 1; i < 4; i++) { diff --git a/src/battle_interface.c b/src/battle_interface.c index adbef019d..df123630c 100644 --- a/src/battle_interface.c +++ b/src/battle_interface.c @@ -1897,7 +1897,6 @@ static void UpdateNickInHealthbox(u8 healthboxSpriteId, struct Pokemon *mon) { u8 nickname[POKEMON_NAME_LENGTH + 1]; void *ptr; - const u8 *genderTxt; u32 windowId, spriteTileNum; u8 *windowTileData; u16 species; diff --git a/src/battle_intro.c b/src/battle_intro.c index 36ff325f5..2d5e602d1 100644 --- a/src/battle_intro.c +++ b/src/battle_intro.c @@ -357,7 +357,7 @@ static void BattleIntroSlide3(u8 taskId) SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(8, 8)); SetGpuReg(REG_OFFSET_BLDY, 0); gTasks[taskId].data[4] = BLDALPHA_BLEND(8, 8); - if (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000)) + if (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_RECORDED_LINK)) { gTasks[taskId].data[2] = 16; gTasks[taskId].data[0]++; diff --git a/src/battle_main.c b/src/battle_main.c index 9b79a4fe6..16ae72c28 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -572,13 +572,9 @@ const u8 * const gStatusConditionStringsTable[7][2] = {gStatusConditionString_LoveJpn, gText_Love} }; -static const u8 sPkblToEscapeFactor[][3] = {{0, 0, 0}, {3, 5, 0}, {2, 3, 0}, {1, 2, 0}, {1, 1, 0}}; -static const u8 sGoNearCounterToCatchFactor[] = {4, 3, 2, 1}; -static const u8 sGoNearCounterToEscapeFactor[] = {4, 4, 4, 4}; - +// code void CB2_InitBattle(void) { - u32 i; MoveSaveBlocks_ResetHeap(); AllocateBattleResources(); AllocateBattleSpritesData(); @@ -1112,7 +1108,7 @@ static void CB2_HandleStartBattle(void) SetMainCallback2(BattleMainCB2); if (gBattleTypeFlags & BATTLE_TYPE_LINK) { - gBattleTypeFlags |= BATTLE_TYPE_20; + gBattleTypeFlags |= BATTLE_TYPE_LINK_IN_BATTLE; } } break; @@ -1366,7 +1362,7 @@ static void CB2_HandleStartMultiPartnerBattle(void) SetMainCallback2(BattleMainCB2); if (gBattleTypeFlags & BATTLE_TYPE_LINK) { - gBattleTypeFlags |= BATTLE_TYPE_20; + gBattleTypeFlags |= BATTLE_TYPE_LINK_IN_BATTLE; } } break; @@ -1818,7 +1814,7 @@ static void CB2_HandleStartMultiBattle(void) if (gBattleTypeFlags & BATTLE_TYPE_LINK) { gTrainerBattleOpponent_A = TRAINER_LINK_OPPONENT; - gBattleTypeFlags |= BATTLE_TYPE_20; + gBattleTypeFlags |= BATTLE_TYPE_LINK_IN_BATTLE; } } break; @@ -1971,7 +1967,7 @@ static u8 CreateNPCTrainerParty(struct Pokemon *party, u16 trainerNum, bool8 fir nameHash += gSpeciesNames[partyData[i].species][j]; personalityValue += nameHash << 8; - fixedIV = partyData[i].iv * 31 / 255; + fixedIV = partyData[i].iv * MAX_PER_STAT_IVS / 255; CreateMon(&party[i], partyData[i].species, partyData[i].lvl, fixedIV, TRUE, personalityValue, OT_ID_RANDOM_NO_SHINY, 0); break; } @@ -1983,7 +1979,7 @@ static u8 CreateNPCTrainerParty(struct Pokemon *party, u16 trainerNum, bool8 fir nameHash += gSpeciesNames[partyData[i].species][j]; personalityValue += nameHash << 8; - fixedIV = partyData[i].iv * 31 / 255; + fixedIV = partyData[i].iv * MAX_PER_STAT_IVS / 255; CreateMon(&party[i], partyData[i].species, partyData[i].lvl, fixedIV, TRUE, personalityValue, OT_ID_RANDOM_NO_SHINY, 0); for (j = 0; j < MAX_MON_MOVES; j++) @@ -2001,7 +1997,7 @@ static u8 CreateNPCTrainerParty(struct Pokemon *party, u16 trainerNum, bool8 fir nameHash += gSpeciesNames[partyData[i].species][j]; personalityValue += nameHash << 8; - fixedIV = partyData[i].iv * 31 / 255; + fixedIV = partyData[i].iv * MAX_PER_STAT_IVS / 255; CreateMon(&party[i], partyData[i].species, partyData[i].lvl, fixedIV, TRUE, personalityValue, OT_ID_RANDOM_NO_SHINY, 0); SetMonData(&party[i], MON_DATA_HELD_ITEM, &partyData[i].heldItem); @@ -2015,7 +2011,7 @@ static u8 CreateNPCTrainerParty(struct Pokemon *party, u16 trainerNum, bool8 fir nameHash += gSpeciesNames[partyData[i].species][j]; personalityValue += nameHash << 8; - fixedIV = partyData[i].iv * 31 / 255; + fixedIV = partyData[i].iv * MAX_PER_STAT_IVS / 255; CreateMon(&party[i], partyData[i].species, partyData[i].lvl, fixedIV, TRUE, personalityValue, OT_ID_RANDOM_NO_SHINY, 0); SetMonData(&party[i], MON_DATA_HELD_ITEM, &partyData[i].heldItem); @@ -2182,7 +2178,7 @@ void sub_8038D64(void) SetHBlankCallback(NULL); SetVBlankCallback(NULL); - gBattleTypeFlags &= ~(BATTLE_TYPE_20); + gBattleTypeFlags &= ~(BATTLE_TYPE_LINK_IN_BATTLE); if (gBattleTypeFlags & BATTLE_TYPE_FRONTIER) { @@ -2798,7 +2794,7 @@ void SpriteCb_OpponentMonFromBall(struct Sprite *sprite) { if (sprite->affineAnimEnded) { - if (!(gHitMarker & HITMARKER_NO_ANIMATIONS) || gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000)) + if (!(gHitMarker & HITMARKER_NO_ANIMATIONS) || gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_RECORDED_LINK)) { if (HasTwoFramesAnimation(sprite->sSpeciesId)) StartSpriteAnim(sprite, 1); @@ -3036,7 +3032,7 @@ static void BattleStartClearSetData(void) if (!(gBattleTypeFlags & BATTLE_TYPE_LINK) && gSaveBlock2Ptr->optionsBattleSceneOff == TRUE) gHitMarker |= HITMARKER_NO_ANIMATIONS; } - else if (!(gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000)) && GetBattleSceneInRecordedBattle()) + else if (!(gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_RECORDED_LINK)) && GetBattleSceneInRecordedBattle()) gHitMarker |= HITMARKER_NO_ANIMATIONS; gBattleScripting.battleStyle = gSaveBlock2Ptr->optionsBattleStyle; @@ -3391,7 +3387,7 @@ static void BattleIntroDrawTrainersOrMonsSprites(void) && !(gBattleTypeFlags & (BATTLE_TYPE_EREADER_TRAINER | BATTLE_TYPE_FRONTIER | BATTLE_TYPE_LINK - | BATTLE_TYPE_x2000000 + | BATTLE_TYPE_RECORDED_LINK | BATTLE_TYPE_TRAINER_HILL))) { HandleSetPokedexFlag(SpeciesToNationalPokedexNum(gBattleMons[gActiveBattler].species), FLAG_SET_SEEN, gBattleMons[gActiveBattler].personality); @@ -3404,7 +3400,7 @@ static void BattleIntroDrawTrainersOrMonsSprites(void) if (!(gBattleTypeFlags & (BATTLE_TYPE_EREADER_TRAINER | BATTLE_TYPE_FRONTIER | BATTLE_TYPE_LINK - | BATTLE_TYPE_x2000000 + | BATTLE_TYPE_RECORDED_LINK | BATTLE_TYPE_TRAINER_HILL))) { HandleSetPokedexFlag(SpeciesToNationalPokedexNum(gBattleMons[gActiveBattler].species), FLAG_SET_SEEN, gBattleMons[gActiveBattler].personality); @@ -3539,9 +3535,9 @@ static void BattleIntroPrintOpponentSendsOut(void) if (!(gBattleTypeFlags & BATTLE_TYPE_RECORDED)) position = B_POSITION_OPPONENT_LEFT; - else if (gBattleTypeFlags & BATTLE_TYPE_x2000000) + else if (gBattleTypeFlags & BATTLE_TYPE_RECORDED_LINK) { - if (gBattleTypeFlags & BATTLE_TYPE_x80000000) + if (gBattleTypeFlags & BATTLE_TYPE_RECORDED_IS_MASTER) position = B_POSITION_OPPONENT_LEFT; else position = B_POSITION_PLAYER_LEFT; @@ -3559,9 +3555,9 @@ static void BattleIntroOpponent2SendsOutMonAnimation(void) if (!(gBattleTypeFlags & BATTLE_TYPE_RECORDED)) position = B_POSITION_OPPONENT_RIGHT; - else if (gBattleTypeFlags & BATTLE_TYPE_x2000000) + else if (gBattleTypeFlags & BATTLE_TYPE_RECORDED_LINK) { - if (gBattleTypeFlags & BATTLE_TYPE_x80000000) + if (gBattleTypeFlags & BATTLE_TYPE_RECORDED_IS_MASTER) position = B_POSITION_OPPONENT_RIGHT; else position = B_POSITION_PLAYER_RIGHT; @@ -3587,9 +3583,9 @@ static void BattleIntroOpponent1SendsOutMonAnimation(void) if (gBattleTypeFlags & BATTLE_TYPE_RECORDED) { - if (gBattleTypeFlags & BATTLE_TYPE_x2000000) + if (gBattleTypeFlags & BATTLE_TYPE_RECORDED_LINK) { - if (gBattleTypeFlags & BATTLE_TYPE_x80000000) + if (gBattleTypeFlags & BATTLE_TYPE_RECORDED_IS_MASTER) position = B_POSITION_OPPONENT_LEFT; else position = B_POSITION_PLAYER_LEFT; @@ -3630,7 +3626,7 @@ static void BattleIntroRecordMonsToDex(void) && !(gBattleTypeFlags & (BATTLE_TYPE_EREADER_TRAINER | BATTLE_TYPE_FRONTIER | BATTLE_TYPE_LINK - | BATTLE_TYPE_x2000000 + | BATTLE_TYPE_RECORDED_LINK | BATTLE_TYPE_TRAINER_HILL))) { HandleSetPokedexFlag(SpeciesToNationalPokedexNum(gBattleMons[gActiveBattler].species), FLAG_SET_SEEN, gBattleMons[gActiveBattler].personality); @@ -3654,9 +3650,9 @@ static void BattleIntroPrintPlayerSendsOut(void) if (!(gBattleTypeFlags & BATTLE_TYPE_RECORDED)) position = B_POSITION_PLAYER_LEFT; - else if (gBattleTypeFlags & BATTLE_TYPE_x2000000) + else if (gBattleTypeFlags & BATTLE_TYPE_RECORDED_LINK) { - if (gBattleTypeFlags & BATTLE_TYPE_x80000000) + if (gBattleTypeFlags & BATTLE_TYPE_RECORDED_IS_MASTER) position = B_POSITION_PLAYER_LEFT; else position = B_POSITION_OPPONENT_LEFT; @@ -3677,9 +3673,9 @@ static void BattleIntroPlayer2SendsOutMonAnimation(void) if (!(gBattleTypeFlags & BATTLE_TYPE_RECORDED)) position = B_POSITION_PLAYER_RIGHT; - else if (gBattleTypeFlags & BATTLE_TYPE_x2000000) + else if (gBattleTypeFlags & BATTLE_TYPE_RECORDED_LINK) { - if (gBattleTypeFlags & BATTLE_TYPE_x80000000) + if (gBattleTypeFlags & BATTLE_TYPE_RECORDED_IS_MASTER) position = B_POSITION_PLAYER_RIGHT; else position = B_POSITION_OPPONENT_RIGHT; @@ -3709,9 +3705,9 @@ static void BattleIntroPlayer1SendsOutMonAnimation(void) if (!(gBattleTypeFlags & BATTLE_TYPE_RECORDED)) position = B_POSITION_PLAYER_LEFT; - else if (gBattleTypeFlags & BATTLE_TYPE_x2000000) + else if (gBattleTypeFlags & BATTLE_TYPE_RECORDED_LINK) { - if (gBattleTypeFlags & BATTLE_TYPE_x80000000) + if (gBattleTypeFlags & BATTLE_TYPE_RECORDED_IS_MASTER) position = B_POSITION_PLAYER_LEFT; else position = B_POSITION_OPPONENT_LEFT; @@ -4150,7 +4146,7 @@ static void HandleTurnActionSelectionState(void) if (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_FRONTIER_NO_PYRAMID | BATTLE_TYPE_EREADER_TRAINER - | BATTLE_TYPE_x2000000)) + | BATTLE_TYPE_RECORDED_LINK)) { RecordedBattle_ClearBattlerAction(gActiveBattler, 1); gSelectionBattleScripts[gActiveBattler] = BattleScript_ActionSelectionItemsCantBeUsed; @@ -4258,7 +4254,7 @@ static void HandleTurnActionSelectionState(void) return; } else if (gBattleTypeFlags & BATTLE_TYPE_TRAINER - && !(gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000)) + && !(gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_RECORDED_LINK)) && gBattleBufferB[gActiveBattler][1] == B_ACTION_RUN) { BattleScriptExecute(BattleScript_PrintCantRunFromTrainer); @@ -4569,7 +4565,7 @@ u8 GetWhoStrikesFirst(u8 battler1, u8 battler2, bool8 ignoreChosenMoves) } // badge boost - if (!(gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000 | BATTLE_TYPE_FRONTIER)) + if (!(gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_RECORDED_LINK | BATTLE_TYPE_FRONTIER)) && FlagGet(FLAG_BADGE03_GET) && GetBattlerSide(battler1) == B_SIDE_PLAYER) { @@ -4603,7 +4599,7 @@ u8 GetWhoStrikesFirst(u8 battler1, u8 battler2, bool8 ignoreChosenMoves) } // badge boost - if (!(gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000 | BATTLE_TYPE_FRONTIER)) + if (!(gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_RECORDED_LINK | BATTLE_TYPE_FRONTIER)) && FlagGet(FLAG_BADGE03_GET) && GetBattlerSide(battler2) == B_SIDE_PLAYER) { @@ -4887,7 +4883,7 @@ static void HandleEndTurn_BattleWon(void) { gCurrentActionFuncId = 0; - if (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000)) + if (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_RECORDED_LINK)) { gSpecialVar_Result = gBattleOutcome; gBattleTextBuff1[0] = gBattleOutcome; @@ -4945,7 +4941,7 @@ static void HandleEndTurn_BattleLost(void) { gCurrentActionFuncId = 0; - if (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000)) + if (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_RECORDED_LINK)) { if (gBattleTypeFlags & BATTLE_TYPE_FRONTIER) { @@ -5026,7 +5022,7 @@ static void HandleEndTurn_FinishBattle(void) if (gCurrentActionFuncId == B_ACTION_TRY_FINISH || gCurrentActionFuncId == B_ACTION_FINISHED) { if (!(gBattleTypeFlags & (BATTLE_TYPE_LINK - | BATTLE_TYPE_x2000000 + | BATTLE_TYPE_RECORDED_LINK | BATTLE_TYPE_FIRST_BATTLE | BATTLE_TYPE_SAFARI | BATTLE_TYPE_EREADER_TRAINER @@ -5053,7 +5049,7 @@ static void HandleEndTurn_FinishBattle(void) } if (!(gBattleTypeFlags & (BATTLE_TYPE_LINK - | BATTLE_TYPE_x2000000 + | BATTLE_TYPE_RECORDED_LINK | BATTLE_TYPE_TRAINER | BATTLE_TYPE_FIRST_BATTLE | BATTLE_TYPE_SAFARI diff --git a/src/battle_message.c b/src/battle_message.c index 727c7080c..247f9688a 100644 --- a/src/battle_message.c +++ b/src/battle_message.c @@ -180,7 +180,7 @@ static const u8 sText_PkmnStayedAwakeUsing[] = _("{B_DEF_NAME_WITH_PREFIX} staye static const u8 sText_PkmnStoringEnergy[] = _("{B_ATK_NAME_WITH_PREFIX} is storing\nenergy!"); static const u8 sText_PkmnUnleashedEnergy[] = _("{B_ATK_NAME_WITH_PREFIX} unleashed\nenergy!"); static const u8 sText_PkmnFatigueConfusion[] = _("{B_ATK_NAME_WITH_PREFIX} became\nconfused due to fatigue!"); -static const u8 sText_PkmnPickedUpItem[] = _("{B_PLAYER_NAME} picked up\n¥{B_BUFF1}!\p"); +static const u8 sText_PlayerPickedUpMoney[] = _("{B_PLAYER_NAME} picked up\n¥{B_BUFF1}!\p"); static const u8 sText_PkmnUnaffected[] = _("{B_DEF_NAME_WITH_PREFIX} is\nunaffected!"); static const u8 sText_PkmnTransformedInto[] = _("{B_ATK_NAME_WITH_PREFIX} transformed\ninto {B_BUFF1}!"); static const u8 sText_PkmnMadeSubstitute[] = _("{B_ATK_NAME_WITH_PREFIX} made\na SUBSTITUTE!"); @@ -340,9 +340,9 @@ static const u8 sText_ButItFailed[] = _("But it failed!"); static const u8 sText_ItHurtConfusion[] = _("It hurt itself in its\nconfusion!"); static const u8 sText_MirrorMoveFailed[] = _("The MIRROR MOVE failed!"); static const u8 sText_StartedToRain[] = _("It started to rain!"); -static const u8 sText_DownpourStarted[] = _("A downpour started!"); +static const u8 sText_DownpourStarted[] = _("A downpour started!"); // corresponds to DownpourText in pokegold and pokecrystal and is used by Rain Dance in GSC static const u8 sText_RainContinues[] = _("Rain continues to fall."); -static const u8 sText_DownpourContinues[] = _("The downpour continues."); +static const u8 sText_DownpourContinues[] = _("The downpour continues."); // unused static const u8 sText_RainStopped[] = _("The rain stopped."); static const u8 sText_SandstormBrewed[] = _("A sandstorm brewed!"); static const u8 sText_SandstormRages[] = _("The sandstorm rages."); @@ -632,7 +632,7 @@ const u8 * const gBattleStringsTable[BATTLESTRINGS_COUNT] = [STRINGID_PKMNSTORINGENERGY - 12] = sText_PkmnStoringEnergy, [STRINGID_PKMNUNLEASHEDENERGY - 12] = sText_PkmnUnleashedEnergy, [STRINGID_PKMNFATIGUECONFUSION - 12] = sText_PkmnFatigueConfusion, - [STRINGID_PKMNPICKEDUPITEM - 12] = sText_PkmnPickedUpItem, + [STRINGID_PLAYERPICKEDUPMONEY - 12] = sText_PlayerPickedUpMoney, [STRINGID_PKMNUNAFFECTED - 12] = sText_PkmnUnaffected, [STRINGID_PKMNTRANSFORMEDINTO - 12] = sText_PkmnTransformedInto, [STRINGID_PKMNMADESUBSTITUTE - 12] = sText_PkmnMadeSubstitute, @@ -2009,9 +2009,9 @@ void BufferStringBattle(u16 stringID) case STRINGID_INTROMSG: // first battle msg if (gBattleTypeFlags & BATTLE_TYPE_TRAINER) { - if (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000)) + if (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_RECORDED_LINK)) { - if (gBattleTypeFlags & BATTLE_TYPE_x800000) + if (gBattleTypeFlags & BATTLE_TYPE_TOWER_LINK_MULTI) { stringPtr = sText_TwoTrainersWantToBattle; } @@ -2079,18 +2079,18 @@ void BufferStringBattle(u16 stringID) { if (gBattleTypeFlags & BATTLE_TYPE_TWO_OPPONENTS) stringPtr = sText_TwoTrainersSentPkmn; - else if (gBattleTypeFlags & BATTLE_TYPE_x800000) + else if (gBattleTypeFlags & BATTLE_TYPE_TOWER_LINK_MULTI) stringPtr = sText_TwoTrainersSentPkmn; else if (gBattleTypeFlags & BATTLE_TYPE_MULTI) stringPtr = sText_TwoLinkTrainersSentOutPkmn; - else if (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000)) + else if (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_RECORDED_LINK)) stringPtr = sText_LinkTrainerSentOutTwoPkmn; else stringPtr = sText_Trainer1SentOutTwoPkmn; } else { - if (!(gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000))) + if (!(gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_RECORDED_LINK))) stringPtr = sText_Trainer1SentOutPkmn; else if (gTrainerBattleOpponent_A == TRAINER_UNION_ROOM) stringPtr = sText_Trainer1SentOutPkmn; @@ -2113,7 +2113,7 @@ void BufferStringBattle(u16 stringID) } else { - if (gTrainerBattleOpponent_A == TRAINER_LINK_OPPONENT || gBattleTypeFlags & BATTLE_TYPE_x2000000) + if (gTrainerBattleOpponent_A == TRAINER_LINK_OPPONENT || gBattleTypeFlags & BATTLE_TYPE_RECORDED_LINK) { if (gBattleTypeFlags & BATTLE_TYPE_MULTI) stringPtr = sText_LinkTrainer2WithdrewPkmn; @@ -2140,9 +2140,9 @@ void BufferStringBattle(u16 stringID) } else { - if (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000)) + if (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_RECORDED_LINK)) { - if (gBattleTypeFlags & BATTLE_TYPE_x800000) + if (gBattleTypeFlags & BATTLE_TYPE_TOWER_LINK_MULTI) { if (gBattleScripting.battler == 1) stringPtr = sText_Trainer1SentOutPkmn2; @@ -2210,7 +2210,7 @@ void BufferStringBattle(u16 stringID) switch (gBattleTextBuff1[0]) { case B_OUTCOME_WON: - if (gBattleTypeFlags & BATTLE_TYPE_x800000) + if (gBattleTypeFlags & BATTLE_TYPE_TOWER_LINK_MULTI) stringPtr = sText_TwoInGameTrainersDefeated; else stringPtr = sText_TwoLinkTrainersDefeated; @@ -2336,8 +2336,8 @@ u32 BattleStringExpandPlaceholders(const u8 *src, u8 *dst) u8 multiplayerId; s32 i; - if (gBattleTypeFlags & BATTLE_TYPE_x2000000) - multiplayerId = gUnknown_0203C7B4; + if (gBattleTypeFlags & BATTLE_TYPE_RECORDED_LINK) + multiplayerId = gRecordedBattleMultiplayerId; else multiplayerId = GetMultiplayerId(); @@ -2477,7 +2477,7 @@ u32 BattleStringExpandPlaceholders(const u8 *src, u8 *dst) toCpy = gMoveNames[gBattleMsgDataPtr->originallyUsedMove]; break; case B_TXT_LAST_ITEM: // last used item - if (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000)) + if (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_RECORDED_LINK)) { if (gLastUsedItem == ITEM_ENIGMA_BERRY) { @@ -2858,7 +2858,7 @@ static void ExpandBattleTextBuffPlaceholders(const u8 *src, u8 *dst) break; case B_BUFF_ITEM: // item name hword = T1_READ_16(&src[srcID + 1]); - if (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000)) + if (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_RECORDED_LINK)) { if (hword == ITEM_ENIGMA_BERRY) { @@ -3018,7 +3018,7 @@ void BattlePutTextOnWindow(const u8 *text, u8 windowId) if (windowId == 0 || windowId == 0x16) { - if (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000)) + if (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_RECORDED_LINK)) speed = 1; else if (gBattleTypeFlags & BATTLE_TYPE_RECORDED) speed = sRecordedBattleTextSpeeds[GetTextSpeedInRecordedBattle()]; diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 22f6bf503..ffae4f526 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -2713,7 +2713,7 @@ void SetMoveEffect(bool8 primary, u8 certain) (BATTLE_TYPE_EREADER_TRAINER | BATTLE_TYPE_FRONTIER | BATTLE_TYPE_LINK - | BATTLE_TYPE_x2000000 + | BATTLE_TYPE_RECORDED_LINK | BATTLE_TYPE_SECRET_BASE))) { gBattlescriptCurrInstr++; @@ -2722,7 +2722,7 @@ void SetMoveEffect(bool8 primary, u8 certain) (BATTLE_TYPE_EREADER_TRAINER | BATTLE_TYPE_FRONTIER | BATTLE_TYPE_LINK - | BATTLE_TYPE_x2000000 + | BATTLE_TYPE_RECORDED_LINK | BATTLE_TYPE_SECRET_BASE)) && (gWishFutureKnock.knockedOffMons[side] & gBitTable[gBattlerPartyIndexes[gBattlerAttacker]])) { @@ -3228,7 +3228,7 @@ static void Cmd_getexp(void) case 0: // check if should receive exp at all if (GetBattlerSide(gBattlerFainted) != B_SIDE_OPPONENT || (gBattleTypeFlags & (BATTLE_TYPE_LINK - | BATTLE_TYPE_x2000000 + | BATTLE_TYPE_RECORDED_LINK | BATTLE_TYPE_TRAINER_HILL | BATTLE_TYPE_FRONTIER | BATTLE_TYPE_SAFARI @@ -3533,7 +3533,7 @@ static void Cmd_unknown_24(void) if (HP_count == 0) gBattleOutcome |= B_OUTCOME_WON; - if (gBattleOutcome == 0 && (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000))) + if (gBattleOutcome == 0 && (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_RECORDED_LINK))) { s32 foundPlayer = 0; s32 foundOpponent; @@ -4634,7 +4634,7 @@ static void Cmd_switchinanim(void) if (GetBattlerSide(gActiveBattler) == B_SIDE_OPPONENT && !(gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_EREADER_TRAINER - | BATTLE_TYPE_x2000000 + | BATTLE_TYPE_RECORDED_LINK | BATTLE_TYPE_TRAINER_HILL | BATTLE_TYPE_FRONTIER))) HandleSetPokedexFlag(SpeciesToNationalPokedexNum(gBattleMons[gActiveBattler].species), FLAG_SET_SEEN, gBattleMons[gActiveBattler].personality); @@ -4691,7 +4691,7 @@ static void Cmd_jumpifcantswitch(void) } else if (gBattleTypeFlags & BATTLE_TYPE_MULTI) { - if (gBattleTypeFlags & BATTLE_TYPE_x800000) + if (gBattleTypeFlags & BATTLE_TYPE_TOWER_LINK_MULTI) { if (GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER) { @@ -7137,7 +7137,7 @@ static void Cmd_forcerandomswitch(void) party = gEnemyParty; if ((gBattleTypeFlags & BATTLE_TYPE_BATTLE_TOWER && gBattleTypeFlags & BATTLE_TYPE_LINK) - || (gBattleTypeFlags & BATTLE_TYPE_BATTLE_TOWER && gBattleTypeFlags & BATTLE_TYPE_x2000000) + || (gBattleTypeFlags & BATTLE_TYPE_BATTLE_TOWER && gBattleTypeFlags & BATTLE_TYPE_RECORDED_LINK) || (gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER)) { if ((gBattlerTarget & BIT_FLANK) != 0) @@ -7156,7 +7156,7 @@ static void Cmd_forcerandomswitch(void) battler1PartyId = gBattlerPartyIndexes[gBattlerTarget ^ BIT_FLANK]; } else if ((gBattleTypeFlags & BATTLE_TYPE_MULTI && gBattleTypeFlags & BATTLE_TYPE_LINK) - || (gBattleTypeFlags & BATTLE_TYPE_MULTI && gBattleTypeFlags & BATTLE_TYPE_x2000000)) + || (gBattleTypeFlags & BATTLE_TYPE_MULTI && gBattleTypeFlags & BATTLE_TYPE_RECORDED_LINK)) { if (GetLinkTrainerFlankId(GetBattlerMultiplayerId(gBattlerTarget)) == 1) { @@ -7256,8 +7256,8 @@ static void Cmd_forcerandomswitch(void) if ((gBattleTypeFlags & BATTLE_TYPE_LINK && gBattleTypeFlags & BATTLE_TYPE_BATTLE_TOWER) || (gBattleTypeFlags & BATTLE_TYPE_LINK && gBattleTypeFlags & BATTLE_TYPE_MULTI) - || (gBattleTypeFlags & BATTLE_TYPE_x2000000 && gBattleTypeFlags & BATTLE_TYPE_BATTLE_TOWER) - || (gBattleTypeFlags & BATTLE_TYPE_x2000000 && gBattleTypeFlags & BATTLE_TYPE_MULTI)) + || (gBattleTypeFlags & BATTLE_TYPE_RECORDED_LINK && gBattleTypeFlags & BATTLE_TYPE_BATTLE_TOWER) + || (gBattleTypeFlags & BATTLE_TYPE_RECORDED_LINK && gBattleTypeFlags & BATTLE_TYPE_MULTI)) { SwitchPartyOrderLinkMulti(gBattlerTarget, i, 0); SwitchPartyOrderLinkMulti(gBattlerTarget ^ BIT_FLANK, i, 1); @@ -7337,7 +7337,7 @@ static void Cmd_tryconversiontypechange(void) // randomly changes user's type to static void Cmd_givepaydaymoney(void) { - if (!(gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000)) && gPaydayMoney != 0) + if (!(gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_RECORDED_LINK)) && gPaydayMoney != 0) { u32 bonusMoney = gPaydayMoney * gBattleStruct->moneyMultiplier; AddMoney(&gSaveBlock1Ptr->money, bonusMoney); @@ -9044,7 +9044,7 @@ static void Cmd_tryswapitems(void) // trick | BATTLE_TYPE_EREADER_TRAINER | BATTLE_TYPE_FRONTIER | BATTLE_TYPE_SECRET_BASE - | BATTLE_TYPE_x2000000)))) + | BATTLE_TYPE_RECORDED_LINK)))) { gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1); } @@ -9058,7 +9058,7 @@ static void Cmd_tryswapitems(void) // trick | BATTLE_TYPE_EREADER_TRAINER | BATTLE_TYPE_FRONTIER | BATTLE_TYPE_SECRET_BASE - | BATTLE_TYPE_x2000000)) + | BATTLE_TYPE_RECORDED_LINK)) && (gWishFutureKnock.knockedOffMons[sideAttacker] & gBitTable[gBattlerPartyIndexes[gBattlerAttacker]] || gWishFutureKnock.knockedOffMons[sideTarget] & gBitTable[gBattlerPartyIndexes[gBattlerTarget]])) { diff --git a/src/battle_setup.c b/src/battle_setup.c index 40b5993f0..0a5e7e8b4 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -607,7 +607,7 @@ static void CB2_EndWildBattle(void) else { SetMainCallback2(CB2_ReturnToField); - gFieldCallback = sub_80AF6F0; + gFieldCallback = FieldCB_ReturnToFieldNoScriptCheckMusic; } } diff --git a/src/battle_tower.c b/src/battle_tower.c index ee75feeb4..51d695f9b 100644 --- a/src/battle_tower.c +++ b/src/battle_tower.c @@ -775,7 +775,7 @@ struct { { .species = SPECIES_METANG, - .fixedIV = 31, + .fixedIV = MAX_PER_STAT_IVS, .level = 42, .nature = NATURE_BRAVE, .evs = {0, 252, 252, 0, 6, 0}, @@ -783,7 +783,7 @@ struct }, { .species = SPECIES_SKARMORY, - .fixedIV = 31, + .fixedIV = MAX_PER_STAT_IVS, .level = 43, .nature = NATURE_IMPISH, .evs = {252, 0, 0, 0, 6, 252}, @@ -791,7 +791,7 @@ struct }, { .species = SPECIES_AGGRON, - .fixedIV = 31, + .fixedIV = MAX_PER_STAT_IVS, .level = 44, .nature = NATURE_ADAMANT, .evs = {0, 252, 0, 0, 252, 6}, @@ -1854,7 +1854,7 @@ static void FillFactoryFrontierTrainerParty(u16 trainerId, u8 firstMonId) } else { - fixedIV = 31; + fixedIV = MAX_PER_STAT_IVS; } level = SetFacilityPtrsGetLevel(); @@ -2024,7 +2024,7 @@ void DoSpecialTrainerBattle(void) gBattleTypeFlags |= BATTLE_TYPE_DOUBLE | BATTLE_TYPE_INGAME_PARTNER | BATTLE_TYPE_MULTI | BATTLE_TYPE_TWO_OPPONENTS; break; case FRONTIER_MODE_LINK_MULTIS: - gBattleTypeFlags |= BATTLE_TYPE_DOUBLE | BATTLE_TYPE_LINK | BATTLE_TYPE_MULTI | BATTLE_TYPE_x800000; + gBattleTypeFlags |= BATTLE_TYPE_DOUBLE | BATTLE_TYPE_LINK | BATTLE_TYPE_MULTI | BATTLE_TYPE_TOWER_LINK_MULTI; FillFrontierTrainersParties(FRONTIER_MULTI_PARTY_SIZE); break; } @@ -3295,7 +3295,7 @@ static u8 GetFrontierTrainerFixedIvs(u16 trainerId) else if (trainerId <= FRONTIER_TRAINER_TESS) // 200 - 219 fixedIv = 21; else // 220+ (- 299) - fixedIv = 31; + fixedIv = MAX_PER_STAT_IVS; return fixedIv; } @@ -3521,7 +3521,7 @@ bool32 ValidateBattleTowerRecord(u8 recordId) // unused void TrySetLinkBattleTowerEnemyPartyLevel(void) { - if (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000)) + if (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_RECORDED_LINK)) { s32 i; u8 enemyLevel = SetFacilityPtrsGetLevel(); diff --git a/src/battle_tv.c b/src/battle_tv.c index 7e311fdab..8c8ea90ab 100644 --- a/src/battle_tv.c +++ b/src/battle_tv.c @@ -8,15 +8,68 @@ #include "constants/moves.h" #include "battle_message.h" #include "tv.h" +#include "constants/battle_move_effects.h" // this file's functions -static bool8 sub_817E0B8(u16 stringId); +static bool8 IsNotSpecialBattleString(u16 stringId); static void AddMovePoints(u8 caseId, u16 arg1, u8 arg2, u8 arg3); static void TrySetBattleSeminarShow(void); static void AddPointsOnFainting(bool8 targetFainted); static void AddPointsBasedOnWeather(u16 weatherFlags, u16 moveId, u8 moveSlot); static bool8 ShouldCalculateDamage(u16 moveId, s32 *dmg, u16 *powerOverride); +#define TABLE_END ((u16)-1) + +enum { + PTS_MOVE_EFFECT, + PTS_EFFECTIVENESS, + PTS_SET_UP, // Broadly. Used by Wish, Future Sight, Ingrain, etc. + PTS_RAIN, + PTS_SUN, + PTS_SANDSTORM, + PTS_HAIL, + PTS_ELECTRIC, + PTS_STATUS_DMG, + PTS_STATUS, + PTS_SPIKES, + PTS_WATER_SPORT, + PTS_MUD_SPORT, + PTS_REFLECT, + PTS_LIGHT_SCREEN, + PTS_SAFEGUARD, + PTS_MIST, + PTS_BREAK_WALL, + PTS_CRITICAL_HIT, + PTS_FAINT, + PTS_FAINT_SET_UP, + PTS_FLINCHED, + PTS_STAT_INCREASE_1, + PTS_STAT_INCREASE_2, + PTS_STAT_DECREASE_SELF, + PTS_STAT_DECREASE_1, + PTS_STAT_DECREASE_2, + PTS_STAT_INCREASE_NOT_SELF, +}; + +enum { + FNT_NONE, + FNT_CURSE, + FNT_LEECH_SEED, + FNT_POISON, + FNT_BURN, + FNT_NIGHTMARE, + FNT_WRAP, + FNT_SPIKES, + FNT_FUTURE_SIGHT, + FNT_DOOM_DESIRE, + FNT_PERISH_SONG, + FNT_DESTINY_BOND, + FNT_CONFUSION, + FNT_EXPLOSION, + FNT_RECOIL, + FNT_OTHER, +}; + // const rom data static const u16 sVariableDmgMoves[] = { @@ -26,180 +79,462 @@ static const u16 sVariableDmgMoves[] = MOVE_WATER_SPOUT, MOVE_DREAM_EATER, MOVE_WEATHER_BALL, MOVE_SNORE, MOVE_PAIN_SPLIT, MOVE_GUILLOTINE, MOVE_FRUSTRATION, MOVE_RETURN, MOVE_ENDEAVOR, - MOVE_PRESENT, MOVE_REVENGE, 0xFFFF, + MOVE_PRESENT, MOVE_REVENGE, TABLE_END, // those are handled by the function itself - MOVE_MAGNITUDE, MOVE_PSYWAVE, 0xFFFF + MOVE_MAGNITUDE, MOVE_PSYWAVE, TABLE_END }; -static const u16 sUnknown_0860A4E0[] = +static const u16 sPoints_MoveEffect[NUM_BATTLE_MOVE_EFFECTS] = { - 0x0001, 0x0001, 0x0001, 0x0004, 0x0001, 0x0001, 0x0001, 0x0000, 0x0005, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0002, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0005, 0x0005, 0x0004, 0x0005, 0x0001, 0x0003, 0x0001, - 0x0003, 0x0005, 0x0001, 0x0007, 0x0001, 0x0007, 0x0007, 0x0001, 0x0005, 0x0002, 0x0004, 0x0001, 0x0001, 0x0001, 0x0005, 0x0001, - 0x0002, 0x0004, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0007, 0x0004, 0x0004, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0004, 0x0001, 0x0001, 0x0001, 0x0004, - 0x0005, 0x0002, 0x0004, 0x0001, 0x0004, 0x0001, 0x0007, 0x0002, 0x0001, 0x0005, 0x0007, 0x0003, 0x0003, 0x0004, 0x0003, 0x0003, - 0x0003, 0x0003, 0x0003, 0x0002, 0x0004, 0x0001, 0x0005, 0x0001, 0x0001, 0x0004, 0x0005, 0x0003, 0x0001, 0x0002, 0x0001, 0x0005, - 0x0004, 0x0003, 0x0006, 0x0004, 0x0003, 0x0003, 0x0003, 0x0002, 0x0004, 0x0001, 0x0001, 0x0001, 0x0005, 0x0001, 0x0001, 0x0007, - 0x0002, 0x0002, 0x0001, 0x0001, 0x0004, 0x0004, 0x0004, 0x0001, 0x0004, 0x0004, 0x0001, 0x0001, 0x0001, 0x0001, 0x0007, 0x0007, - 0x0006, 0x0003, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0002, 0x0003, 0x0001, 0x0001, 0x0004, 0x0004, - 0x0003, 0x0003, 0x0003, 0x0001, 0x0004, 0x0007, 0x0007, 0x0005, 0x0007, 0x0001, 0x0007, 0x0001, 0x0005, 0x0000, 0x0004, 0x0004, - 0x0004, 0x0004, 0x0004, 0x0002, 0x0002, 0x0006, 0x0003, 0x0006, 0x0004, 0x0004, 0x0002, 0x0005, 0x0002, 0x0001, 0x0001, 0x0006, - 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, 0x0002, 0x0006, 0x0001, 0x0004, 0x0001, 0x0001, 0x0003, 0x0001, 0x0001, 0x0001, - 0x0001, 0x0001, 0x0004, 0x0001, 0x0001, 0x0003 + [EFFECT_HIT] = 1, + [EFFECT_SLEEP] = 1, + [EFFECT_POISON_HIT] = 1, + [EFFECT_ABSORB] = 4, + [EFFECT_BURN_HIT] = 1, + [EFFECT_FREEZE_HIT] = 1, + [EFFECT_PARALYZE_HIT] = 1, + [EFFECT_EXPLOSION] = 0, + [EFFECT_DREAM_EATER] = 5, + [EFFECT_MIRROR_MOVE] = 1, + [EFFECT_ATTACK_UP] = 1, + [EFFECT_DEFENSE_UP] = 1, + [EFFECT_SPEED_UP] = 1, + [EFFECT_SPECIAL_ATTACK_UP] = 1, + [EFFECT_SPECIAL_DEFENSE_UP] = 1, + [EFFECT_ACCURACY_UP] = 1, + [EFFECT_EVASION_UP] = 1, + [EFFECT_ALWAYS_HIT] = 2, + [EFFECT_ATTACK_DOWN] = 1, + [EFFECT_DEFENSE_DOWN] = 1, + [EFFECT_SPEED_DOWN] = 1, + [EFFECT_SPECIAL_ATTACK_DOWN] = 1, + [EFFECT_SPECIAL_DEFENSE_DOWN] = 1, + [EFFECT_ACCURACY_DOWN] = 1, + [EFFECT_EVASION_DOWN] = 1, + [EFFECT_HAZE] = 5, + [EFFECT_BIDE] = 5, + [EFFECT_RAMPAGE] = 4, + [EFFECT_ROAR] = 5, + [EFFECT_MULTI_HIT] = 1, + [EFFECT_CONVERSION] = 3, + [EFFECT_FLINCH_HIT] = 1, + [EFFECT_RESTORE_HP] = 3, + [EFFECT_TOXIC] = 5, + [EFFECT_PAY_DAY] = 1, + [EFFECT_LIGHT_SCREEN] = 7, + [EFFECT_TRI_ATTACK] = 1, + [EFFECT_REST] = 7, + [EFFECT_OHKO] = 7, + [EFFECT_RAZOR_WIND] = 1, + [EFFECT_SUPER_FANG] = 5, + [EFFECT_DRAGON_RAGE] = 2, + [EFFECT_TRAP] = 4, + [EFFECT_HIGH_CRITICAL] = 1, + [EFFECT_DOUBLE_HIT] = 1, + [EFFECT_RECOIL_IF_MISS] = 1, + [EFFECT_MIST] = 5, + [EFFECT_FOCUS_ENERGY] = 1, + [EFFECT_RECOIL] = 2, + [EFFECT_CONFUSE] = 4, + [EFFECT_ATTACK_UP_2] = 1, + [EFFECT_DEFENSE_UP_2] = 1, + [EFFECT_SPEED_UP_2] = 1, + [EFFECT_SPECIAL_ATTACK_UP_2] = 1, + [EFFECT_SPECIAL_DEFENSE_UP_2] = 1, + [EFFECT_ACCURACY_UP_2] = 1, + [EFFECT_EVASION_UP_2] = 1, + [EFFECT_TRANSFORM] = 0, + [EFFECT_ATTACK_DOWN_2] = 1, + [EFFECT_DEFENSE_DOWN_2] = 1, + [EFFECT_SPEED_DOWN_2] = 1, + [EFFECT_SPECIAL_ATTACK_DOWN_2] = 1, + [EFFECT_SPECIAL_DEFENSE_DOWN_2] = 1, + [EFFECT_ACCURACY_DOWN_2] = 1, + [EFFECT_EVASION_DOWN_2] = 1, + [EFFECT_REFLECT] = 7, + [EFFECT_POISON] = 4, + [EFFECT_PARALYZE] = 4, + [EFFECT_ATTACK_DOWN_HIT] = 1, + [EFFECT_DEFENSE_DOWN_HIT] = 1, + [EFFECT_SPEED_DOWN_HIT] = 1, + [EFFECT_SPECIAL_ATTACK_DOWN_HIT] = 1, + [EFFECT_SPECIAL_DEFENSE_DOWN_HIT] = 1, + [EFFECT_ACCURACY_DOWN_HIT] = 1, + [EFFECT_EVASION_DOWN_HIT] = 1, + [EFFECT_SKY_ATTACK] = 4, + [EFFECT_CONFUSE_HIT] = 1, + [EFFECT_TWINEEDLE] = 1, + [EFFECT_VITAL_THROW] = 1, + [EFFECT_SUBSTITUTE] = 4, + [EFFECT_RECHARGE] = 5, + [EFFECT_RAGE] = 2, + [EFFECT_MIMIC] = 4, + [EFFECT_METRONOME] = 1, + [EFFECT_LEECH_SEED] = 4, + [EFFECT_SPLASH] = 1, + [EFFECT_DISABLE] = 7, + [EFFECT_LEVEL_DAMAGE] = 2, + [EFFECT_PSYWAVE] = 1, + [EFFECT_COUNTER] = 5, + [EFFECT_ENCORE] = 7, + [EFFECT_PAIN_SPLIT] = 3, + [EFFECT_SNORE] = 3, + [EFFECT_CONVERSION_2] = 4, + [EFFECT_LOCK_ON] = 3, + [EFFECT_SKETCH] = 3, + [EFFECT_UNUSED_60] = 3, + [EFFECT_SLEEP_TALK] = 3, + [EFFECT_DESTINY_BOND] = 3, + [EFFECT_FLAIL] = 2, + [EFFECT_SPITE] = 4, + [EFFECT_FALSE_SWIPE] = 1, + [EFFECT_HEAL_BELL] = 5, + [EFFECT_QUICK_ATTACK] = 1, + [EFFECT_TRIPLE_KICK] = 1, + [EFFECT_THIEF] = 4, + [EFFECT_MEAN_LOOK] = 5, + [EFFECT_NIGHTMARE] = 3, + [EFFECT_MINIMIZE] = 1, + [EFFECT_CURSE] = 2, + [EFFECT_UNUSED_6E] = 1, + [EFFECT_PROTECT] = 5, + [EFFECT_SPIKES] = 4, + [EFFECT_FORESIGHT] = 3, + [EFFECT_PERISH_SONG] = 6, + [EFFECT_SANDSTORM] = 4, + [EFFECT_ENDURE] = 3, + [EFFECT_ROLLOUT] = 3, + [EFFECT_SWAGGER] = 3, + [EFFECT_FURY_CUTTER] = 2, + [EFFECT_ATTRACT] = 4, + [EFFECT_RETURN] = 1, + [EFFECT_PRESENT] = 1, + [EFFECT_FRUSTRATION] = 1, + [EFFECT_SAFEGUARD] = 5, + [EFFECT_THAW_HIT] = 1, + [EFFECT_MAGNITUDE] = 1, + [EFFECT_BATON_PASS] = 7, + [EFFECT_PURSUIT] = 2, + [EFFECT_RAPID_SPIN] = 2, + [EFFECT_SONICBOOM] = 1, + [EFFECT_UNUSED_83] = 1, + [EFFECT_MORNING_SUN] = 4, + [EFFECT_SYNTHESIS] = 4, + [EFFECT_MOONLIGHT] = 4, + [EFFECT_HIDDEN_POWER] = 1, + [EFFECT_RAIN_DANCE] = 4, + [EFFECT_SUNNY_DAY] = 4, + [EFFECT_DEFENSE_UP_HIT] = 1, + [EFFECT_ATTACK_UP_HIT] = 1, + [EFFECT_ALL_STATS_UP_HIT] = 1, + [EFFECT_UNUSED_8D] = 1, + [EFFECT_BELLY_DRUM] = 7, + [EFFECT_PSYCH_UP] = 7, + [EFFECT_MIRROR_COAT] = 6, + [EFFECT_SKULL_BASH] = 3, + [EFFECT_TWISTER] = 1, + [EFFECT_EARTHQUAKE] = 1, + [EFFECT_FUTURE_SIGHT] = 1, + [EFFECT_GUST] = 1, + [EFFECT_FLINCH_MINIMIZE_HIT] = 1, + [EFFECT_SOLARBEAM] = 1, + [EFFECT_THUNDER] = 1, + [EFFECT_TELEPORT] = 1, + [EFFECT_BEAT_UP] = 2, + [EFFECT_SEMI_INVULNERABLE] = 3, + [EFFECT_DEFENSE_CURL] = 1, + [EFFECT_SOFTBOILED] = 1, + [EFFECT_FAKE_OUT] = 4, + [EFFECT_UPROAR] = 4, + [EFFECT_STOCKPILE] = 3, + [EFFECT_SPIT_UP] = 3, + [EFFECT_SWALLOW] = 3, + [EFFECT_UNUSED_A3] = 1, + [EFFECT_HAIL] = 4, + [EFFECT_TORMENT] = 7, + [EFFECT_FLATTER] = 7, + [EFFECT_WILL_O_WISP] = 5, + [EFFECT_MEMENTO] = 7, + [EFFECT_FACADE] = 1, + [EFFECT_FOCUS_PUNCH] = 7, + [EFFECT_SMELLINGSALT] = 1, + [EFFECT_FOLLOW_ME] = 5, + [EFFECT_NATURE_POWER] = 0, + [EFFECT_CHARGE] = 4, + [EFFECT_TAUNT] = 4, + [EFFECT_HELPING_HAND] = 4, + [EFFECT_TRICK] = 4, + [EFFECT_ROLE_PLAY] = 4, + [EFFECT_WISH] = 2, + [EFFECT_ASSIST] = 2, + [EFFECT_INGRAIN] = 6, + [EFFECT_SUPERPOWER] = 3, + [EFFECT_MAGIC_COAT] = 6, + [EFFECT_RECYCLE] = 4, + [EFFECT_REVENGE] = 4, + [EFFECT_BRICK_BREAK] = 2, + [EFFECT_YAWN] = 5, + [EFFECT_KNOCK_OFF] = 2, + [EFFECT_ENDEAVOR] = 1, + [EFFECT_ERUPTION] = 1, + [EFFECT_SKILL_SWAP] = 6, + [EFFECT_IMPRISON] = 6, + [EFFECT_REFRESH] = 6, + [EFFECT_GRUDGE] = 1, + [EFFECT_SNATCH] = 1, + [EFFECT_LOW_KICK] = 1, + [EFFECT_SECRET_POWER] = 1, + [EFFECT_DOUBLE_EDGE] = 2, + [EFFECT_TEETER_DANCE] = 6, + [EFFECT_BLAZE_KICK] = 1, + [EFFECT_MUD_SPORT] = 4, + [EFFECT_POISON_FANG] = 1, + [EFFECT_WEATHER_BALL] = 1, + [EFFECT_OVERHEAT] = 3, + [EFFECT_TICKLE] = 1, + [EFFECT_COSMIC_POWER] = 1, + [EFFECT_SKY_UPPERCUT] = 1, + [EFFECT_BULK_UP] = 1, + [EFFECT_POISON_TAIL] = 1, + [EFFECT_WATER_SPORT] = 4, + [EFFECT_CALM_MIND] = 1, + [EFFECT_DRAGON_DANCE] = 1, + [EFFECT_CAMOUFLAGE] = 3 }; -static const u16 sUnknown_0860A68C[] = + +static const u16 sPoints_Effectiveness[] = { - 0x0004, 0xfffd, 0xfffa + 4, // Super Effective + -3, // Not Very Effective + -6 // No Effect }; -static const u16 sUnknown_0860A692[] = +static const u16 sPoints_SetUp[] = { - 0x0004, 0x0004, 0x0006, 0x0006, 0x0007, 0x0006, 0x0002 + 4, // Future Sight + 4, // Doom Desire + 6, + 6, // Wish + 7, // Grudge + 6, + 2 // Ingrain }; -static const u16 sUnknown_0860A6A0[] = +static const u16 sPoints_RainMoves[] = { - 0x0091, 0x0003, 0x00fa, 0x0003, 0x00be, 0x0003, 0x0080, 0x0003, 0x006e, 0x0003, 0x0098, 0x0003, 0x0143, 0x0003, 0x0123, 0x0003, - 0x007f, 0x0003, 0x014a, 0x0003, 0x0039, 0x0003, 0x0134, 0x0003, 0x0038, 0x0003, 0x003d, 0x0003, 0x015a, 0x0000, 0x0037, 0x0003, - 0x0160, 0x0003, 0x0137, 0x0003, 0x0057, 0x0003, 0x004c, 0xfffc, 0x013b, 0xfffc, 0x00ac, 0xfffc, 0x0035, 0xfffc, 0x00dd, 0xfffc, - 0x007e, 0xfffc, 0x0101, 0xfffc, 0x0034, 0xfffc, 0x0133, 0xfffc, 0x012b, 0xfffc, 0x011c, 0xfffc, 0x0053, 0xfffc, 0x0007, 0xfffc, - 0x004c, 0xfffc, 0xffff, 0x0000 + MOVE_BUBBLE, 3, + MOVE_WHIRLPOOL, 3, + MOVE_OCTAZOOKA, 3, + MOVE_CLAMP, 3, + MOVE_WITHDRAW, 3, + MOVE_CRABHAMMER, 3, + MOVE_WATER_SPOUT, 3, + MOVE_DIVE, 3, + MOVE_WATERFALL, 3, + MOVE_MUDDY_WATER, 3, + MOVE_SURF, 3, + MOVE_HYDRO_CANNON, 3, + MOVE_HYDRO_PUMP, 3, + MOVE_BUBBLE_BEAM, 3, + MOVE_WATER_SPORT, 0, // Unnecessary, unlisted moves are already given 0 points + MOVE_WATER_GUN, 3, + MOVE_WATER_PULSE, 3, + MOVE_WEATHER_BALL, 3, + MOVE_THUNDER, 3, + MOVE_SOLAR_BEAM, -4, + MOVE_OVERHEAT, -4, + MOVE_FLAME_WHEEL, -4, + MOVE_FLAMETHROWER, -4, + MOVE_SACRED_FIRE, -4, + MOVE_FIRE_BLAST, -4, + MOVE_HEAT_WAVE, -4, + MOVE_EMBER, -4, + MOVE_BLAST_BURN, -4, + MOVE_BLAZE_KICK, -4, + MOVE_ERUPTION, -4, + MOVE_FIRE_SPIN, -4, + MOVE_FIRE_PUNCH, -4, + MOVE_SOLAR_BEAM, -4, // Repeated + TABLE_END, 0 }; -static const u16 sUnknown_0860A728[] = +static const u16 sPoints_SunMoves[] = { - 0x013b, 0x0003, 0x00ac, 0x0003, 0x0035, 0x0003, 0x00dd, 0x0003, 0x007e, 0x0003, 0x0101, 0x0003, 0x0034, 0x0003, 0x0133, 0x0003, - 0x012b, 0x0003, 0x011c, 0x0003, 0x0053, 0x0003, 0x0007, 0x0003, 0x004c, 0x0005, 0x00eb, 0x0003, 0x00ea, 0x0003, 0x00ec, 0x0003, - 0x0137, 0x0003, 0xffff, 0x0000 + MOVE_OVERHEAT, 3, + MOVE_FLAME_WHEEL, 3, + MOVE_FLAMETHROWER, 3, + MOVE_SACRED_FIRE, 3, + MOVE_FIRE_BLAST, 3, + MOVE_HEAT_WAVE, 3, + MOVE_EMBER, 3, + MOVE_BLAST_BURN, 3, + MOVE_BLAZE_KICK, 3, + MOVE_ERUPTION, 3, + MOVE_FIRE_SPIN, 3, + MOVE_FIRE_PUNCH, 3, + MOVE_SOLAR_BEAM, 5, + MOVE_SYNTHESIS, 3, + MOVE_MORNING_SUN, 3, + MOVE_MOONLIGHT, 3, + MOVE_WEATHER_BALL, 3, + TABLE_END, 0 }; -static const u16 sUnknown_0860A770[] = +static const u16 sPoints_SandstormMoves[] = { - 0x0137, 0x0003, 0x004c, 0xfffd, 0xffff, 0x0000 + MOVE_WEATHER_BALL, 3, + MOVE_SOLAR_BEAM, -3, + TABLE_END, 0 }; -static const u16 sUnknown_0860A77C[] = +static const u16 sPoints_HailMoves[] = { - 0x0137, 0x0003, 0x004c, 0xfffd, 0xffff, 0x0000 + MOVE_WEATHER_BALL, 3, + MOVE_SOLAR_BEAM, -3, + TABLE_END, 0 }; -static const u16 sUnknown_0860A788[] = +static const u16 sPoints_ElectricMoves[] = { - 0x0055, 0x0003, 0x0009, 0x0003, 0x00d1, 0x0003, 0x0054, 0x0003, 0x00c0, 0x0003, 0x015f, 0x0003, 0x0056, 0x0000, 0x0057, 0x0003, - 0x0158, 0x0003, 0xffff, 0x0000 + MOVE_THUNDERBOLT, 3, + MOVE_THUNDER_PUNCH, 3, + MOVE_SPARK, 3, + MOVE_THUNDER_SHOCK, 3, + MOVE_ZAP_CANNON, 3, + MOVE_SHOCK_WAVE, 3, + MOVE_THUNDER_WAVE, 0, // Unnecessary, unlisted moves are already given 0 points + MOVE_THUNDER, 3, + MOVE_VOLT_TACKLE, 3, + TABLE_END, 0 }; -static const u16 sUnknown_0860A7B0[] = +static const u16 sPoints_StatusDmg[] = { - 0x0005, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003 + 5, // Curse + 3, // Leech Seed + 3, // Poison + 3, // Toxic + 3, // Burn + 3, // Nightmare + 3 // Wrap (Trapping move) }; -static const u16 sUnknown_0860A7BE[] = +static const u16 sPoints_Status[] = { - 0x0005, 0x0005, 0x0005, 0x0005, 0x0005 + 5, // Attraction + 5, // Confusion + 5, // Paralysis + 5, // Sleep + 5 // Freeze }; -static const u16 sUnknown_0860A7C8[] = + +static const u16 sPoints_Spikes[] = { 4 }; +static const u16 sPoints_WaterSport[] = { 5 }; +static const u16 sPoints_MudSport[] = { 5 }; +static const u16 sPoints_Reflect[] = { 3 }; +static const u16 sPoints_LightScreen[] = { 3 }; +static const u16 sPoints_Safeguard[] = { 4 }; +static const u16 sPoints_Mist[] = { 3 }; +static const u16 sPoints_BreakWall[] = { 6 }; +static const u16 sPoints_CriticalHit[] = { 6 }; +static const u16 sPoints_Faint[] = { 6 }; +static const u16 sPoints_Flinched[] = { 4 }; + +static const u16 sPoints_StatIncrease1[NUM_BATTLE_STATS - 1] = { - 0x0004 + [STAT_ATK - 1] = 2, + [STAT_DEF - 1] = 2, + [STAT_SPEED - 1] = 2, + [STAT_SPATK - 1] = 2, + [STAT_SPDEF - 1] = 2, + [STAT_ACC - 1] = 2, + [STAT_EVASION - 1] = 2 }; -static const u16 sUnknown_0860A7CA[] = +static const u16 sPoints_StatIncrease2[NUM_BATTLE_STATS - 1] = { - 0x0005 + [STAT_ATK - 1] = 4, + [STAT_DEF - 1] = 4, + [STAT_SPEED - 1] = 4, + [STAT_SPATK - 1] = 4, + [STAT_SPDEF - 1] = 4, + [STAT_ACC - 1] = 4, + [STAT_EVASION - 1] = 4 }; -static const u16 sUnknown_0860A7CC[] = +static const u16 sPoints_StatDecreaseSelf[NUM_BATTLE_STATS - 1] = { - 0x0005 + [STAT_ATK - 1] = -1, + [STAT_DEF - 1] = -1, + [STAT_SPEED - 1] = -1, + [STAT_SPATK - 1] = -1, + [STAT_SPDEF - 1] = -1, + [STAT_ACC - 1] = -1, + [STAT_EVASION - 1] = -1 }; -static const u16 sUnknown_0860A7CE[] = +static const u16 sPoints_StatDecrease1[NUM_BATTLE_STATS - 1] = { - 0x0003 + [STAT_ATK - 1] = 2, + [STAT_DEF - 1] = 2, + [STAT_SPEED - 1] = 2, + [STAT_SPATK - 1] = 2, + [STAT_SPDEF - 1] = 2, + [STAT_ACC - 1] = 2, + [STAT_EVASION - 1] = 2 }; -static const u16 sUnknown_0860A7D0[] = +static const u16 sPoints_StatDecrease2[NUM_BATTLE_STATS - 1] = { - 0x0003 + [STAT_ATK - 1] = 4, + [STAT_DEF - 1] = 4, + [STAT_SPEED - 1] = 4, + [STAT_SPATK - 1] = 4, + [STAT_SPDEF - 1] = 4, + [STAT_ACC - 1] = 4, + [STAT_EVASION - 1] = 4 }; -static const u16 sUnknown_0860A7D2[] = +static const u16 sPoints_StatIncreaseNotSelf[NUM_BATTLE_STATS - 1] = { - 0x0004 -}; -static const u16 sUnknown_0860A7D4[] = -{ - 0x0003 -}; -static const u16 sUnknown_0860A7D6[] = -{ - 0x0006 -}; -static const u16 sUnknown_0860A7D8[] = -{ - 0x0006 -}; -static const u16 sUnknown_0860A7DA[] = -{ - 0x0006 -}; -static const u16 sUnknown_0860A7DC[] = -{ - 0x0004 -}; -static const u16 sUnknown_0860A7DE[] = -{ - 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002 -}; -static const u16 sUnknown_0860A7EC[] = -{ - 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004 -}; -static const u16 sUnknown_0860A7FA[] = -{ - 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff -}; -static const u16 sUnknown_0860A808[] = -{ - 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002 -}; -static const u16 sUnknown_0860A816[] = -{ - 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004 -}; -static const u16 sUnknown_0860A824[] = -{ - 0xfffe, 0xfffe, 0xfffe, 0xfffe, 0xfffe, 0xfffe, 0xfffe + [STAT_ATK - 1] = -2, + [STAT_DEF - 1] = -2, + [STAT_SPEED - 1] = -2, + [STAT_SPATK - 1] = -2, + [STAT_SPDEF - 1] = -2, + [STAT_ACC - 1] = -2, + [STAT_EVASION - 1] = -2 }; static const u16 *const sPointsArray[] = { - sUnknown_0860A4E0, - sUnknown_0860A68C, - sUnknown_0860A692, - sUnknown_0860A6A0, - sUnknown_0860A728, - sUnknown_0860A770, - sUnknown_0860A77C, - sUnknown_0860A788, - sUnknown_0860A7B0, - sUnknown_0860A7BE, - sUnknown_0860A7C8, - sUnknown_0860A7CA, - sUnknown_0860A7CC, - sUnknown_0860A7CE, - sUnknown_0860A7D0, - sUnknown_0860A7D2, - sUnknown_0860A7D4, - sUnknown_0860A7D6, - sUnknown_0860A7D8, - sUnknown_0860A7DA, - sUnknown_0860A7DA, - sUnknown_0860A7DC, - sUnknown_0860A7DE, - sUnknown_0860A7EC, - sUnknown_0860A7FA, - sUnknown_0860A808, - sUnknown_0860A816, - sUnknown_0860A824 + [PTS_MOVE_EFFECT] = sPoints_MoveEffect, + [PTS_EFFECTIVENESS] = sPoints_Effectiveness, + [PTS_SET_UP] = sPoints_SetUp, + [PTS_RAIN] = sPoints_RainMoves, + [PTS_SUN] = sPoints_SunMoves, + [PTS_SANDSTORM] = sPoints_SandstormMoves, + [PTS_HAIL] = sPoints_HailMoves, + [PTS_ELECTRIC] = sPoints_ElectricMoves, + [PTS_STATUS_DMG] = sPoints_StatusDmg, + [PTS_STATUS] = sPoints_Status, + [PTS_SPIKES] = sPoints_Spikes, + [PTS_WATER_SPORT] = sPoints_WaterSport, + [PTS_MUD_SPORT] = sPoints_MudSport, + [PTS_REFLECT] = sPoints_Reflect, + [PTS_LIGHT_SCREEN] = sPoints_LightScreen, + [PTS_SAFEGUARD] = sPoints_Safeguard, + [PTS_MIST] = sPoints_Mist, + [PTS_BREAK_WALL] = sPoints_BreakWall, + [PTS_CRITICAL_HIT] = sPoints_CriticalHit, + [PTS_FAINT] = sPoints_Faint, + [PTS_FAINT_SET_UP] = sPoints_Faint, + [PTS_FLINCHED] = sPoints_Flinched, + [PTS_STAT_INCREASE_1] = sPoints_StatIncrease1, + [PTS_STAT_INCREASE_2] = sPoints_StatIncrease2, + [PTS_STAT_DECREASE_SELF] = sPoints_StatDecreaseSelf, + [PTS_STAT_DECREASE_1] = sPoints_StatDecrease1, + [PTS_STAT_DECREASE_2] = sPoints_StatDecrease2, + [PTS_STAT_INCREASE_NOT_SELF] = sPoints_StatIncreaseNotSelf }; -static const u16 sUnknown_0860A8A4[] = +// Points will always be calculated for these messages +// even if current pokemon does not have corresponding move +static const u16 sSpecialBattleStrings[] = { STRINGID_PKMNPERISHCOUNTFELL, STRINGID_PKMNWISHCAMETRUE, STRINGID_PKMNLOSTPPGRUDGE, STRINGID_PKMNTOOKFOE, STRINGID_PKMNABSORBEDNUTRIENTS, STRINGID_PKMNANCHOREDITSELF, STRINGID_PKMNAFFLICTEDBYCURSE, STRINGID_PKMNSAPPEDBYLEECHSEED, STRINGID_PKMNLOCKEDINNIGHTMARE, STRINGID_PKMNHURTBY, STRINGID_PKMNHURTBYBURN, STRINGID_PKMNHURTBYPOISON, STRINGID_PKMNHURTBYSPIKES, STRINGID_ATTACKERFAINTED, STRINGID_TARGETFAINTED, - STRINGID_PKMNHITWITHRECOIL, STRINGID_PKMNCRASHED, 0xFFFF + STRINGID_PKMNHITWITHRECOIL, STRINGID_PKMNCRASHED, TABLE_END }; // code @@ -235,9 +570,9 @@ void BattleTv_SetDataBasedOnString(u16 stringId) moveSlot = GetBattlerMoveSlotId(gBattlerAttacker, gBattleMsgDataPtr->currentMove); - if (moveSlot >= 4 && sub_817E0B8(stringId) && stringId > BATTLESTRINGS_ID_ADDER) + if (moveSlot >= MAX_MON_MOVES && IsNotSpecialBattleString(stringId) && stringId > BATTLESTRINGS_ID_ADDER) { - tvPtr->side[atkSide].faintCause = 15; + tvPtr->side[atkSide].faintCause = FNT_OTHER; return; } @@ -252,17 +587,17 @@ void BattleTv_SetDataBasedOnString(u16 stringId) switch (stringId) { case STRINGID_ITDOESNTAFFECT: - AddMovePoints(1, moveSlot, 2, 0); + AddMovePoints(PTS_EFFECTIVENESS, moveSlot, 2, 0); if (!(gBattleTypeFlags & BATTLE_TYPE_LINK)) TrySetBattleSeminarShow(); break; case STRINGID_NOTVERYEFFECTIVE: - AddMovePoints(1, moveSlot, 1, 0); + AddMovePoints(PTS_EFFECTIVENESS, moveSlot, 1, 0); if (!(gBattleTypeFlags & BATTLE_TYPE_LINK) && GetMonData(defMon, MON_DATA_HP, NULL) != 0) TrySetBattleSeminarShow(); break; case STRINGID_SUPEREFFECTIVE: - AddMovePoints(1, moveSlot, 0, 0); + AddMovePoints(PTS_EFFECTIVENESS, moveSlot, 0, 0); break; case STRINGID_PKMNFORESAWATTACK: tvPtr->side[atkSide].futureSightMonId = gBattlerPartyIndexes[gBattlerAttacker] + 1; @@ -279,12 +614,12 @@ void BattleTv_SetDataBasedOnString(u16 stringId) break; case STRINGID_PKMNPERISHCOUNTFELL: if (*perishCount == 0) - tvPtr->side[atkSide].faintCause = 10; + tvPtr->side[atkSide].faintCause = FNT_PERISH_SONG; break; case STRINGID_PKMNWISHCAMETRUE: if (tvPtr->side[defSide].wishMonId != 0) { - AddMovePoints(2, 3, defSide, + AddMovePoints(PTS_SET_UP, 3, defSide, (tvPtr->side[defSide].wishMonId - 1) * 4 + tvPtr->side[defSide].wishMoveSlot); } break; @@ -295,7 +630,7 @@ void BattleTv_SetDataBasedOnString(u16 stringId) case STRINGID_PKMNLOSTPPGRUDGE: if (tvPtr->side[defSide].grudgeMonId != 0) { - AddMovePoints(2, 4, defSide, + AddMovePoints(PTS_SET_UP, 4, defSide, (tvPtr->side[defSide].grudgeMonId - 1) * 4 + tvPtr->side[defSide].grudgeMoveSlot); } break; @@ -305,7 +640,7 @@ void BattleTv_SetDataBasedOnString(u16 stringId) break; case STRINGID_PKMNTOOKFOE: if (tvPtr->side[defSide].destinyBondMonId != 0) - tvPtr->side[atkSide].faintCause = 11; + tvPtr->side[atkSide].faintCause = FNT_DESTINY_BOND; break; case STRINGID_PKMNPLANTEDROOTS: tvPtr->pos[atkSide][atkFlank].ingrainMonId = gBattlerPartyIndexes[gBattlerAttacker] + 1; @@ -314,14 +649,14 @@ void BattleTv_SetDataBasedOnString(u16 stringId) case STRINGID_PKMNABSORBEDNUTRIENTS: if (tvPtr->pos[atkSide][atkFlank].ingrainMonId != 0) { - AddMovePoints(2, 6, atkSide, + AddMovePoints(PTS_SET_UP, 6, atkSide, (tvPtr->pos[atkSide][atkFlank].ingrainMonId - 1) * 4 + tvPtr->pos[atkSide][atkFlank].ingrainMoveSlot); } break; case STRINGID_PKMNANCHOREDITSELF: if (tvPtr->pos[defSide][defFlank].ingrainMonId != 0) { - AddMovePoints(2, 6, defSide, + AddMovePoints(PTS_SET_UP, 6, defSide, (tvPtr->pos[defSide][defFlank].ingrainMonId - 1) * 4 + tvPtr->pos[defSide][defFlank].ingrainMoveSlot); } break; @@ -329,15 +664,15 @@ void BattleTv_SetDataBasedOnString(u16 stringId) gBattleStruct->anyMonHasTransformed = TRUE; break; case STRINGID_CRITICALHIT: - AddMovePoints(0x12, moveSlot, 0, 0); + AddMovePoints(PTS_CRITICAL_HIT, moveSlot, 0, 0); break; case STRINGID_PKMNSSTATCHANGED: if (gBattleTextBuff1[2] != 0) { if (*statStringId == STRINGID_STATSHARPLY) - AddMovePoints(0x17, moveSlot, gBattleTextBuff1[2] - 1, 0); + AddMovePoints(PTS_STAT_INCREASE_2, moveSlot, gBattleTextBuff1[2] - 1, 0); else - AddMovePoints(0x16, moveSlot, gBattleTextBuff1[2] - 1, 0); + AddMovePoints(PTS_STAT_INCREASE_1, moveSlot, gBattleTextBuff1[2] - 1, 0); } break; case STRINGID_PKMNSSTATCHANGED2: @@ -346,27 +681,27 @@ void BattleTv_SetDataBasedOnString(u16 stringId) if (gBattlerAttacker == gBattlerTarget) { if (*statStringId == STRINGID_STATSHARPLY) - AddMovePoints(0x17, moveSlot, gBattleTextBuff1[2] - 1, 0); + AddMovePoints(PTS_STAT_INCREASE_2, moveSlot, gBattleTextBuff1[2] - 1, 0); else - AddMovePoints(0x16, moveSlot, gBattleTextBuff1[2] - 1, 0); + AddMovePoints(PTS_STAT_INCREASE_1, moveSlot, gBattleTextBuff1[2] - 1, 0); } else { - AddMovePoints(0x1B, moveSlot, gBattleTextBuff1[2] - 1, 0); + AddMovePoints(PTS_STAT_INCREASE_NOT_SELF, moveSlot, gBattleTextBuff1[2] - 1, 0); } } break; case STRINGID_PKMNSSTATCHANGED3: if (gBattleTextBuff1[2] != 0) - AddMovePoints(0x18, moveSlot, gBattleTextBuff1[2] - 1, 0); + AddMovePoints(PTS_STAT_DECREASE_SELF, moveSlot, gBattleTextBuff1[2] - 1, 0); break; case STRINGID_PKMNSSTATCHANGED4: if (gBattleTextBuff1[2] != 0) { if (*statStringId == STRINGID_STATHARSHLY) - AddMovePoints(0x1A, moveSlot, gBattleTextBuff1[2] - 1, 0); + AddMovePoints(PTS_STAT_DECREASE_2, moveSlot, gBattleTextBuff1[2] - 1, 0); else - AddMovePoints(0x19, moveSlot, gBattleTextBuff1[2] - 1, 0); + AddMovePoints(PTS_STAT_DECREASE_1, moveSlot, gBattleTextBuff1[2] - 1, 0); } break; case STRINGID_PKMNLAIDCURSE: @@ -377,8 +712,8 @@ void BattleTv_SetDataBasedOnString(u16 stringId) if (GetMonData(atkMon, MON_DATA_HP, NULL) && tvPtr->pos[atkSide][atkFlank].curseMonId != 0) { - AddMovePoints(8, 0, tvPtr->pos[atkSide][atkFlank].curseMonId - 1, tvPtr->pos[atkSide][atkFlank].curseMoveSlot); - tvPtr->side[atkSide].faintCause = 1; + AddMovePoints(PTS_STATUS_DMG, 0, tvPtr->pos[atkSide][atkFlank].curseMonId - 1, tvPtr->pos[atkSide][atkFlank].curseMoveSlot); + tvPtr->side[atkSide].faintCause = FNT_CURSE; tvPtr->side[atkSide].faintCauseMonId = atkFlank; } break; @@ -389,8 +724,8 @@ void BattleTv_SetDataBasedOnString(u16 stringId) case STRINGID_PKMNSAPPEDBYLEECHSEED: if (tvPtr->pos[atkSide][atkFlank].leechSeedMonId != 0) { - AddMovePoints(8, 1, tvPtr->pos[atkSide][atkFlank].leechSeedMonId - 1, tvPtr->pos[atkSide][atkFlank].leechSeedMoveSlot); - tvPtr->side[atkSide].faintCause = 2; + AddMovePoints(PTS_STATUS_DMG, 1, tvPtr->pos[atkSide][atkFlank].leechSeedMonId - 1, tvPtr->pos[atkSide][atkFlank].leechSeedMoveSlot); + tvPtr->side[atkSide].faintCause = FNT_LEECH_SEED; tvPtr->side[atkSide].faintCauseMonId = atkFlank; } break; @@ -402,8 +737,8 @@ void BattleTv_SetDataBasedOnString(u16 stringId) if (GetMonData(atkMon, MON_DATA_HP, NULL) != 0 && tvPtr->pos[atkSide][atkFlank].nightmareMonId != 0) { - AddMovePoints(8, 5, tvPtr->pos[atkSide][atkFlank].nightmareMonId - 1, tvPtr->pos[atkSide][atkFlank].nightmareMoveSlot); - tvPtr->side[atkSide].faintCause = 5; + AddMovePoints(PTS_STATUS_DMG, 5, tvPtr->pos[atkSide][atkFlank].nightmareMonId - 1, tvPtr->pos[atkSide][atkFlank].nightmareMoveSlot); + tvPtr->side[atkSide].faintCause = FNT_NIGHTMARE; tvPtr->side[atkSide].faintCauseMonId = atkFlank; } break; @@ -419,8 +754,8 @@ void BattleTv_SetDataBasedOnString(u16 stringId) if (GetMonData(atkMon, MON_DATA_HP, NULL) != 0 && tvPtr->pos[atkSide][atkFlank].wrapMonId != 0) { - AddMovePoints(8, 6, tvPtr->pos[atkSide][atkFlank].wrapMonId - 1, tvPtr->pos[atkSide][atkFlank].wrapMoveSlot); - tvPtr->side[atkSide].faintCause = 6; + AddMovePoints(PTS_STATUS_DMG, 6, tvPtr->pos[atkSide][atkFlank].wrapMonId - 1, tvPtr->pos[atkSide][atkFlank].wrapMoveSlot); + tvPtr->side[atkSide].faintCause = FNT_WRAP; tvPtr->side[atkSide].faintCauseMonId = atkFlank; } break; @@ -432,8 +767,8 @@ void BattleTv_SetDataBasedOnString(u16 stringId) if (GetMonData(atkMon, MON_DATA_HP, NULL) != 0) { if (tvPtr->mon[atkSide][gBattlerPartyIndexes[gBattlerAttacker]].brnMonId != 0) - AddMovePoints(8, 4, tvPtr->mon[atkSide][gBattlerPartyIndexes[gBattlerAttacker]].brnMonId - 1, tvPtr->mon[atkSide][gBattlerPartyIndexes[gBattlerAttacker]].brnMoveSlot); - tvPtr->side[atkSide].faintCause = 4; + AddMovePoints(PTS_STATUS_DMG, 4, tvPtr->mon[atkSide][gBattlerPartyIndexes[gBattlerAttacker]].brnMonId - 1, tvPtr->mon[atkSide][gBattlerPartyIndexes[gBattlerAttacker]].brnMoveSlot); + tvPtr->side[atkSide].faintCause = FNT_BURN; tvPtr->side[atkSide].faintCauseMonId = gBattlerPartyIndexes[gBattlerAttacker]; } break; @@ -449,10 +784,10 @@ void BattleTv_SetDataBasedOnString(u16 stringId) if (GetMonData(atkMon, MON_DATA_HP, NULL) != 0) { if (tvPtr->mon[atkSide][gBattlerPartyIndexes[gBattlerAttacker]].psnMonId != 0) - AddMovePoints(8, 2, tvPtr->mon[atkSide][gBattlerPartyIndexes[gBattlerAttacker]].psnMonId - 1, tvPtr->mon[atkSide][gBattlerPartyIndexes[gBattlerAttacker]].psnMoveSlot); + AddMovePoints(PTS_STATUS_DMG, 2, tvPtr->mon[atkSide][gBattlerPartyIndexes[gBattlerAttacker]].psnMonId - 1, tvPtr->mon[atkSide][gBattlerPartyIndexes[gBattlerAttacker]].psnMoveSlot); if (tvPtr->mon[atkSide][gBattlerPartyIndexes[gBattlerAttacker]].badPsnMonId != 0) - AddMovePoints(8, 3, tvPtr->mon[atkSide][gBattlerPartyIndexes[gBattlerAttacker]].badPsnMonId - 1, tvPtr->mon[atkSide][gBattlerPartyIndexes[gBattlerAttacker]].badPsnMoveSlot); - tvPtr->side[atkSide].faintCause = 3; + AddMovePoints(PTS_STATUS_DMG, 3, tvPtr->mon[atkSide][gBattlerPartyIndexes[gBattlerAttacker]].badPsnMonId - 1, tvPtr->mon[atkSide][gBattlerPartyIndexes[gBattlerAttacker]].badPsnMoveSlot); + tvPtr->side[atkSide].faintCause = FNT_POISON; tvPtr->side[atkSide].faintCauseMonId = gBattlerPartyIndexes[gBattlerAttacker]; } break; @@ -462,7 +797,7 @@ void BattleTv_SetDataBasedOnString(u16 stringId) break; case STRINGID_PKMNIMMOBILIZEDBYLOVE: if (tvPtr->pos[atkSide][atkFlank].attractMonId != 0) - AddMovePoints(9, 0, tvPtr->pos[atkSide][atkFlank].attractMonId - 1, tvPtr->pos[atkSide][atkFlank].attractMoveSlot); + AddMovePoints(PTS_STATUS, 0, tvPtr->pos[atkSide][atkFlank].attractMonId - 1, tvPtr->pos[atkSide][atkFlank].attractMoveSlot); break; case STRINGID_PKMNWASPARALYZED: tvPtr->mon[effSide][gBattlerPartyIndexes[gEffectBattler]].prlzMonId = gBattlerPartyIndexes[gBattlerAttacker] + 1; @@ -470,7 +805,7 @@ void BattleTv_SetDataBasedOnString(u16 stringId) break; case STRINGID_PKMNISPARALYZED: if (tvPtr->mon[atkSide][gBattlerPartyIndexes[gBattlerAttacker]].prlzMonId != 0) - AddMovePoints(9, 2, tvPtr->mon[atkSide][gBattlerPartyIndexes[gBattlerAttacker]].prlzMonId - 1, tvPtr->mon[atkSide][gBattlerPartyIndexes[gBattlerAttacker]].prlzMoveSlot); + AddMovePoints(PTS_STATUS, 2, tvPtr->mon[atkSide][gBattlerPartyIndexes[gBattlerAttacker]].prlzMonId - 1, tvPtr->mon[atkSide][gBattlerPartyIndexes[gBattlerAttacker]].prlzMoveSlot); break; case STRINGID_PKMNFELLASLEEP: tvPtr->mon[effSide][gBattlerPartyIndexes[gEffectBattler]].slpMonId = gBattlerPartyIndexes[gBattlerAttacker] + 1; @@ -480,7 +815,7 @@ void BattleTv_SetDataBasedOnString(u16 stringId) if (tvPtr->mon[atkSide][gBattlerPartyIndexes[gBattlerAttacker]].slpMonId != 0 && gBattleMsgDataPtr->currentMove != MOVE_SNORE && gBattleMsgDataPtr->currentMove != MOVE_SLEEP_TALK) - AddMovePoints(9, 3, tvPtr->mon[atkSide][gBattlerPartyIndexes[gBattlerAttacker]].slpMonId - 1, tvPtr->mon[atkSide][gBattlerPartyIndexes[gBattlerAttacker]].slpMoveSlot); + AddMovePoints(PTS_STATUS, 3, tvPtr->mon[atkSide][gBattlerPartyIndexes[gBattlerAttacker]].slpMonId - 1, tvPtr->mon[atkSide][gBattlerPartyIndexes[gBattlerAttacker]].slpMoveSlot); break; case STRINGID_PKMNWASFROZEN: tvPtr->mon[effSide][gBattlerPartyIndexes[gEffectBattler]].frzMonId = gBattlerPartyIndexes[gBattlerAttacker] + 1; @@ -488,7 +823,7 @@ void BattleTv_SetDataBasedOnString(u16 stringId) break; case STRINGID_PKMNISFROZEN: if (tvPtr->mon[atkSide][gBattlerPartyIndexes[gBattlerAttacker]].frzMonId != 0) - AddMovePoints(9, 4, tvPtr->mon[atkSide][gBattlerPartyIndexes[gBattlerAttacker]].frzMonId - 1, tvPtr->mon[atkSide][gBattlerPartyIndexes[gBattlerAttacker]].frzMoveSlot); + AddMovePoints(PTS_STATUS, 4, tvPtr->mon[atkSide][gBattlerPartyIndexes[gBattlerAttacker]].frzMonId - 1, tvPtr->mon[atkSide][gBattlerPartyIndexes[gBattlerAttacker]].frzMoveSlot); break; case STRINGID_PKMNWASCONFUSED: tvPtr->pos[effSide][effFlank].confusionMonId = gBattlerPartyIndexes[gBattlerAttacker] + 1; @@ -496,8 +831,8 @@ void BattleTv_SetDataBasedOnString(u16 stringId) break; case STRINGID_ITHURTCONFUSION: if (tvPtr->pos[atkSide][atkFlank].confusionMonId != 0) - AddMovePoints(9, 1, tvPtr->pos[atkSide][atkFlank].confusionMonId - 1, tvPtr->pos[atkSide][atkFlank].confusionMoveSlot); - tvPtr->side[atkSide].faintCause = 12; + AddMovePoints(PTS_STATUS, 1, tvPtr->pos[atkSide][atkFlank].confusionMonId - 1, tvPtr->pos[atkSide][atkFlank].confusionMoveSlot); + tvPtr->side[atkSide].faintCause = FNT_CONFUSION; break; case STRINGID_SPIKESSCATTERED: tvPtr->side[defSide].spikesMonId = gBattlerPartyIndexes[gBattlerAttacker] + 1; @@ -506,8 +841,8 @@ void BattleTv_SetDataBasedOnString(u16 stringId) case STRINGID_PKMNHURTBYSPIKES: if (tvPtr->side[scriptingSide].spikesMonId != 0) { - AddMovePoints(10, scriptingSide ^ BIT_SIDE, tvPtr->side[scriptingSide].spikesMonId - 1, tvPtr->side[scriptingSide].spikesMoveSlot); - tvPtr->side[scriptingSide].faintCause = 7; + AddMovePoints(PTS_SPIKES, scriptingSide ^ BIT_SIDE, tvPtr->side[scriptingSide].spikesMonId - 1, tvPtr->side[scriptingSide].spikesMoveSlot); + tvPtr->side[scriptingSide].faintCause = FNT_SPIKES; } break; case STRINGID_PKMNBLEWAWAYSPIKES: @@ -582,7 +917,7 @@ void BattleTv_SetDataBasedOnString(u16 stringId) break; case STRINGID_PKMNUSEDSAFEGUARD: if (tvPtr->side[defSide].safeguardMonId != 0) - AddMovePoints(15, 0, tvPtr->side[defSide].safeguardMonId - 1, tvPtr->side[defSide].safeguardMoveSlot); + AddMovePoints(PTS_SAFEGUARD, 0, tvPtr->side[defSide].safeguardMonId - 1, tvPtr->side[defSide].safeguardMoveSlot); break; case STRINGID_PKMNSAFEGUARDEXPIRED: tvPtr->side[atkSide].safeguardMonId = 0; @@ -594,40 +929,40 @@ void BattleTv_SetDataBasedOnString(u16 stringId) break; case STRINGID_PKMNPROTECTEDBYMIST: if (tvPtr->side[defSide].mistMonId != 0) - AddMovePoints(16, 0, tvPtr->side[defSide].mistMonId - 1, tvPtr->side[defSide].mistMoveSlot); + AddMovePoints(PTS_MIST, 0, tvPtr->side[defSide].mistMonId - 1, tvPtr->side[defSide].mistMoveSlot); break; case STRINGID_THEWALLSHATTERED: tvPtr->side[defSide].reflectMonId = 0; tvPtr->side[defSide].reflectMoveSlot = 0; tvPtr->side[defSide].lightScreenMonId = 0; tvPtr->side[defSide].lightScreenMoveSlot = 0; - AddMovePoints(17, 0, gBattlerPartyIndexes[gBattlerAttacker], moveSlot); + AddMovePoints(PTS_BREAK_WALL, 0, gBattlerPartyIndexes[gBattlerAttacker], moveSlot); break; case STRINGID_PKMNFLINCHED: if (tvPtr->pos[atkSide][0].attackedByMonId != 0) - AddMovePoints(21, 0, tvPtr->pos[atkSide][0].attackedByMonId - 1, tvPtr->pos[atkSide][0].attackedByMoveSlot); + AddMovePoints(PTS_FLINCHED, 0, tvPtr->pos[atkSide][0].attackedByMonId - 1, tvPtr->pos[atkSide][0].attackedByMoveSlot); if (tvPtr->pos[atkSide][1].attackedByMonId != 0) - AddMovePoints(21, 0, tvPtr->pos[atkSide][1].attackedByMonId - 1, tvPtr->pos[atkSide][1].attackedByMoveSlot); + AddMovePoints(PTS_FLINCHED, 0, tvPtr->pos[atkSide][1].attackedByMonId - 1, tvPtr->pos[atkSide][1].attackedByMoveSlot); break; case STRINGID_PKMNCRASHED: case STRINGID_PKMNHITWITHRECOIL: - tvPtr->side[atkSide].faintCause = 14; + tvPtr->side[atkSide].faintCause = FNT_RECOIL; break; } } -static bool8 sub_817E0B8(u16 stringId) +static bool8 IsNotSpecialBattleString(u16 stringId) { s32 i = 0; do { - if (sUnknown_0860A8A4[i] == stringId) + if (sSpecialBattleStrings[i] == stringId) break; i++; - } while (sUnknown_0860A8A4[i] != 0xFFFF); + } while (sSpecialBattleStrings[i] != TABLE_END); - if (sUnknown_0860A8A4[i] == 0xFFFF) + if (sSpecialBattleStrings[i] == TABLE_END) return TRUE; else return FALSE; @@ -648,19 +983,19 @@ void BattleTv_SetDataBasedOnMove(u16 move, u16 weatherFlags, struct DisableStruc defSide = GetBattlerSide(gBattlerTarget); moveSlot = GetBattlerMoveSlotId(gBattlerAttacker, move); - if (moveSlot >= 4) + if (moveSlot >= MAX_MON_MOVES) { - tvPtr->side[atkSide].faintCause = 15; + tvPtr->side[atkSide].faintCause = FNT_OTHER; return; } tvPtr->pos[defSide][GetBattlerPosition(gBattlerAttacker) / 2].attackedByMonId = gBattlerPartyIndexes[gBattlerAttacker] + 1; tvPtr->pos[defSide][GetBattlerPosition(gBattlerAttacker) / 2].attackedByMoveSlot = moveSlot; tvPtr->side[atkSide].usedMoveSlot = moveSlot; - AddMovePoints(0, moveSlot, gBattleMoves[move].effect, 0); + AddMovePoints(PTS_MOVE_EFFECT, moveSlot, gBattleMoves[move].effect, 0); AddPointsBasedOnWeather(weatherFlags, move, moveSlot); if (disableStructPtr->chargeTimer != 0) - AddMovePoints(7, move, moveSlot, 0); + AddMovePoints(PTS_ELECTRIC, move, moveSlot, 0); if (move == MOVE_WISH) { @@ -671,14 +1006,14 @@ void BattleTv_SetDataBasedOnMove(u16 move, u16 weatherFlags, struct DisableStruc { tvPtr->side[atkSide ^ BIT_SIDE].explosionMonId = gBattlerPartyIndexes[gBattlerAttacker] + 1; tvPtr->side[atkSide ^ BIT_SIDE].explosionMoveSlot = moveSlot; - tvPtr->side[atkSide ^ BIT_SIDE].faintCause = 13; - tvPtr->side[atkSide ^ BIT_SIDE].explosion = 1; + tvPtr->side[atkSide ^ BIT_SIDE].faintCause = FNT_EXPLOSION; + tvPtr->side[atkSide ^ BIT_SIDE].explosion = TRUE; } - AddMovePoints(13, gBattleMoves[move].type, gBattleMoves[move].power, 0); - AddMovePoints(14, gBattleMoves[move].type, gBattleMoves[move].power, 0); - AddMovePoints(11, gBattleMoves[move].type, 0, 0); - AddMovePoints(12, gBattleMoves[move].type, 0, 0); + AddMovePoints(PTS_REFLECT, gBattleMoves[move].type, gBattleMoves[move].power, 0); + AddMovePoints(PTS_LIGHT_SCREEN, gBattleMoves[move].type, gBattleMoves[move].power, 0); + AddMovePoints(PTS_WATER_SPORT, gBattleMoves[move].type, 0, 0); + AddMovePoints(PTS_MUD_SPORT, gBattleMoves[move].type, 0, 0); } void BattleTv_SetDataBasedOnAnimation(u8 animationId) @@ -696,17 +1031,17 @@ void BattleTv_SetDataBasedOnAnimation(u8 animationId) case B_ANIM_FUTURE_SIGHT_HIT: if (tvPtr->side[atkSide].futureSightMonId != 0) { - AddMovePoints(2, 0, atkSide, + AddMovePoints(PTS_SET_UP, 0, atkSide, (tvPtr->side[atkSide].futureSightMonId - 1) * 4 + tvPtr->side[atkSide].futureSightMoveSlot); - tvPtr->side[atkSide].faintCause = 8; + tvPtr->side[atkSide].faintCause = FNT_FUTURE_SIGHT; } break; case B_ANIM_DOOM_DESIRE_HIT: if (tvPtr->side[atkSide].doomDesireMonId != 0) { - AddMovePoints(2, 1, atkSide, + AddMovePoints(PTS_SET_UP, 1, atkSide, (tvPtr->side[atkSide].doomDesireMonId - 1) * 4 + tvPtr->side[atkSide].doomDesireMoveSlot); - tvPtr->side[atkSide].faintCause = 9; + tvPtr->side[atkSide].faintCause = FNT_DOOM_DESIRE; } break; } @@ -819,49 +1154,67 @@ static void AddMovePoints(u8 caseId, u16 arg1, u8 arg2, u8 arg3) switch (caseId) { - case 0: - case 1: - case 18: - case 22 ... 27: + case PTS_MOVE_EFFECT: + case PTS_EFFECTIVENESS: + case PTS_CRITICAL_HIT: + case PTS_STAT_INCREASE_1: + case PTS_STAT_INCREASE_2: + case PTS_STAT_DECREASE_SELF: + case PTS_STAT_DECREASE_1: + case PTS_STAT_DECREASE_2: + case PTS_STAT_INCREASE_NOT_SELF: movePoints->points[atkSide][gBattlerPartyIndexes[gBattlerAttacker] * 4 + arg1] += sPointsArray[caseId][arg2]; break; - case 3 ... 7: + +#define move arg1 + case PTS_RAIN: + case PTS_SUN: + case PTS_SANDSTORM: + case PTS_HAIL: + case PTS_ELECTRIC: i = 0; ptr = sPointsArray[caseId]; do { - if (arg1 == ptr[i]) + if (move == ptr[i]) { movePoints->points[atkSide][gBattlerPartyIndexes[gBattlerAttacker] * 4 + arg2] += ptr[i+1]; break; } i += 2; - } while (ptr[i] != 0xFFFF); + } while (ptr[i] != TABLE_END); break; - case 19: - tvPtr->side[arg2 ^ 1].faintCause = 0; +#undef move + + case PTS_FAINT: + tvPtr->side[arg2 ^ 1].faintCause = FNT_NONE; movePoints->points[arg2][0 * 4 + arg3] += sPointsArray[caseId][arg1]; break; - case 20: - tvPtr->side[arg2].faintCause = 0; - case 2: + case PTS_FAINT_SET_UP: + tvPtr->side[arg2].faintCause = FNT_NONE; + // fallthrough + case PTS_SET_UP: movePoints->points[arg2][0 * 4 + arg3] += sPointsArray[caseId][arg1]; break; - case 17: + case PTS_BREAK_WALL: movePoints->points[atkSide][arg2 * 4 + arg3] += sPointsArray[caseId][arg1]; break; - case 8: - case 9: - case 15: - case 16: - case 21: + case PTS_STATUS_DMG: + case PTS_STATUS: + case PTS_SAFEGUARD: + case PTS_MIST: + case PTS_FLINCHED: movePoints->points[atkSide ^ BIT_SIDE][arg2 * 4 + arg3] += sPointsArray[caseId][arg1]; break; - case 10: + case PTS_SPIKES: movePoints->points[arg1][arg2 * 4 + arg3] += sPointsArray[caseId][0]; break; - case 11: - if (tvPtr->pos[defSide][0].waterSportMonId != -(tvPtr->pos[defSide][1].waterSportMonId) && arg1 == 10) + +#define type arg1 +#define power arg2 + case PTS_WATER_SPORT: + // If used fire move during Water Sport + if (tvPtr->pos[defSide][0].waterSportMonId != -(tvPtr->pos[defSide][1].waterSportMonId) && type == TYPE_FIRE) { if (tvPtr->pos[defSide][0].waterSportMonId != 0) { @@ -875,8 +1228,9 @@ static void AddMovePoints(u8 caseId, u16 arg1, u8 arg2, u8 arg3) } } break; - case 12: - if (tvPtr->pos[defSide][0].mudSportMonId != -(tvPtr->pos[defSide][1].mudSportMonId) && arg1 == 13) + case PTS_MUD_SPORT: + // If used Electric move during Mud Sport + if (tvPtr->pos[defSide][0].mudSportMonId != -(tvPtr->pos[defSide][1].mudSportMonId) && type == TYPE_ELECTRIC) { if (tvPtr->pos[defSide][0].mudSportMonId != 0) { @@ -890,20 +1244,24 @@ static void AddMovePoints(u8 caseId, u16 arg1, u8 arg2, u8 arg3) } } break; - case 13: - if (arg1 <= 8 && arg2 != 0 && tvPtr->side[defSide].reflectMonId != 0) + case PTS_REFLECT: + // If hit Reflect with damaging physical move + if (type < TYPE_MYSTERY && power != 0 && tvPtr->side[defSide].reflectMonId != 0) { u32 id = (tvPtr->side[defSide].reflectMonId - 1) * 4; movePoints->points[defSide][id + tvPtr->side[defSide].reflectMoveSlot] += sPointsArray[caseId][0]; } break; - case 14: - if (arg1 > 8 && arg2 != 0 && tvPtr->side[defSide].lightScreenMonId != 0) + case PTS_LIGHT_SCREEN: + // If hit Light Screen with damaging special move + if (type >= TYPE_MYSTERY && power != 0 && tvPtr->side[defSide].lightScreenMonId != 0) { u32 id = (tvPtr->side[defSide].lightScreenMonId - 1) * 4; movePoints->points[defSide][id + tvPtr->side[defSide].lightScreenMoveSlot] += sPointsArray[caseId][0]; } break; +#undef type +#undef power } } @@ -915,144 +1273,144 @@ static void AddPointsOnFainting(bool8 targetFainted) u32 atkArrId = tvPtr->side[atkSide].faintCauseMonId; s32 i; - if (tvPtr->side[atkSide].faintCause != 0) + if (tvPtr->side[atkSide].faintCause != FNT_NONE) { switch (tvPtr->side[atkSide].faintCause) { - case 1: + case FNT_CURSE: if (tvPtr->pos[atkSide][atkArrId].curseMonId != 0) { - AddMovePoints(19, 0, atkSide ^ BIT_SIDE, + AddMovePoints(PTS_FAINT, 0, atkSide ^ BIT_SIDE, (tvPtr->pos[atkSide][atkArrId].curseMonId - 1) * 4 + tvPtr->pos[atkSide][atkArrId].curseMoveSlot); } break; - case 2: + case FNT_LEECH_SEED: if (tvPtr->pos[atkSide][atkArrId].leechSeedMonId != 0) { - AddMovePoints(19, 0, atkSide ^ BIT_SIDE, + AddMovePoints(PTS_FAINT, 0, atkSide ^ BIT_SIDE, (tvPtr->pos[atkSide][atkArrId].leechSeedMonId - 1) * 4 + tvPtr->pos[atkSide][atkArrId].leechSeedMoveSlot); } break; - case 3: + case FNT_POISON: if (tvPtr->mon[atkSide][atkArrId].psnMonId != 0) { - AddMovePoints(19, 0, atkSide ^ BIT_SIDE, + AddMovePoints(PTS_FAINT, 0, atkSide ^ BIT_SIDE, (tvPtr->mon[atkSide][atkArrId].psnMonId - 1) * 4 + tvPtr->mon[atkSide][atkArrId].psnMoveSlot); } if (tvPtr->mon[atkSide][atkArrId].badPsnMonId != 0) { - AddMovePoints(19, 0, atkSide ^ BIT_SIDE, + AddMovePoints(PTS_FAINT, 0, atkSide ^ BIT_SIDE, (tvPtr->mon[atkSide][atkArrId].badPsnMonId - 1) * 4 + tvPtr->mon[atkSide][atkArrId].badPsnMoveSlot); } break; - case 4: + case FNT_BURN: if (tvPtr->mon[atkSide][atkArrId].brnMonId != 0) { - AddMovePoints(19, 0, atkSide ^ BIT_SIDE, + AddMovePoints(PTS_FAINT, 0, atkSide ^ BIT_SIDE, (tvPtr->mon[atkSide][atkArrId].brnMonId - 1) * 4 + tvPtr->mon[atkSide][atkArrId].brnMoveSlot); } break; - case 5: + case FNT_NIGHTMARE: if (tvPtr->pos[atkSide][atkArrId].nightmareMonId != 0) { - AddMovePoints(19, 0, atkSide ^ BIT_SIDE, + AddMovePoints(PTS_FAINT, 0, atkSide ^ BIT_SIDE, (tvPtr->pos[atkSide][atkArrId].nightmareMonId - 1) * 4 + tvPtr->pos[atkSide][atkArrId].nightmareMoveSlot); } break; - case 6: + case FNT_WRAP: if (tvPtr->pos[atkSide][atkArrId].wrapMonId != 0) { - AddMovePoints(19, 0, atkSide ^ BIT_SIDE, + AddMovePoints(PTS_FAINT, 0, atkSide ^ BIT_SIDE, (tvPtr->pos[atkSide][atkArrId].wrapMonId - 1) * 4 + tvPtr->pos[atkSide][atkArrId].wrapMoveSlot); } break; - case 7: + case FNT_SPIKES: if (tvPtr->side[atkSide].spikesMonId != 0) { - AddMovePoints(19, 0, atkSide ^ BIT_SIDE, + AddMovePoints(PTS_FAINT, 0, atkSide ^ BIT_SIDE, (tvPtr->side[atkSide].spikesMonId - 1) * 4 + tvPtr->side[atkSide].spikesMoveSlot); } break; - case 8: + case FNT_FUTURE_SIGHT: if (tvPtr->side[atkSide].futureSightMonId != 0) { - AddMovePoints(20, 0, atkSide, + AddMovePoints(PTS_FAINT_SET_UP, 0, atkSide, (tvPtr->side[atkSide].futureSightMonId - 1) * 4 + tvPtr->side[atkSide].futureSightMoveSlot); } break; - case 9: + case FNT_DOOM_DESIRE: if (tvPtr->side[atkSide].doomDesireMonId != 0) { - AddMovePoints(20, 0, atkSide, + AddMovePoints(PTS_FAINT_SET_UP, 0, atkSide, (tvPtr->side[atkSide].doomDesireMonId - 1) * 4 + tvPtr->side[atkSide].doomDesireMoveSlot); } break; - case 10: + case FNT_PERISH_SONG: if (tvPtr->side[atkSide].perishSong && tvPtr->side[atkSide].perishSongMonId - 1 != gBattlerPartyIndexes[gBattlerAttacker]) { - AddMovePoints(19, 0, atkSide, + AddMovePoints(PTS_FAINT, 0, atkSide, (tvPtr->side[atkSide].perishSongMonId - 1) * 4 + tvPtr->side[atkSide].perishSongMoveSlot); } if (tvPtr->side[atkSide ^ BIT_SIDE].perishSong) { - AddMovePoints(19, 0, atkSide ^ BIT_SIDE, + AddMovePoints(PTS_FAINT, 0, atkSide ^ BIT_SIDE, (tvPtr->side[atkSide ^ BIT_SIDE].perishSongMonId - 1) * 4 + tvPtr->side[atkSide ^ BIT_SIDE].perishSongMoveSlot); } break; - case 11: + case FNT_DESTINY_BOND: if (tvPtr->side[atkSide ^ BIT_SIDE].destinyBondMonId != 0) { - AddMovePoints(19, 0, atkSide ^ BIT_SIDE, + AddMovePoints(PTS_FAINT, 0, atkSide ^ BIT_SIDE, (tvPtr->side[atkSide ^ BIT_SIDE].destinyBondMonId - 1) * 4 + tvPtr->side[atkSide ^ BIT_SIDE].destinyBondMoveSlot); } break; - case 12: + case FNT_CONFUSION: for (i = 0; i < 2; i++) { if (tvPtr->pos[atkSide][i].confusionMonId != 0) { - AddMovePoints(19, 0, atkSide ^ BIT_SIDE, + AddMovePoints(PTS_FAINT, 0, atkSide ^ BIT_SIDE, (tvPtr->pos[atkSide][i].confusionMonId - 1) * 4 + tvPtr->pos[atkSide][i].confusionMoveSlot); } } break; - case 13: + case FNT_EXPLOSION: if (tvPtr->side[atkSide].explosion) { - AddMovePoints(19, 0, atkSide, + AddMovePoints(PTS_FAINT, 0, atkSide, (tvPtr->side[atkSide].explosionMonId - 1) * 4 + tvPtr->side[atkSide].explosionMoveSlot); } if (tvPtr->side[atkSide ^ BIT_SIDE].explosion) { - AddMovePoints(19, 0, atkSide ^ BIT_SIDE, + AddMovePoints(PTS_FAINT, 0, atkSide ^ BIT_SIDE, (tvPtr->side[atkSide ^ BIT_SIDE].explosionMonId - 1) * 4 + tvPtr->side[atkSide ^ BIT_SIDE].explosionMoveSlot); } break; - case 14: + case FNT_RECOIL: if (targetFainted == TRUE) { - AddMovePoints(20, 0, atkSide, + AddMovePoints(PTS_FAINT_SET_UP, 0, atkSide, (gBattlerPartyIndexes[gBattlerAttacker]) * 4 + tvPtr->side[atkSide].usedMoveSlot); } break; - case 15: + case FNT_OTHER: break; } } else { - if (tvPtr->side[defSide].faintCause == 7) + if (tvPtr->side[defSide].faintCause == FNT_SPIKES) { if (tvPtr->side[defSide].spikesMonId != 0) { - AddMovePoints(19, 0, defSide ^ BIT_SIDE, + AddMovePoints(PTS_FAINT, 0, defSide ^ BIT_SIDE, (tvPtr->side[defSide].spikesMonId - 1) * 4 + tvPtr->side[defSide].spikesMoveSlot); } } else { - AddMovePoints(20, 0, atkSide, + AddMovePoints(PTS_FAINT_SET_UP, 0, atkSide, (gBattlerPartyIndexes[gBattlerAttacker]) * 4 + tvPtr->side[atkSide].usedMoveSlot); } } @@ -1061,11 +1419,11 @@ static void AddPointsOnFainting(bool8 targetFainted) static void TrySetBattleSeminarShow(void) { s32 i; - s32 dmgByMove[4]; + s32 dmgByMove[MAX_MON_MOVES]; u16 powerOverride; u16 currMoveSaved; - if (gBattleTypeFlags & (BATTLE_TYPE_DOUBLE | BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000)) + if (gBattleTypeFlags & (BATTLE_TYPE_DOUBLE | BATTLE_TYPE_LINK | BATTLE_TYPE_RECORDED_LINK)) return; else if (GetBattlerSide(gBattlerAttacker) == B_SIDE_OPPONENT) return; @@ -1087,9 +1445,9 @@ static void TrySetBattleSeminarShow(void) if (currMoveSaved == sVariableDmgMoves[i]) break; i++; - } while (sVariableDmgMoves[i] != 0xFFFF); + } while (sVariableDmgMoves[i] != TABLE_END); - if (sVariableDmgMoves[i] != 0xFFFF) + if (sVariableDmgMoves[i] != TABLE_END) return; dmgByMove[gMoveSelectionCursor[gBattlerAttacker]] = gBattleMoveDamage; @@ -1138,7 +1496,7 @@ static void TrySetBattleSeminarShow(void) opponentSpecies = GetMonData(&gEnemyParty [gBattlerPartyIndexes[gBattlerTarget]], MON_DATA_SPECIES, NULL); playerSpecies = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gBattlerAttacker]], MON_DATA_SPECIES, NULL); - sub_80EE35C(opponentSpecies, playerSpecies, gMoveSelectionCursor[gBattlerAttacker], gBattleMons[gBattlerAttacker].moves, gBattleMons[gBattlerAttacker].moves[bestMoveId]); + TryPutBattleSeminarOnAir(opponentSpecies, playerSpecies, gMoveSelectionCursor[gBattlerAttacker], gBattleMons[gBattlerAttacker].moves, gBattleMons[gBattlerAttacker].moves[bestMoveId]); break; } } @@ -1162,9 +1520,9 @@ static bool8 ShouldCalculateDamage(u16 moveId, s32 *dmg, u16 *powerOverride) if (moveId == sVariableDmgMoves[i]) break; i++; - } while (sVariableDmgMoves[i] != 0xFFFF); + } while (sVariableDmgMoves[i] != TABLE_END); - if (sVariableDmgMoves[i] != 0xFFFF) + if (sVariableDmgMoves[i] != TABLE_END) { *dmg = 0; return FALSE; @@ -1193,8 +1551,8 @@ void BattleTv_ClearExplosionFaintCause(void) { struct BattleTv *tvPtr = &gBattleStruct->tv; - tvPtr->side[B_SIDE_PLAYER].faintCause = 0; - tvPtr->side[B_SIDE_OPPONENT].faintCause = 0; + tvPtr->side[B_SIDE_PLAYER].faintCause = FNT_NONE; + tvPtr->side[B_SIDE_OPPONENT].faintCause = FNT_NONE; tvPtr->side[B_SIDE_PLAYER].faintCauseMonId = 0; tvPtr->side[B_SIDE_OPPONENT].faintCauseMonId = 0; @@ -1205,8 +1563,8 @@ void BattleTv_ClearExplosionFaintCause(void) tvPtr->side[B_SIDE_PLAYER].explosionMoveSlot = 0; tvPtr->side[B_SIDE_OPPONENT].explosionMoveSlot = 0; - tvPtr->side[B_SIDE_PLAYER].explosion = 0; - tvPtr->side[B_SIDE_OPPONENT].explosion = 0; + tvPtr->side[B_SIDE_PLAYER].explosion = FALSE; + tvPtr->side[B_SIDE_OPPONENT].explosion = FALSE; } } @@ -1236,11 +1594,11 @@ u8 GetBattlerMoveSlotId(u8 battlerId, u16 moveId) static void AddPointsBasedOnWeather(u16 weatherFlags, u16 moveId, u8 moveSlot) { if (weatherFlags & WEATHER_RAIN_ANY) - AddMovePoints(3, moveId, moveSlot, 0); + AddMovePoints(PTS_RAIN, moveId, moveSlot, 0); else if (weatherFlags & WEATHER_SUN_ANY) - AddMovePoints(4, moveId, moveSlot, 0); + AddMovePoints(PTS_SUN, moveId, moveSlot, 0); else if (weatherFlags & WEATHER_SANDSTORM_ANY) - AddMovePoints(5, moveId, moveSlot, 0); + AddMovePoints(PTS_SANDSTORM, moveId, moveSlot, 0); else if (weatherFlags & WEATHER_HAIL_ANY) - AddMovePoints(6, moveId, moveSlot, 0); + AddMovePoints(PTS_HAIL, moveId, moveSlot, 0); } diff --git a/src/battle_util.c b/src/battle_util.c index e929de091..7ea4566d2 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -452,7 +452,7 @@ void HandleAction_Run(void) { gBattlerAttacker = gBattlerByTurnOrder[gCurrentTurnActionNumber]; - if (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000)) + if (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_RECORDED_LINK)) { gCurrentTurnActionNumber = gBattlersCount; @@ -2245,7 +2245,7 @@ bool8 HasNoMonsToSwitch(u8 battler, u8 partyIdBattlerOn1, u8 partyIdBattlerOn2) } else if (gBattleTypeFlags & BATTLE_TYPE_MULTI) { - if (gBattleTypeFlags & BATTLE_TYPE_x800000) + if (gBattleTypeFlags & BATTLE_TYPE_TOWER_LINK_MULTI) { if (GetBattlerSide(battler) == B_SIDE_PLAYER) { @@ -3966,7 +3966,7 @@ u8 IsMonDisobedient(void) s32 calc; u8 obedienceLevel = 0; - if (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000)) + if (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_RECORDED_LINK)) return 0; if (GetBattlerSide(gBattlerAttacker) == B_SIDE_OPPONENT) return 0; diff --git a/src/berry_blender.c b/src/berry_blender.c index 573affbd5..08a25c58a 100644 --- a/src/berry_blender.c +++ b/src/berry_blender.c @@ -2390,7 +2390,7 @@ static s16 Debug_GetGameTimeStage(void) static void CalculatePokeblock(struct BlenderBerry *berries, struct Pokeblock *pokeblock, u8 numPlayers, u8 *flavors, u16 maxRPM) { s32 i, j; - s32 multiuseVar, var2; + s32 multiuseVar; u8 numNegatives; for (i = 0; i < FLAVOR_COUNT + 1; i++) diff --git a/src/berry_crush.c b/src/berry_crush.c index 90bc7150d..84e2e2eba 100755 --- a/src/berry_crush.c +++ b/src/berry_crush.c @@ -877,7 +877,7 @@ void StartBerryCrush(MainCallback callback) static void GetBerryFromBag(void) { if (gSpecialVar_ItemId < FIRST_BERRY_INDEX || gSpecialVar_ItemId > LAST_BERRY_INDEX + 1) - gSpecialVar_ItemId = ITEM_CHERI_BERRY; + gSpecialVar_ItemId = FIRST_BERRY_INDEX; else RemoveBagItem(gSpecialVar_ItemId, 1); @@ -1573,7 +1573,6 @@ static void Task_ShowBerryCrushRankings(u8 taskId) u8 i = 0, j, xPos, yPos; u32 score = 0; s16 *data = gTasks[taskId].data; - u8 *str; switch (data[0]) { @@ -1714,8 +1713,7 @@ void sub_8022588(struct BerryCrushGame *r5) void sub_8022600(struct BerryCrushGame *r6) { - u8 r7, r2; - u8 *r4; + u8 r7; for (r7 = 0; r7 < r6->unk9; ++r7) { diff --git a/src/cable_club.c b/src/cable_club.c index f02683c9d..cd0baefcd 100644 --- a/src/cable_club.c +++ b/src/cable_club.c @@ -128,8 +128,6 @@ static void UpdateLinkPlayerCountDisplay(u8 taskId, u8 numPlayers) static u32 ExchangeDataAndGetLinkupStatus(u8 minPlayers, u8 maxPlayers) { - int playerCount; - switch (GetLinkPlayerDataExchangeStatusTimed(minPlayers, maxPlayers)) { case EXCHANGE_COMPLETE: @@ -511,7 +509,6 @@ static void FinishLinkup(u16 *linkupStatus, u32 taskId) static void Task_LinkupAwaitTrainerCardData(u8 taskId) { u8 index; - struct TrainerCard *trainerCards; if (CheckLinkErrored(taskId) == TRUE) return; @@ -993,7 +990,7 @@ static void CB2_ReturnFromUnionRoomBattle(void) void CB2_ReturnFromCableClubBattle(void) { - gBattleTypeFlags &= ~BATTLE_TYPE_20; + gBattleTypeFlags &= ~BATTLE_TYPE_LINK_IN_BATTLE; Overworld_ResetMapMusic(); LoadPlayerParty(); SavePlayerBag(); diff --git a/src/contest.c b/src/contest.c index 02f3089f9..d2c18e3a1 100644 --- a/src/contest.c +++ b/src/contest.c @@ -4419,7 +4419,6 @@ static void CalculateAppealMoveImpact(u8 contestant) u16 move; u8 effect; u8 rnd; - bool8 canUseTurn; s32 i; eContestantStatus[contestant].appeal = 0; diff --git a/src/credits.c b/src/credits.c index 80c67f393..946d5d5b9 100644 --- a/src/credits.c +++ b/src/credits.c @@ -1159,7 +1159,7 @@ static void CB2_RunCreditsSequence(void) static void sub_8175548(void) { ResetBgsAndClearDma3BusyFlags(0); - InitBgsFromTemplates(0, sBackgroundTemplates, 1); + InitBgsFromTemplates(0, sBackgroundTemplates, ARRAY_COUNT(sBackgroundTemplates)); SetBgTilemapBuffer(0, AllocZeroed(BG_SCREEN_SIZE)); LoadPalette(gUnknown_085E56F0, 0x80, 0x40); InitWindows(sWindowTemplates); @@ -1306,8 +1306,6 @@ static void sub_8175808(u8 taskIdA) static void c2_080C9BFC(u8 taskIdA) { - u16 backup; - SetVBlankCallback(NULL); if (sub_8176AB0(gTasks[taskIdA].data[TDA_7], taskIdA)) diff --git a/src/data/bard_music/bard_sounds.h b/src/data/bard_music/bard_sounds.h index 4a0911726..1ec1f0d97 100644 --- a/src/data/bard_music/bard_sounds.h +++ b/src/data/bard_music/bard_sounds.h @@ -24,29 +24,29 @@ #include "events.h" #include "trendysaying.h" -const struct BardSound (*const gBardSoundsTable[])[6] = { - NULL, - gBardSounds_Trainer, - gBardSounds_Status, - gBardSounds_Battle, - gBardSounds_Greetings, - gBardSounds_People, - gBardSounds_Voices, - gBardSounds_Speech, - gBardSounds_Endings, - gBardSounds_Feelings, - gBardSounds_Conditions, - gBardSounds_Actions, - gBardSounds_Lifestyle, - gBardSounds_Hobbies, - gBardSounds_Time, - gBardSounds_Misc, - gBardSounds_Adjectives, - gBardSounds_Events, - NULL, - NULL, - gBardSounds_TrendySaying, - NULL +const struct BardSound (*const gBardSoundsTable[EC_NUM_GROUPS])[6] = { + [EC_GROUP_POKEMON] = NULL, // Handled by gBardSounds_Pokemon + [EC_GROUP_TRAINER] = gBardSounds_Trainer, + [EC_GROUP_STATUS] = gBardSounds_Status, + [EC_GROUP_BATTLE] = gBardSounds_Battle, + [EC_GROUP_GREETINGS] = gBardSounds_Greetings, + [EC_GROUP_PEOPLE] = gBardSounds_People, + [EC_GROUP_VOICES] = gBardSounds_Voices, + [EC_GROUP_SPEECH] = gBardSounds_Speech, + [EC_GROUP_ENDINGS] = gBardSounds_Endings, + [EC_GROUP_FEELINGS] = gBardSounds_Feelings, + [EC_GROUP_CONDITIONS] = gBardSounds_Conditions, + [EC_GROUP_ACTIONS] = gBardSounds_Actions, + [EC_GROUP_LIFESTYLE] = gBardSounds_Lifestyle, + [EC_GROUP_HOBBIES] = gBardSounds_Hobbies, + [EC_GROUP_TIME] = gBardSounds_Time, + [EC_GROUP_MISC] = gBardSounds_Misc, + [EC_GROUP_ADJECTIVES] = gBardSounds_Adjectives, + [EC_GROUP_EVENTS] = gBardSounds_Events, + [EC_GROUP_MOVE_1] = NULL, // Handled by gBardSounds_Moves + [EC_GROUP_MOVE_2] = NULL, // Handled by gBardSounds_Moves + [EC_GROUP_TRENDY_SAYING] = gBardSounds_TrendySaying, + [EC_GROUP_POKEMON_2] = NULL // Handled by gBardSounds_Pokemon }; #endif //GUARD_BARD_SOUNDS_TABLE_H diff --git a/src/data/battle_frontier/trainer_hill.h b/src/data/battle_frontier/trainer_hill.h index 0268526a6..f090385b0 100644 --- a/src/data/battle_frontier/trainer_hill.h +++ b/src/data/battle_frontier/trainer_hill.h @@ -1244,12 +1244,12 @@ static const struct TrHillFloor sDataTagNormal_Floors[] = .attackEV = 252, .speedEV = 252, .otId = TRAINER_HILL_OTID, - .hpIV = 31, - .attackIV = 31, - .defenseIV = 31, - .speedIV = 31, - .spAttackIV = 31, - .spDefenseIV = 31, + .hpIV = MAX_PER_STAT_IVS, + .attackIV = MAX_PER_STAT_IVS, + .defenseIV = MAX_PER_STAT_IVS, + .speedIV = MAX_PER_STAT_IVS, + .spAttackIV = MAX_PER_STAT_IVS, + .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 0, .personality = 0xCB, .nickname = _("SKITTY"), @@ -2717,11 +2717,11 @@ static const struct TrHillFloor sDataTagVariety_Floors[] = { .spAttackEV = 255, .otId = TRAINER_HILL_OTID, .hpIV = 30, - .attackIV = 31, + .attackIV = MAX_PER_STAT_IVS, .defenseIV = 30, - .speedIV = 31, + .speedIV = MAX_PER_STAT_IVS, .spAttackIV = 30, - .spDefenseIV = 31, + .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 0, .personality = 0x202, .nickname = _("UNOWN"), @@ -2738,11 +2738,11 @@ static const struct TrHillFloor sDataTagVariety_Floors[] = { .spAttackEV = 255, .otId = TRAINER_HILL_OTID, .hpIV = 30, - .attackIV = 31, - .defenseIV = 31, + .attackIV = MAX_PER_STAT_IVS, + .defenseIV = MAX_PER_STAT_IVS, .speedIV = 30, .spAttackIV = 30, - .spDefenseIV = 31, + .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 0, .personality = 0x10001, .nickname = _("UNOWN"), @@ -2921,11 +2921,11 @@ static const struct TrHillFloor sDataTagVariety_Floors[] = { .spAttackEV = 255, .otId = TRAINER_HILL_OTID, .hpIV = 30, - .attackIV = 31, + .attackIV = MAX_PER_STAT_IVS, .defenseIV = 30, .speedIV = 30, .spAttackIV = 30, - .spDefenseIV = 31, + .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 0, .personality = 0x302, .nickname = _("UNOWN"), @@ -2941,10 +2941,10 @@ static const struct TrHillFloor sDataTagVariety_Floors[] = { .hpEV = 255, .attackEV = 255, .otId = TRAINER_HILL_OTID, - .hpIV = 31, + .hpIV = MAX_PER_STAT_IVS, .attackIV = 30, - .defenseIV = 31, - .speedIV = 31, + .defenseIV = MAX_PER_STAT_IVS, + .speedIV = MAX_PER_STAT_IVS, .spAttackIV = 30, .spDefenseIV = 30, .abilityNum = 0, @@ -2962,12 +2962,12 @@ static const struct TrHillFloor sDataTagVariety_Floors[] = { .hpEV = 255, .spAttackEV = 255, .otId = TRAINER_HILL_OTID, - .hpIV = 31, - .attackIV = 31, + .hpIV = MAX_PER_STAT_IVS, + .attackIV = MAX_PER_STAT_IVS, .defenseIV = 30, .speedIV = 30, - .spAttackIV = 31, - .spDefenseIV = 31, + .spAttackIV = MAX_PER_STAT_IVS, + .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 0, .personality = 0x301, .nickname = _("UNOWN"), @@ -3820,12 +3820,12 @@ static const struct TrHillFloor sDataTagUnique_Floors[] = { .speedEV = 252, .spAttackEV = 252, .otId = TRAINER_HILL_OTID, - .hpIV = 31, - .attackIV = 31, - .defenseIV = 31, - .speedIV = 31, - .spAttackIV = 31, - .spDefenseIV = 31, + .hpIV = MAX_PER_STAT_IVS, + .attackIV = MAX_PER_STAT_IVS, + .defenseIV = MAX_PER_STAT_IVS, + .speedIV = MAX_PER_STAT_IVS, + .spAttackIV = MAX_PER_STAT_IVS, + .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 0, .personality = 0x32, .nickname = _("SMOOCHUM"), @@ -3842,12 +3842,12 @@ static const struct TrHillFloor sDataTagUnique_Floors[] = { .speedEV = 252, .spAttackEV = 252, .otId = TRAINER_HILL_OTID, - .hpIV = 31, - .attackIV = 31, - .defenseIV = 31, - .speedIV = 31, - .spAttackIV = 31, - .spDefenseIV = 31, + .hpIV = MAX_PER_STAT_IVS, + .attackIV = MAX_PER_STAT_IVS, + .defenseIV = MAX_PER_STAT_IVS, + .speedIV = MAX_PER_STAT_IVS, + .spAttackIV = MAX_PER_STAT_IVS, + .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 0, .personality = 0xC8, .nickname = _("AZURILL"), @@ -3864,12 +3864,12 @@ static const struct TrHillFloor sDataTagUnique_Floors[] = { .speedEV = 252, .spAttackEV = 252, .otId = TRAINER_HILL_OTID, - .hpIV = 31, - .attackIV = 31, - .defenseIV = 31, - .speedIV = 31, - .spAttackIV = 31, - .spDefenseIV = 31, + .hpIV = MAX_PER_STAT_IVS, + .attackIV = MAX_PER_STAT_IVS, + .defenseIV = MAX_PER_STAT_IVS, + .speedIV = MAX_PER_STAT_IVS, + .spAttackIV = MAX_PER_STAT_IVS, + .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 0, .personality = 0x0, .nickname = _("ELEKID"), @@ -3886,12 +3886,12 @@ static const struct TrHillFloor sDataTagUnique_Floors[] = { .attackEV = 252, .speedEV = 252, .otId = TRAINER_HILL_OTID, - .hpIV = 31, - .attackIV = 31, - .defenseIV = 31, - .speedIV = 31, - .spAttackIV = 31, - .spDefenseIV = 31, + .hpIV = MAX_PER_STAT_IVS, + .attackIV = MAX_PER_STAT_IVS, + .defenseIV = MAX_PER_STAT_IVS, + .speedIV = MAX_PER_STAT_IVS, + .spAttackIV = MAX_PER_STAT_IVS, + .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 0, .personality = 0x0, .nickname = _("CLEFFA"), @@ -3908,12 +3908,12 @@ static const struct TrHillFloor sDataTagUnique_Floors[] = { .defenseEV = 130, .spDefenseEV = 130, .otId = TRAINER_HILL_OTID, - .hpIV = 31, - .attackIV = 31, - .defenseIV = 31, - .speedIV = 31, - .spAttackIV = 31, - .spDefenseIV = 31, + .hpIV = MAX_PER_STAT_IVS, + .attackIV = MAX_PER_STAT_IVS, + .defenseIV = MAX_PER_STAT_IVS, + .speedIV = MAX_PER_STAT_IVS, + .spAttackIV = MAX_PER_STAT_IVS, + .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 0, .personality = 0x84, .nickname = _("WYNAUT"), @@ -3930,12 +3930,12 @@ static const struct TrHillFloor sDataTagUnique_Floors[] = { .speedEV = 252, .spAttackEV = 252, .otId = TRAINER_HILL_OTID, - .hpIV = 31, - .attackIV = 31, - .defenseIV = 31, - .speedIV = 31, - .spAttackIV = 31, - .spDefenseIV = 31, + .hpIV = MAX_PER_STAT_IVS, + .attackIV = MAX_PER_STAT_IVS, + .defenseIV = MAX_PER_STAT_IVS, + .speedIV = MAX_PER_STAT_IVS, + .spAttackIV = MAX_PER_STAT_IVS, + .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 0, .personality = 0xF, .nickname = _("MAGBY"), @@ -4319,12 +4319,12 @@ static const struct TrHillFloor sDataTagExpert_Floors[] = { .attackEV = 252, .defenseEV = 252, .otId = TRAINER_HILL_OTID, - .hpIV = 31, - .attackIV = 31, - .defenseIV = 31, - .speedIV = 31, - .spAttackIV = 31, - .spDefenseIV = 31, + .hpIV = MAX_PER_STAT_IVS, + .attackIV = MAX_PER_STAT_IVS, + .defenseIV = MAX_PER_STAT_IVS, + .speedIV = MAX_PER_STAT_IVS, + .spAttackIV = MAX_PER_STAT_IVS, + .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 0, .personality = 0x35, .nickname = _("SNORLAX"), @@ -4341,12 +4341,12 @@ static const struct TrHillFloor sDataTagExpert_Floors[] = { .attackEV = 252, .speedEV = 252, .otId = TRAINER_HILL_OTID, - .hpIV = 31, - .attackIV = 31, - .defenseIV = 31, - .speedIV = 31, - .spAttackIV = 31, - .spDefenseIV = 31, + .hpIV = MAX_PER_STAT_IVS, + .attackIV = MAX_PER_STAT_IVS, + .defenseIV = MAX_PER_STAT_IVS, + .speedIV = MAX_PER_STAT_IVS, + .spAttackIV = MAX_PER_STAT_IVS, + .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 0, .personality = 0x3, .nickname = _("MILTANK"), @@ -4363,12 +4363,12 @@ static const struct TrHillFloor sDataTagExpert_Floors[] = { .attackEV = 252, .spAttackEV = 6, .otId = TRAINER_HILL_OTID, - .hpIV = 31, - .attackIV = 31, - .defenseIV = 31, - .speedIV = 31, - .spAttackIV = 31, - .spDefenseIV = 31, + .hpIV = MAX_PER_STAT_IVS, + .attackIV = MAX_PER_STAT_IVS, + .defenseIV = MAX_PER_STAT_IVS, + .speedIV = MAX_PER_STAT_IVS, + .spAttackIV = MAX_PER_STAT_IVS, + .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 0, .personality = 0x7F, .nickname = _("URSARING"), @@ -4385,12 +4385,12 @@ static const struct TrHillFloor sDataTagExpert_Floors[] = { .attackEV = 252, .spDefenseEV = 252, .otId = TRAINER_HILL_OTID, - .hpIV = 31, - .attackIV = 31, - .defenseIV = 31, - .speedIV = 31, - .spAttackIV = 31, - .spDefenseIV = 31, + .hpIV = MAX_PER_STAT_IVS, + .attackIV = MAX_PER_STAT_IVS, + .defenseIV = MAX_PER_STAT_IVS, + .speedIV = MAX_PER_STAT_IVS, + .spAttackIV = MAX_PER_STAT_IVS, + .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 0, .personality = 0x80, .nickname = _("SLAKING"), @@ -4407,12 +4407,12 @@ static const struct TrHillFloor sDataTagExpert_Floors[] = { .attackEV = 252, .speedEV = 252, .otId = TRAINER_HILL_OTID, - .hpIV = 31, - .attackIV = 31, - .defenseIV = 31, - .speedIV = 31, - .spAttackIV = 31, - .spDefenseIV = 31, + .hpIV = MAX_PER_STAT_IVS, + .attackIV = MAX_PER_STAT_IVS, + .defenseIV = MAX_PER_STAT_IVS, + .speedIV = MAX_PER_STAT_IVS, + .spAttackIV = MAX_PER_STAT_IVS, + .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 0, .personality = 0x3, .nickname = _("KANGASKHAN"), @@ -4429,12 +4429,12 @@ static const struct TrHillFloor sDataTagExpert_Floors[] = { .attackEV = 252, .speedEV = 252, .otId = TRAINER_HILL_OTID, - .hpIV = 31, - .attackIV = 31, - .defenseIV = 31, - .speedIV = 31, - .spAttackIV = 31, - .spDefenseIV = 31, + .hpIV = MAX_PER_STAT_IVS, + .attackIV = MAX_PER_STAT_IVS, + .defenseIV = MAX_PER_STAT_IVS, + .speedIV = MAX_PER_STAT_IVS, + .spAttackIV = MAX_PER_STAT_IVS, + .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 0, .personality = 0x80, .nickname = _("ZANGOOSE"), @@ -4464,12 +4464,12 @@ static const struct TrHillFloor sDataTagExpert_Floors[] = { .defenseEV = 110, .spAttackEV = 200, .otId = TRAINER_HILL_OTID, - .hpIV = 31, - .attackIV = 31, - .defenseIV = 31, - .speedIV = 31, - .spAttackIV = 31, - .spDefenseIV = 31, + .hpIV = MAX_PER_STAT_IVS, + .attackIV = MAX_PER_STAT_IVS, + .defenseIV = MAX_PER_STAT_IVS, + .speedIV = MAX_PER_STAT_IVS, + .spAttackIV = MAX_PER_STAT_IVS, + .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 1, .personality = 0xF, .nickname = _("SLOWKING"), @@ -4486,12 +4486,12 @@ static const struct TrHillFloor sDataTagExpert_Floors[] = { .speedEV = 252, .spAttackEV = 252, .otId = TRAINER_HILL_OTID, - .hpIV = 31, - .attackIV = 31, - .defenseIV = 31, - .speedIV = 31, - .spAttackIV = 31, - .spDefenseIV = 31, + .hpIV = MAX_PER_STAT_IVS, + .attackIV = MAX_PER_STAT_IVS, + .defenseIV = MAX_PER_STAT_IVS, + .speedIV = MAX_PER_STAT_IVS, + .spAttackIV = MAX_PER_STAT_IVS, + .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 0, .personality = 0x28, .nickname = _("ESPEON"), @@ -4508,12 +4508,12 @@ static const struct TrHillFloor sDataTagExpert_Floors[] = { .speedEV = 252, .spAttackEV = 252, .otId = TRAINER_HILL_OTID, - .hpIV = 31, - .attackIV = 31, - .defenseIV = 31, - .speedIV = 31, - .spAttackIV = 31, - .spDefenseIV = 31, + .hpIV = MAX_PER_STAT_IVS, + .attackIV = MAX_PER_STAT_IVS, + .defenseIV = MAX_PER_STAT_IVS, + .speedIV = MAX_PER_STAT_IVS, + .spAttackIV = MAX_PER_STAT_IVS, + .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 1, .personality = 0xF, .nickname = _("STARMIE"), @@ -4530,12 +4530,12 @@ static const struct TrHillFloor sDataTagExpert_Floors[] = { .speedEV = 252, .spAttackEV = 252, .otId = TRAINER_HILL_OTID, - .hpIV = 31, - .attackIV = 31, - .defenseIV = 31, - .speedIV = 31, - .spAttackIV = 31, - .spDefenseIV = 31, + .hpIV = MAX_PER_STAT_IVS, + .attackIV = MAX_PER_STAT_IVS, + .defenseIV = MAX_PER_STAT_IVS, + .speedIV = MAX_PER_STAT_IVS, + .spAttackIV = MAX_PER_STAT_IVS, + .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 0, .personality = 0xF, .nickname = _("GENGAR"), @@ -4552,12 +4552,12 @@ static const struct TrHillFloor sDataTagExpert_Floors[] = { .speedEV = 252, .spAttackEV = 252, .otId = TRAINER_HILL_OTID, - .hpIV = 31, - .attackIV = 31, - .defenseIV = 31, - .speedIV = 31, - .spAttackIV = 31, - .spDefenseIV = 31, + .hpIV = MAX_PER_STAT_IVS, + .attackIV = MAX_PER_STAT_IVS, + .defenseIV = MAX_PER_STAT_IVS, + .speedIV = MAX_PER_STAT_IVS, + .spAttackIV = MAX_PER_STAT_IVS, + .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 0, .personality = 0xF, .nickname = _("GARDEVOIR"), @@ -4574,12 +4574,12 @@ static const struct TrHillFloor sDataTagExpert_Floors[] = { .speedEV = 252, .spAttackEV = 252, .otId = TRAINER_HILL_OTID, - .hpIV = 31, - .attackIV = 31, - .defenseIV = 31, - .speedIV = 31, - .spAttackIV = 31, - .spDefenseIV = 31, + .hpIV = MAX_PER_STAT_IVS, + .attackIV = MAX_PER_STAT_IVS, + .defenseIV = MAX_PER_STAT_IVS, + .speedIV = MAX_PER_STAT_IVS, + .spAttackIV = MAX_PER_STAT_IVS, + .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 0, .personality = 0xF, .nickname = _("ALAKAZAM"), @@ -4641,12 +4641,12 @@ static const struct TrHillFloor sDataTagExpert_Floors[] = { .attackEV = 252, .spDefenseEV = 6, .otId = TRAINER_HILL_OTID, - .hpIV = 31, - .attackIV = 31, - .defenseIV = 31, - .speedIV = 31, - .spAttackIV = 31, - .spDefenseIV = 31, + .hpIV = MAX_PER_STAT_IVS, + .attackIV = MAX_PER_STAT_IVS, + .defenseIV = MAX_PER_STAT_IVS, + .speedIV = MAX_PER_STAT_IVS, + .spAttackIV = MAX_PER_STAT_IVS, + .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 0, .personality = 0x3, .nickname = _("SWELLOW"), @@ -4663,12 +4663,12 @@ static const struct TrHillFloor sDataTagExpert_Floors[] = { .attackEV = 252, .spDefenseEV = 6, .otId = TRAINER_HILL_OTID, - .hpIV = 31, - .attackIV = 31, - .defenseIV = 31, - .speedIV = 31, - .spAttackIV = 31, - .spDefenseIV = 31, + .hpIV = MAX_PER_STAT_IVS, + .attackIV = MAX_PER_STAT_IVS, + .defenseIV = MAX_PER_STAT_IVS, + .speedIV = MAX_PER_STAT_IVS, + .spAttackIV = MAX_PER_STAT_IVS, + .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 0, .personality = 0x3, .nickname = _("MACHAMP"), @@ -4685,12 +4685,12 @@ static const struct TrHillFloor sDataTagExpert_Floors[] = { .attackEV = 252, .spDefenseEV = 6, .otId = TRAINER_HILL_OTID, - .hpIV = 31, - .attackIV = 31, - .defenseIV = 31, - .speedIV = 31, - .spAttackIV = 31, - .spDefenseIV = 31, + .hpIV = MAX_PER_STAT_IVS, + .attackIV = MAX_PER_STAT_IVS, + .defenseIV = MAX_PER_STAT_IVS, + .speedIV = MAX_PER_STAT_IVS, + .spAttackIV = MAX_PER_STAT_IVS, + .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 0, .personality = 0x3, .nickname = _("URSARING"), @@ -4707,12 +4707,12 @@ static const struct TrHillFloor sDataTagExpert_Floors[] = { .attackEV = 252, .spDefenseEV = 6, .otId = TRAINER_HILL_OTID, - .hpIV = 31, - .attackIV = 31, - .defenseIV = 31, - .speedIV = 31, - .spAttackIV = 31, - .spDefenseIV = 31, + .hpIV = MAX_PER_STAT_IVS, + .attackIV = MAX_PER_STAT_IVS, + .defenseIV = MAX_PER_STAT_IVS, + .speedIV = MAX_PER_STAT_IVS, + .spAttackIV = MAX_PER_STAT_IVS, + .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 0, .personality = 0x80, .nickname = _("KINGLER"), @@ -4729,12 +4729,12 @@ static const struct TrHillFloor sDataTagExpert_Floors[] = { .attackEV = 252, .defenseEV = 6, .otId = TRAINER_HILL_OTID, - .hpIV = 31, - .attackIV = 31, - .defenseIV = 31, - .speedIV = 31, - .spAttackIV = 31, - .spDefenseIV = 31, + .hpIV = MAX_PER_STAT_IVS, + .attackIV = MAX_PER_STAT_IVS, + .defenseIV = MAX_PER_STAT_IVS, + .speedIV = MAX_PER_STAT_IVS, + .spAttackIV = MAX_PER_STAT_IVS, + .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 0, .personality = 0x80, .nickname = _("TYRANITAR"), @@ -4751,12 +4751,12 @@ static const struct TrHillFloor sDataTagExpert_Floors[] = { .attackEV = 252, .spDefenseEV = 6, .otId = TRAINER_HILL_OTID, - .hpIV = 31, - .attackIV = 31, - .defenseIV = 31, - .speedIV = 31, - .spAttackIV = 31, - .spDefenseIV = 31, + .hpIV = MAX_PER_STAT_IVS, + .attackIV = MAX_PER_STAT_IVS, + .defenseIV = MAX_PER_STAT_IVS, + .speedIV = MAX_PER_STAT_IVS, + .spAttackIV = MAX_PER_STAT_IVS, + .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 0, .personality = 0x80, .nickname = _("DRAGONITE"), @@ -4786,12 +4786,12 @@ static const struct TrHillFloor sDataTagExpert_Floors[] = { .speedEV = 252, .spAttackEV = 252, .otId = TRAINER_HILL_OTID, - .hpIV = 31, - .attackIV = 31, - .defenseIV = 31, - .speedIV = 31, - .spAttackIV = 31, - .spDefenseIV = 31, + .hpIV = MAX_PER_STAT_IVS, + .attackIV = MAX_PER_STAT_IVS, + .defenseIV = MAX_PER_STAT_IVS, + .speedIV = MAX_PER_STAT_IVS, + .spAttackIV = MAX_PER_STAT_IVS, + .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 0, .personality = 0xA, .nickname = _("JOLTEON"), @@ -4808,12 +4808,12 @@ static const struct TrHillFloor sDataTagExpert_Floors[] = { .speedEV = 252, .spAttackEV = 252, .otId = TRAINER_HILL_OTID, - .hpIV = 31, - .attackIV = 31, - .defenseIV = 31, - .speedIV = 31, - .spAttackIV = 31, - .spDefenseIV = 31, + .hpIV = MAX_PER_STAT_IVS, + .attackIV = MAX_PER_STAT_IVS, + .defenseIV = MAX_PER_STAT_IVS, + .speedIV = MAX_PER_STAT_IVS, + .spAttackIV = MAX_PER_STAT_IVS, + .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 0, .personality = 0xA, .nickname = _("ALAKAZAM"), @@ -4830,12 +4830,12 @@ static const struct TrHillFloor sDataTagExpert_Floors[] = { .speedEV = 252, .spAttackEV = 252, .otId = TRAINER_HILL_OTID, - .hpIV = 31, - .attackIV = 31, - .defenseIV = 31, - .speedIV = 31, - .spAttackIV = 31, - .spDefenseIV = 31, + .hpIV = MAX_PER_STAT_IVS, + .attackIV = MAX_PER_STAT_IVS, + .defenseIV = MAX_PER_STAT_IVS, + .speedIV = MAX_PER_STAT_IVS, + .spAttackIV = MAX_PER_STAT_IVS, + .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 1, .personality = 0xA, .nickname = _("STARMIE"), @@ -4852,12 +4852,12 @@ static const struct TrHillFloor sDataTagExpert_Floors[] = { .defenseEV = 252, .spDefenseEV = 6, .otId = TRAINER_HILL_OTID, - .hpIV = 31, - .attackIV = 31, - .defenseIV = 31, - .speedIV = 31, - .spAttackIV = 31, - .spDefenseIV = 31, + .hpIV = MAX_PER_STAT_IVS, + .attackIV = MAX_PER_STAT_IVS, + .defenseIV = MAX_PER_STAT_IVS, + .speedIV = MAX_PER_STAT_IVS, + .spAttackIV = MAX_PER_STAT_IVS, + .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 0, .personality = 0x82, .nickname = _("DUSCLOPS"), @@ -4874,12 +4874,12 @@ static const struct TrHillFloor sDataTagExpert_Floors[] = { .speedEV = 252, .spAttackEV = 252, .otId = TRAINER_HILL_OTID, - .hpIV = 31, - .attackIV = 31, - .defenseIV = 31, - .speedIV = 31, - .spAttackIV = 31, - .spDefenseIV = 31, + .hpIV = MAX_PER_STAT_IVS, + .attackIV = MAX_PER_STAT_IVS, + .defenseIV = MAX_PER_STAT_IVS, + .speedIV = MAX_PER_STAT_IVS, + .spAttackIV = MAX_PER_STAT_IVS, + .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 0, .personality = 0xD2, .nickname = _("NINETALES"), @@ -4896,12 +4896,12 @@ static const struct TrHillFloor sDataTagExpert_Floors[] = { .defenseEV = 252, .spDefenseEV = 6, .otId = TRAINER_HILL_OTID, - .hpIV = 31, - .attackIV = 31, - .defenseIV = 31, - .speedIV = 31, - .spAttackIV = 31, - .spDefenseIV = 31, + .hpIV = MAX_PER_STAT_IVS, + .attackIV = MAX_PER_STAT_IVS, + .defenseIV = MAX_PER_STAT_IVS, + .speedIV = MAX_PER_STAT_IVS, + .spAttackIV = MAX_PER_STAT_IVS, + .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 0, .personality = 0x85, .nickname = _("BANETTE"), @@ -4963,12 +4963,12 @@ static const struct TrHillFloor sDataTagExpert_Floors[] = { .defenseEV = 130, .spDefenseEV = 130, .otId = TRAINER_HILL_OTID, - .hpIV = 31, - .attackIV = 31, - .defenseIV = 31, - .speedIV = 31, - .spAttackIV = 31, - .spDefenseIV = 31, + .hpIV = MAX_PER_STAT_IVS, + .attackIV = MAX_PER_STAT_IVS, + .defenseIV = MAX_PER_STAT_IVS, + .speedIV = MAX_PER_STAT_IVS, + .spAttackIV = MAX_PER_STAT_IVS, + .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 0, .personality = 0x94, .nickname = _("WOBBUFFET"), @@ -4985,12 +4985,12 @@ static const struct TrHillFloor sDataTagExpert_Floors[] = { .defenseEV = 130, .spDefenseEV = 130, .otId = TRAINER_HILL_OTID, - .hpIV = 31, - .attackIV = 31, - .defenseIV = 31, - .speedIV = 31, - .spAttackIV = 31, - .spDefenseIV = 31, + .hpIV = MAX_PER_STAT_IVS, + .attackIV = MAX_PER_STAT_IVS, + .defenseIV = MAX_PER_STAT_IVS, + .speedIV = MAX_PER_STAT_IVS, + .spAttackIV = MAX_PER_STAT_IVS, + .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 0, .personality = 0x85, .nickname = _("EXPLOUD"), @@ -5007,12 +5007,12 @@ static const struct TrHillFloor sDataTagExpert_Floors[] = { .defenseEV = 130, .spDefenseEV = 130, .otId = TRAINER_HILL_OTID, - .hpIV = 31, - .attackIV = 31, - .defenseIV = 31, - .speedIV = 31, - .spAttackIV = 31, - .spDefenseIV = 31, + .hpIV = MAX_PER_STAT_IVS, + .attackIV = MAX_PER_STAT_IVS, + .defenseIV = MAX_PER_STAT_IVS, + .speedIV = MAX_PER_STAT_IVS, + .spAttackIV = MAX_PER_STAT_IVS, + .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 0, .personality = 0x0, .nickname = _("CROBAT"), @@ -5029,12 +5029,12 @@ static const struct TrHillFloor sDataTagExpert_Floors[] = { .attackEV = 252, .speedEV = 252, .otId = TRAINER_HILL_OTID, - .hpIV = 31, - .attackIV = 31, - .defenseIV = 31, - .speedIV = 31, - .spAttackIV = 31, - .spDefenseIV = 31, + .hpIV = MAX_PER_STAT_IVS, + .attackIV = MAX_PER_STAT_IVS, + .defenseIV = MAX_PER_STAT_IVS, + .speedIV = MAX_PER_STAT_IVS, + .spAttackIV = MAX_PER_STAT_IVS, + .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 1, .personality = 0xD, .nickname = _("DUGTRIO"), @@ -5051,12 +5051,12 @@ static const struct TrHillFloor sDataTagExpert_Floors[] = { .defenseEV = 252, .spAttackEV = 6, .otId = TRAINER_HILL_OTID, - .hpIV = 31, - .attackIV = 31, - .defenseIV = 31, - .speedIV = 31, - .spAttackIV = 31, - .spDefenseIV = 31, + .hpIV = MAX_PER_STAT_IVS, + .attackIV = MAX_PER_STAT_IVS, + .defenseIV = MAX_PER_STAT_IVS, + .speedIV = MAX_PER_STAT_IVS, + .spAttackIV = MAX_PER_STAT_IVS, + .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 0, .personality = 0x5, .nickname = _("ELECTRODE"), @@ -5073,12 +5073,12 @@ static const struct TrHillFloor sDataTagExpert_Floors[] = { .speedEV = 252, .spDefenseEV = 6, .otId = TRAINER_HILL_OTID, - .hpIV = 31, - .attackIV = 31, - .defenseIV = 31, - .speedIV = 31, - .spAttackIV = 31, - .spDefenseIV = 31, + .hpIV = MAX_PER_STAT_IVS, + .attackIV = MAX_PER_STAT_IVS, + .defenseIV = MAX_PER_STAT_IVS, + .speedIV = MAX_PER_STAT_IVS, + .spAttackIV = MAX_PER_STAT_IVS, + .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 0, .personality = 0x14, .nickname = _("GENGAR"), @@ -5108,12 +5108,12 @@ static const struct TrHillFloor sDataTagExpert_Floors[] = { .defenseEV = 130, .spDefenseEV = 130, .otId = TRAINER_HILL_OTID, - .hpIV = 31, - .attackIV = 31, - .defenseIV = 31, - .speedIV = 31, - .spAttackIV = 31, - .spDefenseIV = 31, + .hpIV = MAX_PER_STAT_IVS, + .attackIV = MAX_PER_STAT_IVS, + .defenseIV = MAX_PER_STAT_IVS, + .speedIV = MAX_PER_STAT_IVS, + .spAttackIV = MAX_PER_STAT_IVS, + .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 0, .personality = 0x82, .nickname = _("LAPRAS"), @@ -5130,12 +5130,12 @@ static const struct TrHillFloor sDataTagExpert_Floors[] = { .defenseEV = 6, .speedEV = 252, .otId = TRAINER_HILL_OTID, - .hpIV = 31, - .attackIV = 31, - .defenseIV = 31, - .speedIV = 31, - .spAttackIV = 31, - .spDefenseIV = 31, + .hpIV = MAX_PER_STAT_IVS, + .attackIV = MAX_PER_STAT_IVS, + .defenseIV = MAX_PER_STAT_IVS, + .speedIV = MAX_PER_STAT_IVS, + .spAttackIV = MAX_PER_STAT_IVS, + .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 0, .personality = 0x8A, .nickname = _("ABSOL"), @@ -5152,12 +5152,12 @@ static const struct TrHillFloor sDataTagExpert_Floors[] = { .spAttackEV = 6, .spDefenseEV = 252, .otId = TRAINER_HILL_OTID, - .hpIV = 31, - .attackIV = 31, - .defenseIV = 31, - .speedIV = 31, - .spAttackIV = 31, - .spDefenseIV = 31, + .hpIV = MAX_PER_STAT_IVS, + .attackIV = MAX_PER_STAT_IVS, + .defenseIV = MAX_PER_STAT_IVS, + .speedIV = MAX_PER_STAT_IVS, + .spAttackIV = MAX_PER_STAT_IVS, + .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 0, .personality = 0x0, .nickname = _("ALTARIA"), @@ -5174,12 +5174,12 @@ static const struct TrHillFloor sDataTagExpert_Floors[] = { .speedEV = 252, .spAttackEV = 6, .otId = TRAINER_HILL_OTID, - .hpIV = 31, - .attackIV = 31, - .defenseIV = 31, - .speedIV = 31, - .spAttackIV = 31, - .spDefenseIV = 31, + .hpIV = MAX_PER_STAT_IVS, + .attackIV = MAX_PER_STAT_IVS, + .defenseIV = MAX_PER_STAT_IVS, + .speedIV = MAX_PER_STAT_IVS, + .spAttackIV = MAX_PER_STAT_IVS, + .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 0, .personality = 0x14, .nickname = _("DEWGONG"), @@ -5196,12 +5196,12 @@ static const struct TrHillFloor sDataTagExpert_Floors[] = { .spAttackEV = 6, .spDefenseEV = 252, .otId = TRAINER_HILL_OTID, - .hpIV = 31, - .attackIV = 31, - .defenseIV = 31, - .speedIV = 31, - .spAttackIV = 31, - .spDefenseIV = 31, + .hpIV = MAX_PER_STAT_IVS, + .attackIV = MAX_PER_STAT_IVS, + .defenseIV = MAX_PER_STAT_IVS, + .speedIV = MAX_PER_STAT_IVS, + .spAttackIV = MAX_PER_STAT_IVS, + .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 1, .personality = 0x14, .nickname = _("POLITOED"), @@ -5218,12 +5218,12 @@ static const struct TrHillFloor sDataTagExpert_Floors[] = { .speedEV = 6, .spDefenseEV = 252, .otId = TRAINER_HILL_OTID, - .hpIV = 31, - .attackIV = 31, - .defenseIV = 31, - .speedIV = 31, - .spAttackIV = 31, - .spDefenseIV = 31, + .hpIV = MAX_PER_STAT_IVS, + .attackIV = MAX_PER_STAT_IVS, + .defenseIV = MAX_PER_STAT_IVS, + .speedIV = MAX_PER_STAT_IVS, + .spAttackIV = MAX_PER_STAT_IVS, + .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 1, .personality = 0x17, .nickname = _("MAROWAK"), @@ -5285,12 +5285,12 @@ static const struct TrHillFloor sDataTagExpert_Floors[] = { .attackEV = 200, .spDefenseEV = 200, .otId = TRAINER_HILL_OTID, - .hpIV = 31, - .attackIV = 31, - .defenseIV = 31, - .speedIV = 31, - .spAttackIV = 31, - .spDefenseIV = 31, + .hpIV = MAX_PER_STAT_IVS, + .attackIV = MAX_PER_STAT_IVS, + .defenseIV = MAX_PER_STAT_IVS, + .speedIV = MAX_PER_STAT_IVS, + .spAttackIV = MAX_PER_STAT_IVS, + .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 0, .personality = 0x3, .nickname = _("FORRETRESS"), @@ -5306,12 +5306,12 @@ static const struct TrHillFloor sDataTagExpert_Floors[] = { .attackEV = 255, .spAttackEV = 255, .otId = TRAINER_HILL_OTID, - .hpIV = 31, - .attackIV = 31, - .defenseIV = 31, - .speedIV = 31, - .spAttackIV = 31, - .spDefenseIV = 31, + .hpIV = MAX_PER_STAT_IVS, + .attackIV = MAX_PER_STAT_IVS, + .defenseIV = MAX_PER_STAT_IVS, + .speedIV = MAX_PER_STAT_IVS, + .spAttackIV = MAX_PER_STAT_IVS, + .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 1, .personality = 0xC, .nickname = _("ELECTRODE"), @@ -5327,12 +5327,12 @@ static const struct TrHillFloor sDataTagExpert_Floors[] = { .attackEV = 255, .spAttackEV = 255, .otId = TRAINER_HILL_OTID, - .hpIV = 31, - .attackIV = 31, - .defenseIV = 31, - .speedIV = 31, - .spAttackIV = 31, - .spDefenseIV = 31, + .hpIV = MAX_PER_STAT_IVS, + .attackIV = MAX_PER_STAT_IVS, + .defenseIV = MAX_PER_STAT_IVS, + .speedIV = MAX_PER_STAT_IVS, + .spAttackIV = MAX_PER_STAT_IVS, + .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 0, .personality = 0x7F, .nickname = _("EXEGGUTOR"), @@ -5349,12 +5349,12 @@ static const struct TrHillFloor sDataTagExpert_Floors[] = { .defenseEV = 200, .spDefenseEV = 200, .otId = TRAINER_HILL_OTID, - .hpIV = 31, - .attackIV = 31, - .defenseIV = 31, - .speedIV = 31, - .spAttackIV = 31, - .spDefenseIV = 31, + .hpIV = MAX_PER_STAT_IVS, + .attackIV = MAX_PER_STAT_IVS, + .defenseIV = MAX_PER_STAT_IVS, + .speedIV = MAX_PER_STAT_IVS, + .spAttackIV = MAX_PER_STAT_IVS, + .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 0, .personality = 0x93, .nickname = _("DUSCLOPS"), @@ -5370,12 +5370,12 @@ static const struct TrHillFloor sDataTagExpert_Floors[] = { .speedEV = 255, .spAttackEV = 255, .otId = TRAINER_HILL_OTID, - .hpIV = 31, - .attackIV = 31, - .defenseIV = 31, - .speedIV = 31, - .spAttackIV = 31, - .spDefenseIV = 31, + .hpIV = MAX_PER_STAT_IVS, + .attackIV = MAX_PER_STAT_IVS, + .defenseIV = MAX_PER_STAT_IVS, + .speedIV = MAX_PER_STAT_IVS, + .spAttackIV = MAX_PER_STAT_IVS, + .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 0, .personality = 0xF, .nickname = _("NINETALES"), @@ -5391,12 +5391,12 @@ static const struct TrHillFloor sDataTagExpert_Floors[] = { .hpEV = 255, .spAttackEV = 255, .otId = TRAINER_HILL_OTID, - .hpIV = 31, - .attackIV = 31, - .defenseIV = 31, - .speedIV = 31, - .spAttackIV = 31, - .spDefenseIV = 31, + .hpIV = MAX_PER_STAT_IVS, + .attackIV = MAX_PER_STAT_IVS, + .defenseIV = MAX_PER_STAT_IVS, + .speedIV = MAX_PER_STAT_IVS, + .spAttackIV = MAX_PER_STAT_IVS, + .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 0, .personality = 0x96, .nickname = _("BANETTE"), @@ -5425,12 +5425,12 @@ static const struct TrHillFloor sDataTagExpert_Floors[] = { .attackEV = 255, .spAttackEV = 255, .otId = TRAINER_HILL_OTID, - .hpIV = 31, - .attackIV = 31, - .defenseIV = 31, - .speedIV = 31, - .spAttackIV = 31, - .spDefenseIV = 31, + .hpIV = MAX_PER_STAT_IVS, + .attackIV = MAX_PER_STAT_IVS, + .defenseIV = MAX_PER_STAT_IVS, + .speedIV = MAX_PER_STAT_IVS, + .spAttackIV = MAX_PER_STAT_IVS, + .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 0, .personality = 0x95, .nickname = _("SALAMENCE"), @@ -5446,12 +5446,12 @@ static const struct TrHillFloor sDataTagExpert_Floors[] = { .speedEV = 255, .spAttackEV = 255, .otId = TRAINER_HILL_OTID, - .hpIV = 31, - .attackIV = 31, - .defenseIV = 31, - .speedIV = 31, - .spAttackIV = 31, - .spDefenseIV = 31, + .hpIV = MAX_PER_STAT_IVS, + .attackIV = MAX_PER_STAT_IVS, + .defenseIV = MAX_PER_STAT_IVS, + .speedIV = MAX_PER_STAT_IVS, + .spAttackIV = MAX_PER_STAT_IVS, + .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 0, .personality = 0x8C, .nickname = _("GENGAR"), @@ -5467,12 +5467,12 @@ static const struct TrHillFloor sDataTagExpert_Floors[] = { .attackEV = 255, .speedEV = 255, .otId = TRAINER_HILL_OTID, - .hpIV = 31, - .attackIV = 31, - .defenseIV = 31, - .speedIV = 31, - .spAttackIV = 31, - .spDefenseIV = 31, + .hpIV = MAX_PER_STAT_IVS, + .attackIV = MAX_PER_STAT_IVS, + .defenseIV = MAX_PER_STAT_IVS, + .speedIV = MAX_PER_STAT_IVS, + .spAttackIV = MAX_PER_STAT_IVS, + .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 0, .personality = 0x3, .nickname = _("GYARADOS"), @@ -5488,12 +5488,12 @@ static const struct TrHillFloor sDataTagExpert_Floors[] = { .attackEV = 255, .speedEV = 255, .otId = TRAINER_HILL_OTID, - .hpIV = 31, - .attackIV = 31, - .defenseIV = 31, - .speedIV = 31, - .spAttackIV = 31, - .spDefenseIV = 31, + .hpIV = MAX_PER_STAT_IVS, + .attackIV = MAX_PER_STAT_IVS, + .defenseIV = MAX_PER_STAT_IVS, + .speedIV = MAX_PER_STAT_IVS, + .spAttackIV = MAX_PER_STAT_IVS, + .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 0, .personality = 0x3, .nickname = _("GENGAR"), @@ -5510,12 +5510,12 @@ static const struct TrHillFloor sDataTagExpert_Floors[] = { .defenseEV = 200, .spDefenseEV = 200, .otId = TRAINER_HILL_OTID, - .hpIV = 31, - .attackIV = 31, - .defenseIV = 31, - .speedIV = 31, - .spAttackIV = 31, - .spDefenseIV = 31, + .hpIV = MAX_PER_STAT_IVS, + .attackIV = MAX_PER_STAT_IVS, + .defenseIV = MAX_PER_STAT_IVS, + .speedIV = MAX_PER_STAT_IVS, + .spAttackIV = MAX_PER_STAT_IVS, + .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 0, .personality = 0x14, .nickname = _("DUSCLOPS"), @@ -5532,12 +5532,12 @@ static const struct TrHillFloor sDataTagExpert_Floors[] = { .defenseEV = 180, .spDefenseEV = 150, .otId = TRAINER_HILL_OTID, - .hpIV = 31, - .attackIV = 31, - .defenseIV = 31, - .speedIV = 31, - .spAttackIV = 31, - .spDefenseIV = 31, + .hpIV = MAX_PER_STAT_IVS, + .attackIV = MAX_PER_STAT_IVS, + .defenseIV = MAX_PER_STAT_IVS, + .speedIV = MAX_PER_STAT_IVS, + .spAttackIV = MAX_PER_STAT_IVS, + .spDefenseIV = MAX_PER_STAT_IVS, .abilityNum = 0, .personality = 0x85, .nickname = _("MISDREAVUS"), diff --git a/src/data/decoration/header.h b/src/data/decoration/header.h index 55458c7a3..c57498828 100644 --- a/src/data/decoration/header.h +++ b/src/data/decoration/header.h @@ -1,1091 +1,1454 @@ -const struct Decoration gDecorations[] = { +const struct Decoration gDecorations[] = +{ + [DECOR_NONE] = { - DECOR_NONE, - _("SMALL DESK"), - DECORPERM_SOLID_FLOOR, - DECORSHAPE_1x1, - DECORCAT_DESK, - 0, - DecorDesc_SMALL_DESK, - DecorGfx_SMALL_DESK - }, { - DECOR_SMALL_DESK, - _("SMALL DESK"), - DECORPERM_SOLID_FLOOR, - DECORSHAPE_1x1, - DECORCAT_DESK, - 3000, - DecorDesc_SMALL_DESK, - DecorGfx_SMALL_DESK - }, { - DECOR_POKEMON_DESK, - _("POKéMON DESK"), - DECORPERM_SOLID_FLOOR, - DECORSHAPE_1x1, - DECORCAT_DESK, - 3000, - DecorDesc_POKEMON_DESK, - DecorGfx_POKEMON_DESK - }, { - DECOR_HEAVY_DESK, - _("HEAVY DESK"), - DECORPERM_SOLID_FLOOR, - DECORSHAPE_3x2, - DECORCAT_DESK, - 6000, - DecorDesc_HEAVY_DESK, - DecorGfx_HEAVY_DESK - }, { - DECOR_RAGGED_DESK, - _("RAGGED DESK"), - DECORPERM_SOLID_FLOOR, - DECORSHAPE_3x2, - DECORCAT_DESK, - 6000, - DecorDesc_RAGGED_DESK, - DecorGfx_RAGGED_DESK - }, { - DECOR_COMFORT_DESK, - _("COMFORT DESK"), - DECORPERM_SOLID_FLOOR, - DECORSHAPE_3x2, - DECORCAT_DESK, - 6000, - DecorDesc_COMFORT_DESK, - DecorGfx_COMFORT_DESK - }, { - DECOR_PRETTY_DESK, - _("PRETTY DESK"), - DECORPERM_SOLID_FLOOR, - DECORSHAPE_3x3, - DECORCAT_DESK, - 9000, - DecorDesc_PRETTY_DESK, - DecorGfx_PRETTY_DESK - }, { - DECOR_BRICK_DESK, - _("BRICK DESK"), - DECORPERM_SOLID_FLOOR, - DECORSHAPE_3x3, - DECORCAT_DESK, - 9000, - DecorDesc_BRICK_DESK, - DecorGfx_BRICK_DESK - }, { - DECOR_CAMP_DESK, - _("CAMP DESK"), - DECORPERM_SOLID_FLOOR, - DECORSHAPE_3x3, - DECORCAT_DESK, - 9000, - DecorDesc_CAMP_DESK, - DecorGfx_CAMP_DESK - }, { - DECOR_HARD_DESK, - _("HARD DESK"), - DECORPERM_SOLID_FLOOR, - DECORSHAPE_3x3, - DECORCAT_DESK, - 9000, - DecorDesc_HARD_DESK, - DecorGfx_HARD_DESK - }, { - DECOR_SMALL_CHAIR, - _("SMALL CHAIR"), - DECORPERM_PASS_FLOOR, - DECORSHAPE_1x1, - DECORCAT_CHAIR, - 2000, - DecorDesc_SMALL_CHAIR, - DecorGfx_SMALL_CHAIR - }, { - DECOR_POKEMON_CHAIR, - _("POKéMON CHAIR"), - DECORPERM_PASS_FLOOR, - DECORSHAPE_1x1, - DECORCAT_CHAIR, - 2000, - DecorDesc_POKEMON_CHAIR, - DecorGfx_POKEMON_CHAIR - }, { - DECOR_HEAVY_CHAIR, - _("HEAVY CHAIR"), - DECORPERM_PASS_FLOOR, - DECORSHAPE_1x1, - DECORCAT_CHAIR, - 2000, - DecorDesc_HEAVY_CHAIR, - DecorGfx_HEAVY_CHAIR - }, { - DECOR_PRETTY_CHAIR, - _("PRETTY CHAIR"), - DECORPERM_PASS_FLOOR, - DECORSHAPE_1x1, - DECORCAT_CHAIR, - 2000, - DecorDesc_PRETTY_CHAIR, - DecorGfx_PRETTY_CHAIR - }, { - DECOR_COMFORT_CHAIR, - _("COMFORT CHAIR"), - DECORPERM_PASS_FLOOR, - DECORSHAPE_1x1, - DECORCAT_CHAIR, - 2000, - DecorDesc_COMFORT_CHAIR, - DecorGfx_COMFORT_CHAIR - }, { - DECOR_RAGGED_CHAIR, - _("RAGGED CHAIR"), - DECORPERM_PASS_FLOOR, - DECORSHAPE_1x1, - DECORCAT_CHAIR, - 2000, - DecorDesc_RAGGED_CHAIR, - DecorGfx_RAGGED_CHAIR - }, { - DECOR_BRICK_CHAIR, - _("BRICK CHAIR"), - DECORPERM_PASS_FLOOR, - DECORSHAPE_1x1, - DECORCAT_CHAIR, - 2000, - DecorDesc_BRICK_CHAIR, - DecorGfx_BRICK_CHAIR - }, { - DECOR_CAMP_CHAIR, - _("CAMP CHAIR"), - DECORPERM_PASS_FLOOR, - DECORSHAPE_1x1, - DECORCAT_CHAIR, - 2000, - DecorDesc_CAMP_CHAIR, - DecorGfx_CAMP_CHAIR - }, { - DECOR_HARD_CHAIR, - _("HARD CHAIR"), - DECORPERM_PASS_FLOOR, - DECORSHAPE_1x1, - DECORCAT_CHAIR, - 2000, - DecorDesc_HARD_CHAIR, - DecorGfx_HARD_CHAIR - }, { - DECOR_RED_PLANT, - _("RED PLANT"), - DECORPERM_BEHIND_FLOOR, - DECORSHAPE_1x2, - DECORCAT_PLANT, - 3000, - DecorDesc_RED_PLANT, - DecorGfx_RED_PLANT - }, { - DECOR_TROPICAL_PLANT, - _("TROPICAL PLANT"), - DECORPERM_BEHIND_FLOOR, - DECORSHAPE_1x2, - DECORCAT_PLANT, - 3000, - DecorDesc_TROPICAL_PLANT, - DecorGfx_TROPICAL_PLANT - }, { - DECOR_PRETTY_FLOWERS, - _("PRETTY FLOWERS"), - DECORPERM_BEHIND_FLOOR, - DECORSHAPE_1x2, - DECORCAT_PLANT, - 3000, - DecorDesc_PRETTY_FLOWERS, - DecorGfx_PRETTY_FLOWERS - }, { - DECOR_COLORFUL_PLANT, - _("COLORFUL PLANT"), - DECORPERM_BEHIND_FLOOR, - DECORSHAPE_2x2, - DECORCAT_PLANT, - 5000, - DecorDesc_COLORFUL_PLANT, - DecorGfx_COLORFUL_PLANT - }, { - DECOR_BIG_PLANT, - _("BIG PLANT"), - DECORPERM_BEHIND_FLOOR, - DECORSHAPE_2x2, - DECORCAT_PLANT, - 5000, - DecorDesc_BIG_PLANT, - DecorGfx_BIG_PLANT - }, { - DECOR_GORGEOUS_PLANT, - _("GORGEOUS PLANT"), - DECORPERM_BEHIND_FLOOR, - DECORSHAPE_2x2, - DECORCAT_PLANT, - 5000, - DecorDesc_GORGEOUS_PLANT, - DecorGfx_GORGEOUS_PLANT - }, { - DECOR_RED_BRICK, - _("RED BRICK"), - DECORPERM_SOLID_FLOOR, - DECORSHAPE_1x2, - DECORCAT_ORNAMENT, - 500, - DecorDesc_RED_BRICK, - DecorGfx_RED_BRICK - }, { - DECOR_YELLOW_BRICK, - _("YELLOW BRICK"), - DECORPERM_SOLID_FLOOR, - DECORSHAPE_1x2, - DECORCAT_ORNAMENT, - 500, - DecorDesc_YELLOW_BRICK, - DecorGfx_YELLOW_BRICK - }, { - DECOR_BLUE_BRICK, - _("BLUE BRICK"), - DECORPERM_SOLID_FLOOR, - DECORSHAPE_1x2, - DECORCAT_ORNAMENT, - 500, - DecorDesc_BLUE_BRICK, - DecorGfx_BLUE_BRICK - }, { - DECOR_RED_BALLOON, - _("RED BALLOON"), - DECORPERM_PASS_FLOOR, - DECORSHAPE_1x1, - DECORCAT_ORNAMENT, - 500, - DecorDesc_RED_BALLOON, - DecorGfx_RED_BALLOON - }, { - DECOR_BLUE_BALLOON, - _("BLUE BALLOON"), - DECORPERM_PASS_FLOOR, - DECORSHAPE_1x1, - DECORCAT_ORNAMENT, - 500, - DecorDesc_BLUE_BALLOON, - DecorGfx_BLUE_BALLOON - }, { - DECOR_YELLOW_BALLOON, - _("YELLOW BALLOON"), - DECORPERM_PASS_FLOOR, - DECORSHAPE_1x1, - DECORCAT_ORNAMENT, - 500, - DecorDesc_YELLOW_BALLOON, - DecorGfx_YELLOW_BALLOON - }, { - DECOR_RED_TENT, - _("RED TENT"), - DECORPERM_PASS_FLOOR, - DECORSHAPE_3x3, - DECORCAT_ORNAMENT, - 10000, - DecorDesc_RED_TENT, - DecorGfx_RED_TENT - }, { - DECOR_BLUE_TENT, - _("BLUE TENT"), - DECORPERM_PASS_FLOOR, - DECORSHAPE_3x3, - DECORCAT_ORNAMENT, - 10000, - DecorDesc_BLUE_TENT, - DecorGfx_BLUE_TENT - }, { - DECOR_SOLID_BOARD, - _("SOLID BOARD"), - DECORPERM_PASS_FLOOR, - DECORSHAPE_1x2, - DECORCAT_ORNAMENT, - 3000, - DecorDesc_SOLID_BOARD, - DecorGfx_SOLID_BOARD - }, { - DECOR_SLIDE, - _("SLIDE"), - DECORPERM_PASS_FLOOR, - DECORSHAPE_2x4, - DECORCAT_ORNAMENT, - 8000, - DecorDesc_SLIDE, - DecorGfx_SLIDE - }, { - DECOR_FENCE_LENGTH, - _("FENCE LENGTH"), - DECORPERM_SOLID_FLOOR, - DECORSHAPE_1x1, - DECORCAT_ORNAMENT, - 500, - DecorDesc_FENCE_LENGTH, - DecorGfx_FENCE_LENGTH - }, { - DECOR_FENCE_WIDTH, - _("FENCE WIDTH"), - DECORPERM_SOLID_FLOOR, - DECORSHAPE_1x1, - DECORCAT_ORNAMENT, - 500, - DecorDesc_FENCE_WIDTH, - DecorGfx_FENCE_WIDTH - }, { - DECOR_TIRE, - _("TIRE"), - DECORPERM_SOLID_FLOOR, - DECORSHAPE_2x2, - DECORCAT_ORNAMENT, - 800, - DecorDesc_TIRE, - DecorGfx_TIRE - }, { - DECOR_STAND, - _("STAND"), - DECORPERM_PASS_FLOOR, - DECORSHAPE_4x2, - DECORCAT_ORNAMENT, - 7000, - DecorDesc_STAND, - DecorGfx_STAND - }, { - DECOR_MUD_BALL, - _("MUD BALL"), - DECORPERM_PASS_FLOOR, - DECORSHAPE_1x1, - DECORCAT_ORNAMENT, - 200, - DecorDesc_MUD_BALL, - DecorGfx_MUD_BALL - }, { - DECOR_BREAKABLE_DOOR, - _("BREAKABLE DOOR"), - DECORPERM_PASS_FLOOR, - DECORSHAPE_1x2, - DECORCAT_ORNAMENT, - 3000, - DecorDesc_BREAKABLE_DOOR, - DecorGfx_BREAKABLE_DOOR - }, { - DECOR_SAND_ORNAMENT, - _("SAND ORNAMENT"), - DECORPERM_BEHIND_FLOOR, - DECORSHAPE_1x2, - DECORCAT_ORNAMENT, - 3000, - DecorDesc_SAND_ORNAMENT, - DecorGfx_SAND_ORNAMENT - }, { - DECOR_SILVER_SHIELD, - _("SILVER SHIELD"), - DECORPERM_BEHIND_FLOOR, - DECORSHAPE_1x2, - DECORCAT_ORNAMENT, - 0, - DecorDesc_SILVER_SHIELD, - DecorGfx_SILVER_SHIELD - }, { - DECOR_GOLD_SHIELD, - _("GOLD SHIELD"), - DECORPERM_BEHIND_FLOOR, - DECORSHAPE_1x2, - DECORCAT_ORNAMENT, - 0, - DecorDesc_GOLD_SHIELD, - DecorGfx_GOLD_SHIELD - }, { - DECOR_GLASS_ORNAMENT, - _("GLASS ORNAMENT"), - DECORPERM_BEHIND_FLOOR, - DECORSHAPE_1x2, - DECORCAT_ORNAMENT, - 0, - DecorDesc_GLASS_ORNAMENT, - DecorGfx_GLASS_ORNAMENT - }, { - DECOR_TV, - _("TV"), - DECORPERM_SOLID_FLOOR, - DECORSHAPE_1x1, - DECORCAT_ORNAMENT, - 3000, - DecorDesc_TV, - DecorGfx_TV - }, { - DECOR_ROUND_TV, - _("ROUND TV"), - DECORPERM_SOLID_FLOOR, - DECORSHAPE_1x1, - DECORCAT_ORNAMENT, - 4000, - DecorDesc_ROUND_TV, - DecorGfx_ROUND_TV - }, { - DECOR_CUTE_TV, - _("CUTE TV"), - DECORPERM_SOLID_FLOOR, - DECORSHAPE_1x1, - DECORCAT_ORNAMENT, - 4000, - DecorDesc_CUTE_TV, - DecorGfx_CUTE_TV - }, { - DECOR_GLITTER_MAT, - _("GLITTER MAT"), - DECORPERM_PASS_FLOOR, - DECORSHAPE_1x1, - DECORCAT_MAT, - 2000, - DecorDesc_GLITTER_MAT, - DecorGfx_GLITTER_MAT - }, { - DECOR_JUMP_MAT, - _("JUMP MAT"), - DECORPERM_PASS_FLOOR, - DECORSHAPE_1x1, - DECORCAT_MAT, - 2000, - DecorDesc_JUMP_MAT, - DecorGfx_JUMP_MAT - }, { - DECOR_SPIN_MAT, - _("SPIN MAT"), - DECORPERM_PASS_FLOOR, - DECORSHAPE_1x1, - DECORCAT_MAT, - 2000, - DecorDesc_SPIN_MAT, - DecorGfx_SPIN_MAT - }, { - DECOR_C_LOW_NOTE_MAT, - _("C Low NOTE MAT"), - DECORPERM_PASS_FLOOR, - DECORSHAPE_1x1, - DECORCAT_MAT, - 500, - DecorDesc_C_LOW_NOTE_MAT, - DecorGfx_C_LOW_NOTE_MAT - }, { - DECOR_D_NOTE_MAT, - _("D NOTE MAT"), - DECORPERM_PASS_FLOOR, - DECORSHAPE_1x1, - DECORCAT_MAT, - 500, - DecorDesc_D_NOTE_MAT, - DecorGfx_D_NOTE_MAT - }, { - DECOR_E_NOTE_MAT, - _("E NOTE MAT"), - DECORPERM_PASS_FLOOR, - DECORSHAPE_1x1, - DECORCAT_MAT, - 500, - DecorDesc_E_NOTE_MAT, - DecorGfx_E_NOTE_MAT - }, { - DECOR_F_NOTE_MAT, - _("F NOTE MAT"), - DECORPERM_PASS_FLOOR, - DECORSHAPE_1x1, - DECORCAT_MAT, - 500, - DecorDesc_F_NOTE_MAT, - DecorGfx_F_NOTE_MAT - }, { - DECOR_G_NOTE_MAT, - _("G NOTE MAT"), - DECORPERM_PASS_FLOOR, - DECORSHAPE_1x1, - DECORCAT_MAT, - 500, - DecorDesc_G_NOTE_MAT, - DecorGfx_G_NOTE_MAT - }, { - DECOR_A_NOTE_MAT, - _("A NOTE MAT"), - DECORPERM_PASS_FLOOR, - DECORSHAPE_1x1, - DECORCAT_MAT, - 500, - DecorDesc_A_NOTE_MAT, - DecorGfx_A_NOTE_MAT - }, { - DECOR_B_NOTE_MAT, - _("B NOTE MAT"), - DECORPERM_PASS_FLOOR, - DECORSHAPE_1x1, - DECORCAT_MAT, - 500, - DecorDesc_B_NOTE_MAT, - DecorGfx_B_NOTE_MAT - }, { - DECOR_C_HIGH_NOTE_MAT, - _("C High NOTE MAT"), - DECORPERM_PASS_FLOOR, - DECORSHAPE_1x1, - DECORCAT_MAT, - 500, - DecorDesc_C_HIGH_NOTE_MAT, - DecorGfx_C_HIGH_NOTE_MAT - }, { - DECOR_SURF_MAT, - _("SURF MAT"), - DECORPERM_PASS_FLOOR, - DECORSHAPE_3x3, - DECORCAT_MAT, - 4000, - DecorDesc_SURF_MAT, - DecorGfx_SURF_MAT - }, { - DECOR_THUNDER_MAT, - _("THUNDER MAT"), - DECORPERM_PASS_FLOOR, - DECORSHAPE_3x3, - DECORCAT_MAT, - 4000, - DecorDesc_THUNDER_MAT, - DecorGfx_THUNDER_MAT - }, { - DECOR_FIRE_BLAST_MAT, - _("FIRE BLAST MAT"), - DECORPERM_PASS_FLOOR, - DECORSHAPE_3x3, - DECORCAT_MAT, - 4000, - DecorDesc_FIRE_BLAST_MAT, - DecorGfx_FIRE_BLAST_MAT - }, { - DECOR_POWDER_SNOW_MAT, - _("POWDER SNOW MAT"), - DECORPERM_PASS_FLOOR, - DECORSHAPE_3x3, - DECORCAT_MAT, - 4000, - DecorDesc_POWDER_SNOW_MAT, - DecorGfx_POWDER_SNOW_MAT - }, { - DECOR_ATTRACT_MAT, - _("ATTRACT MAT"), - DECORPERM_PASS_FLOOR, - DECORSHAPE_3x3, - DECORCAT_MAT, - 4000, - DecorDesc_ATTRACT_MAT, - DecorGfx_ATTRACT_MAT - }, { - DECOR_FISSURE_MAT, - _("FISSURE MAT"), - DECORPERM_PASS_FLOOR, - DECORSHAPE_3x3, - DECORCAT_MAT, - 4000, - DecorDesc_FISSURE_MAT, - DecorGfx_FISSURE_MAT - }, { - DECOR_SPIKES_MAT, - _("SPIKES MAT"), - DECORPERM_PASS_FLOOR, - DECORSHAPE_3x3, - DECORCAT_MAT, - 4000, - DecorDesc_SPIKES_MAT, - DecorGfx_SPIKES_MAT - }, { - DECOR_BALL_POSTER, - _("BALL POSTER"), - DECORPERM_NA_WALL, - DECORSHAPE_1x1, - DECORCAT_POSTER, - 1000, - DecorDesc_BALL_POSTER, - DecorGfx_BALL_POSTER - }, { - DECOR_GREEN_POSTER, - _("GREEN POSTER"), - DECORPERM_NA_WALL, - DECORSHAPE_1x1, - DECORCAT_POSTER, - 1000, - DecorDesc_GREEN_POSTER, - DecorGfx_GREEN_POSTER - }, { - DECOR_RED_POSTER, - _("RED POSTER"), - DECORPERM_NA_WALL, - DECORSHAPE_1x1, - DECORCAT_POSTER, - 1000, - DecorDesc_RED_POSTER, - DecorGfx_RED_POSTER - }, { - DECOR_BLUE_POSTER, - _("BLUE POSTER"), - DECORPERM_NA_WALL, - DECORSHAPE_1x1, - DECORCAT_POSTER, - 1000, - DecorDesc_BLUE_POSTER, - DecorGfx_BLUE_POSTER - }, { - DECOR_CUTE_POSTER, - _("CUTE POSTER"), - DECORPERM_NA_WALL, - DECORSHAPE_1x1, - DECORCAT_POSTER, - 1000, - DecorDesc_CUTE_POSTER, - DecorGfx_CUTE_POSTER - }, { - DECOR_PIKA_POSTER, - _("PIKA POSTER"), - DECORPERM_NA_WALL, - DECORSHAPE_2x1, - DECORCAT_POSTER, - 1500, - DecorDesc_PIKA_POSTER, - DecorGfx_PIKA_POSTER - }, { - DECOR_LONG_POSTER, - _("LONG POSTER"), - DECORPERM_NA_WALL, - DECORSHAPE_2x1, - DECORCAT_POSTER, - 1500, - DecorDesc_LONG_POSTER, - DecorGfx_LONG_POSTER - }, { - DECOR_SEA_POSTER, - _("SEA POSTER"), - DECORPERM_NA_WALL, - DECORSHAPE_2x1, - DECORCAT_POSTER, - 1500, - DecorDesc_SEA_POSTER, - DecorGfx_SEA_POSTER - }, { - DECOR_SKY_POSTER, - _("SKY POSTER"), - DECORPERM_NA_WALL, - DECORSHAPE_2x1, - DECORCAT_POSTER, - 1500, - DecorDesc_SKY_POSTER, - DecorGfx_SKY_POSTER - }, { - DECOR_KISS_POSTER, - _("KISS POSTER"), - DECORPERM_NA_WALL, - DECORSHAPE_2x1, - DECORCAT_POSTER, - 1500, - DecorDesc_KISS_POSTER, - DecorGfx_KISS_POSTER - }, { - DECOR_PICHU_DOLL, - _("PICHU DOLL"), - DECORPERM_SPRITE, - DECORSHAPE_1x1, - DECORCAT_DOLL, - 3000, - DecorDesc_PICHU_DOLL, - DecorGfx_PICHU_DOLL - }, { - DECOR_PIKACHU_DOLL, - _("PIKACHU DOLL"), - DECORPERM_SPRITE, - DECORSHAPE_1x1, - DECORCAT_DOLL, - 3000, - DecorDesc_PIKACHU_DOLL, - DecorGfx_PIKACHU_DOLL - }, { - DECOR_MARILL_DOLL, - _("MARILL DOLL"), - DECORPERM_SPRITE, - DECORSHAPE_1x1, - DECORCAT_DOLL, - 3000, - DecorDesc_MARILL_DOLL, - DecorGfx_MARILL_DOLL - }, { - DECOR_TOGEPI_DOLL, - _("TOGEPI DOLL"), - DECORPERM_SPRITE, - DECORSHAPE_1x1, - DECORCAT_DOLL, - 3000, - DecorDesc_TOGEPI_DOLL, - DecorGfx_TOGEPI_DOLL - }, { - DECOR_CYNDAQUIL_DOLL, - _("CYNDAQUIL DOLL"), - DECORPERM_SPRITE, - DECORSHAPE_1x1, - DECORCAT_DOLL, - 3000, - DecorDesc_CYNDAQUIL_DOLL, - DecorGfx_CYNDAQUIL_DOLL - }, { - DECOR_CHIKORITA_DOLL, - _("CHIKORITA DOLL"), - DECORPERM_SPRITE, - DECORSHAPE_1x1, - DECORCAT_DOLL, - 3000, - DecorDesc_CHIKORITA_DOLL, - DecorGfx_CHIKORITA_DOLL - }, { - DECOR_TOTODILE_DOLL, - _("TOTODILE DOLL"), - DECORPERM_SPRITE, - DECORSHAPE_1x1, - DECORCAT_DOLL, - 3000, - DecorDesc_TOTODILE_DOLL, - DecorGfx_TOTODILE_DOLL - }, { - DECOR_JIGGLYPUFF_DOLL, - _("JIGGLYPUFF DOLL"), - DECORPERM_SPRITE, - DECORSHAPE_1x1, - DECORCAT_DOLL, - 3000, - DecorDesc_JIGGLYPUFF_DOLL, - DecorGfx_JIGGLYPUFF_DOLL - }, { - DECOR_MEOWTH_DOLL, - _("MEOWTH DOLL"), - DECORPERM_SPRITE, - DECORSHAPE_1x1, - DECORCAT_DOLL, - 3000, - DecorDesc_MEOWTH_DOLL, - DecorGfx_MEOWTH_DOLL - }, { - DECOR_CLEFAIRY_DOLL, - _("CLEFAIRY DOLL"), - DECORPERM_SPRITE, - DECORSHAPE_1x1, - DECORCAT_DOLL, - 3000, - DecorDesc_CLEFAIRY_DOLL, - DecorGfx_CLEFAIRY_DOLL - }, { - DECOR_DITTO_DOLL, - _("DITTO DOLL"), - DECORPERM_SPRITE, - DECORSHAPE_1x1, - DECORCAT_DOLL, - 3000, - DecorDesc_DITTO_DOLL, - DecorGfx_DITTO_DOLL - }, { - DECOR_SMOOCHUM_DOLL, - _("SMOOCHUM DOLL"), - DECORPERM_SPRITE, - DECORSHAPE_1x1, - DECORCAT_DOLL, - 3000, - DecorDesc_SMOOCHUM_DOLL, - DecorGfx_SMOOCHUM_DOLL - }, { - DECOR_TREECKO_DOLL, - _("TREECKO DOLL"), - DECORPERM_SPRITE, - DECORSHAPE_1x1, - DECORCAT_DOLL, - 3000, - DecorDesc_TREECKO_DOLL, - DecorGfx_TREECKO_DOLL - }, { - DECOR_TORCHIC_DOLL, - _("TORCHIC DOLL"), - DECORPERM_SPRITE, - DECORSHAPE_1x1, - DECORCAT_DOLL, - 3000, - DecorDesc_TORCHIC_DOLL, - DecorGfx_TORCHIC_DOLL - }, { - DECOR_MUDKIP_DOLL, - _("MUDKIP DOLL"), - DECORPERM_SPRITE, - DECORSHAPE_1x1, - DECORCAT_DOLL, - 3000, - DecorDesc_MUDKIP_DOLL, - DecorGfx_MUDKIP_DOLL - }, { - DECOR_DUSKULL_DOLL, - _("DUSKULL DOLL"), - DECORPERM_SPRITE, - DECORSHAPE_1x1, - DECORCAT_DOLL, - 3000, - DecorDesc_DUSKULL_DOLL, - DecorGfx_DUSKULL_DOLL - }, { - DECOR_WYNAUT_DOLL, - _("WYNAUT DOLL"), - DECORPERM_SPRITE, - DECORSHAPE_1x1, - DECORCAT_DOLL, - 3000, - DecorDesc_WYNAUT_DOLL, - DecorGfx_WYNAUT_DOLL - }, { - DECOR_BALTOY_DOLL, - _("BALTOY DOLL"), - DECORPERM_SPRITE, - DECORSHAPE_1x1, - DECORCAT_DOLL, - 3000, - DecorDesc_BALTOY_DOLL, - DecorGfx_BALTOY_DOLL - }, { - DECOR_KECLEON_DOLL, - _("KECLEON DOLL"), - DECORPERM_SPRITE, - DECORSHAPE_1x1, - DECORCAT_DOLL, - 3000, - DecorDesc_KECLEON_DOLL, - DecorGfx_KECLEON_DOLL - }, { - DECOR_AZURILL_DOLL, - _("AZURILL DOLL"), - DECORPERM_SPRITE, - DECORSHAPE_1x1, - DECORCAT_DOLL, - 3000, - DecorDesc_AZURILL_DOLL, - DecorGfx_AZURILL_DOLL - }, { - DECOR_SKITTY_DOLL, - _("SKITTY DOLL"), - DECORPERM_SPRITE, - DECORSHAPE_1x1, - DECORCAT_DOLL, - 3000, - DecorDesc_SKITTY_DOLL, - DecorGfx_SKITTY_DOLL - }, { - DECOR_SWABLU_DOLL, - _("SWABLU DOLL"), - DECORPERM_SPRITE, - DECORSHAPE_1x1, - DECORCAT_DOLL, - 3000, - DecorDesc_SWABLU_DOLL, - DecorGfx_SWABLU_DOLL - }, { - DECOR_GULPIN_DOLL, - _("GULPIN DOLL"), - DECORPERM_SPRITE, - DECORSHAPE_1x1, - DECORCAT_DOLL, - 3000, - DecorDesc_GULPIN_DOLL, - DecorGfx_GULPIN_DOLL - }, { - DECOR_LOTAD_DOLL, - _("LOTAD DOLL"), - DECORPERM_SPRITE, - DECORSHAPE_1x1, - DECORCAT_DOLL, - 3000, - DecorDesc_LOTAD_DOLL, - DecorGfx_LOTAD_DOLL - }, { - DECOR_SEEDOT_DOLL, - _("SEEDOT DOLL"), - DECORPERM_SPRITE, - DECORSHAPE_1x1, - DECORCAT_DOLL, - 3000, - DecorDesc_SEEDOT_DOLL, - DecorGfx_SEEDOT_DOLL - }, { - DECOR_PIKA_CUSHION, - _("PIKA CUSHION"), - DECORPERM_SPRITE, - DECORSHAPE_1x1, - DECORCAT_CUSHION, - 2000, - DecorDesc_PIKA_CUSHION, - DecorGfx_PIKA_CUSHION - }, { - DECOR_ROUND_CUSHION, - _("ROUND CUSHION"), - DECORPERM_SPRITE, - DECORSHAPE_1x1, - DECORCAT_CUSHION, - 2000, - DecorDesc_ROUND_CUSHION, - DecorGfx_ROUND_CUSHION - }, { - DECOR_KISS_CUSHION, - _("KISS CUSHION"), - DECORPERM_SPRITE, - DECORSHAPE_1x1, - DECORCAT_CUSHION, - 2000, - DecorDesc_KISS_CUSHION, - DecorGfx_KISS_CUSHION - }, { - DECOR_ZIGZAG_CUSHION, - _("ZIGZAG CUSHION"), - DECORPERM_SPRITE, - DECORSHAPE_1x1, - DECORCAT_CUSHION, - 2000, - DecorDesc_ZIGZAG_CUSHION, - DecorGfx_ZIGZAG_CUSHION - }, { - DECOR_SPIN_CUSHION, - _("SPIN CUSHION"), - DECORPERM_SPRITE, - DECORSHAPE_1x1, - DECORCAT_CUSHION, - 2000, - DecorDesc_SPIN_CUSHION, - DecorGfx_SPIN_CUSHION - }, { - DECOR_DIAMOND_CUSHION, - _("DIAMOND CUSHION"), - DECORPERM_SPRITE, - DECORSHAPE_1x1, - DECORCAT_CUSHION, - 2000, - DecorDesc_DIAMOND_CUSHION, - DecorGfx_DIAMOND_CUSHION - }, { - DECOR_BALL_CUSHION, - _("BALL CUSHION"), - DECORPERM_SPRITE, - DECORSHAPE_1x1, - DECORCAT_CUSHION, - 2000, - DecorDesc_BALL_CUSHION, - DecorGfx_BALL_CUSHION - }, { - DECOR_GRASS_CUSHION, - _("GRASS CUSHION"), - DECORPERM_SPRITE, - DECORSHAPE_1x1, - DECORCAT_CUSHION, - 2000, - DecorDesc_GRASS_CUSHION, - DecorGfx_GRASS_CUSHION - }, { - DECOR_FIRE_CUSHION, - _("FIRE CUSHION"), - DECORPERM_SPRITE, - DECORSHAPE_1x1, - DECORCAT_CUSHION, - 2000, - DecorDesc_FIRE_CUSHION, - DecorGfx_FIRE_CUSHION - }, { - DECOR_WATER_CUSHION, - _("WATER CUSHION"), - DECORPERM_SPRITE, - DECORSHAPE_1x1, - DECORCAT_CUSHION, - 2000, - DecorDesc_WATER_CUSHION, - DecorGfx_WATER_CUSHION - }, { - DECOR_SNORLAX_DOLL, - _("SNORLAX DOLL"), - DECORPERM_SPRITE, - DECORSHAPE_1x2, - DECORCAT_DOLL, - 10000, - DecorDesc_SNORLAX_DOLL, - DecorGfx_SNORLAX_DOLL - }, { - DECOR_RHYDON_DOLL, - _("RHYDON DOLL"), - DECORPERM_SPRITE, - DECORSHAPE_1x2, - DECORCAT_DOLL, - 10000, - DecorDesc_RHYDON_DOLL, - DecorGfx_RHYDON_DOLL - }, { - DECOR_LAPRAS_DOLL, - _("LAPRAS DOLL"), - DECORPERM_SPRITE, - DECORSHAPE_1x2, - DECORCAT_DOLL, - 10000, - DecorDesc_LAPRAS_DOLL, - DecorGfx_LAPRAS_DOLL - }, { - DECOR_VENUSAUR_DOLL, - _("VENUSAUR DOLL"), - DECORPERM_SPRITE, - DECORSHAPE_1x2, - DECORCAT_DOLL, - 10000, - DecorDesc_VENUSAUR_DOLL, - DecorGfx_VENUSAUR_DOLL - }, { - DECOR_CHARIZARD_DOLL, - _("CHARIZARD DOLL"), - DECORPERM_SPRITE, - DECORSHAPE_1x2, - DECORCAT_DOLL, - 10000, - DecorDesc_CHARIZARD_DOLL, - DecorGfx_CHARIZARD_DOLL - }, { - DECOR_BLASTOISE_DOLL, - _("BLASTOISE DOLL"), - DECORPERM_SPRITE, - DECORSHAPE_1x2, - DECORCAT_DOLL, - 10000, - DecorDesc_BLASTOISE_DOLL, - DecorGfx_BLASTOISE_DOLL - }, { - DECOR_WAILMER_DOLL, - _("WAILMER DOLL"), - DECORPERM_SPRITE, - DECORSHAPE_1x2, - DECORCAT_DOLL, - 10000, - DecorDesc_WAILMER_DOLL, - DecorGfx_WAILMER_DOLL - }, { - DECOR_REGIROCK_DOLL, - _("REGIROCK DOLL"), - DECORPERM_SPRITE, - DECORSHAPE_1x2, - DECORCAT_DOLL, - 10000, - DecorDesc_REGIROCK_DOLL, - DecorGfx_REGIROCK_DOLL - }, { - DECOR_REGICE_DOLL, - _("REGICE DOLL"), - DECORPERM_SPRITE, - DECORSHAPE_1x2, - DECORCAT_DOLL, - 10000, - DecorDesc_REGICE_DOLL, - DecorGfx_REGICE_DOLL - }, { - DECOR_REGISTEEL_DOLL, - _("REGISTEEL DOLL"), - DECORPERM_SPRITE, - DECORSHAPE_1x2, - DECORCAT_DOLL, - 10000, - DecorDesc_REGISTEEL_DOLL, - DecorGfx_REGISTEEL_DOLL} + .id = DECOR_NONE, + .name = _("SMALL DESK"), + .permission = DECORPERM_SOLID_FLOOR, + .shape = DECORSHAPE_1x1, + .category = DECORCAT_DESK, + .price = 0, + .description = DecorDesc_SMALL_DESK, + .tiles = DecorGfx_SMALL_DESK, + }, + + [DECOR_SMALL_DESK] = + { + .id = DECOR_SMALL_DESK, + .name = _("SMALL DESK"), + .permission = DECORPERM_SOLID_FLOOR, + .shape = DECORSHAPE_1x1, + .category = DECORCAT_DESK, + .price = 3000, + .description = DecorDesc_SMALL_DESK, + .tiles = DecorGfx_SMALL_DESK, + }, + + [DECOR_POKEMON_DESK] = + { + .id = DECOR_POKEMON_DESK, + .name = _("POKéMON DESK"), + .permission = DECORPERM_SOLID_FLOOR, + .shape = DECORSHAPE_1x1, + .category = DECORCAT_DESK, + .price = 3000, + .description = DecorDesc_POKEMON_DESK, + .tiles = DecorGfx_POKEMON_DESK, + }, + + [DECOR_HEAVY_DESK] = + { + .id = DECOR_HEAVY_DESK, + .name = _("HEAVY DESK"), + .permission = DECORPERM_SOLID_FLOOR, + .shape = DECORSHAPE_3x2, + .category = DECORCAT_DESK, + .price = 6000, + .description = DecorDesc_HEAVY_DESK, + .tiles = DecorGfx_HEAVY_DESK, + }, + + [DECOR_RAGGED_DESK] = + { + .id = DECOR_RAGGED_DESK, + .name = _("RAGGED DESK"), + .permission = DECORPERM_SOLID_FLOOR, + .shape = DECORSHAPE_3x2, + .category = DECORCAT_DESK, + .price = 6000, + .description = DecorDesc_RAGGED_DESK, + .tiles = DecorGfx_RAGGED_DESK, + }, + + [DECOR_COMFORT_DESK] = + { + .id = DECOR_COMFORT_DESK, + .name = _("COMFORT DESK"), + .permission = DECORPERM_SOLID_FLOOR, + .shape = DECORSHAPE_3x2, + .category = DECORCAT_DESK, + .price = 6000, + .description = DecorDesc_COMFORT_DESK, + .tiles = DecorGfx_COMFORT_DESK, + }, + + [DECOR_PRETTY_DESK] = + { + .id = DECOR_PRETTY_DESK, + .name = _("PRETTY DESK"), + .permission = DECORPERM_SOLID_FLOOR, + .shape = DECORSHAPE_3x3, + .category = DECORCAT_DESK, + .price = 9000, + .description = DecorDesc_PRETTY_DESK, + .tiles = DecorGfx_PRETTY_DESK, + }, + + [DECOR_BRICK_DESK] = + { + .id = DECOR_BRICK_DESK, + .name = _("BRICK DESK"), + .permission = DECORPERM_SOLID_FLOOR, + .shape = DECORSHAPE_3x3, + .category = DECORCAT_DESK, + .price = 9000, + .description = DecorDesc_BRICK_DESK, + .tiles = DecorGfx_BRICK_DESK, + }, + + [DECOR_CAMP_DESK] = + { + .id = DECOR_CAMP_DESK, + .name = _("CAMP DESK"), + .permission = DECORPERM_SOLID_FLOOR, + .shape = DECORSHAPE_3x3, + .category = DECORCAT_DESK, + .price = 9000, + .description = DecorDesc_CAMP_DESK, + .tiles = DecorGfx_CAMP_DESK, + }, + + [DECOR_HARD_DESK] = + { + .id = DECOR_HARD_DESK, + .name = _("HARD DESK"), + .permission = DECORPERM_SOLID_FLOOR, + .shape = DECORSHAPE_3x3, + .category = DECORCAT_DESK, + .price = 9000, + .description = DecorDesc_HARD_DESK, + .tiles = DecorGfx_HARD_DESK, + }, + + [DECOR_SMALL_CHAIR] = + { + .id = DECOR_SMALL_CHAIR, + .name = _("SMALL CHAIR"), + .permission = DECORPERM_PASS_FLOOR, + .shape = DECORSHAPE_1x1, + .category = DECORCAT_CHAIR, + .price = 2000, + .description = DecorDesc_SMALL_CHAIR, + .tiles = DecorGfx_SMALL_CHAIR, + }, + + [DECOR_POKEMON_CHAIR] = + { + .id = DECOR_POKEMON_CHAIR, + .name = _("POKéMON CHAIR"), + .permission = DECORPERM_PASS_FLOOR, + .shape = DECORSHAPE_1x1, + .category = DECORCAT_CHAIR, + .price = 2000, + .description = DecorDesc_POKEMON_CHAIR, + .tiles = DecorGfx_POKEMON_CHAIR, + }, + + [DECOR_HEAVY_CHAIR] = + { + .id = DECOR_HEAVY_CHAIR, + .name = _("HEAVY CHAIR"), + .permission = DECORPERM_PASS_FLOOR, + .shape = DECORSHAPE_1x1, + .category = DECORCAT_CHAIR, + .price = 2000, + .description = DecorDesc_HEAVY_CHAIR, + .tiles = DecorGfx_HEAVY_CHAIR, + }, + + [DECOR_PRETTY_CHAIR] = + { + .id = DECOR_PRETTY_CHAIR, + .name = _("PRETTY CHAIR"), + .permission = DECORPERM_PASS_FLOOR, + .shape = DECORSHAPE_1x1, + .category = DECORCAT_CHAIR, + .price = 2000, + .description = DecorDesc_PRETTY_CHAIR, + .tiles = DecorGfx_PRETTY_CHAIR, + }, + + [DECOR_COMFORT_CHAIR] = + { + .id = DECOR_COMFORT_CHAIR, + .name = _("COMFORT CHAIR"), + .permission = DECORPERM_PASS_FLOOR, + .shape = DECORSHAPE_1x1, + .category = DECORCAT_CHAIR, + .price = 2000, + .description = DecorDesc_COMFORT_CHAIR, + .tiles = DecorGfx_COMFORT_CHAIR, + }, + + [DECOR_RAGGED_CHAIR] = + { + .id = DECOR_RAGGED_CHAIR, + .name = _("RAGGED CHAIR"), + .permission = DECORPERM_PASS_FLOOR, + .shape = DECORSHAPE_1x1, + .category = DECORCAT_CHAIR, + .price = 2000, + .description = DecorDesc_RAGGED_CHAIR, + .tiles = DecorGfx_RAGGED_CHAIR, + }, + + [DECOR_BRICK_CHAIR] = + { + .id = DECOR_BRICK_CHAIR, + .name = _("BRICK CHAIR"), + .permission = DECORPERM_PASS_FLOOR, + .shape = DECORSHAPE_1x1, + .category = DECORCAT_CHAIR, + .price = 2000, + .description = DecorDesc_BRICK_CHAIR, + .tiles = DecorGfx_BRICK_CHAIR, + }, + + [DECOR_CAMP_CHAIR] = + { + .id = DECOR_CAMP_CHAIR, + .name = _("CAMP CHAIR"), + .permission = DECORPERM_PASS_FLOOR, + .shape = DECORSHAPE_1x1, + .category = DECORCAT_CHAIR, + .price = 2000, + .description = DecorDesc_CAMP_CHAIR, + .tiles = DecorGfx_CAMP_CHAIR, + }, + + [DECOR_HARD_CHAIR] = + { + .id = DECOR_HARD_CHAIR, + .name = _("HARD CHAIR"), + .permission = DECORPERM_PASS_FLOOR, + .shape = DECORSHAPE_1x1, + .category = DECORCAT_CHAIR, + .price = 2000, + .description = DecorDesc_HARD_CHAIR, + .tiles = DecorGfx_HARD_CHAIR, + }, + + [DECOR_RED_PLANT] = + { + .id = DECOR_RED_PLANT, + .name = _("RED PLANT"), + .permission = DECORPERM_BEHIND_FLOOR, + .shape = DECORSHAPE_1x2, + .category = DECORCAT_PLANT, + .price = 3000, + .description = DecorDesc_RED_PLANT, + .tiles = DecorGfx_RED_PLANT, + }, + + [DECOR_TROPICAL_PLANT] = + { + .id = DECOR_TROPICAL_PLANT, + .name = _("TROPICAL PLANT"), + .permission = DECORPERM_BEHIND_FLOOR, + .shape = DECORSHAPE_1x2, + .category = DECORCAT_PLANT, + .price = 3000, + .description = DecorDesc_TROPICAL_PLANT, + .tiles = DecorGfx_TROPICAL_PLANT, + }, + + [DECOR_PRETTY_FLOWERS] = + { + .id = DECOR_PRETTY_FLOWERS, + .name = _("PRETTY FLOWERS"), + .permission = DECORPERM_BEHIND_FLOOR, + .shape = DECORSHAPE_1x2, + .category = DECORCAT_PLANT, + .price = 3000, + .description = DecorDesc_PRETTY_FLOWERS, + .tiles = DecorGfx_PRETTY_FLOWERS, + }, + + [DECOR_COLORFUL_PLANT] = + { + .id = DECOR_COLORFUL_PLANT, + .name = _("COLORFUL PLANT"), + .permission = DECORPERM_BEHIND_FLOOR, + .shape = DECORSHAPE_2x2, + .category = DECORCAT_PLANT, + .price = 5000, + .description = DecorDesc_COLORFUL_PLANT, + .tiles = DecorGfx_COLORFUL_PLANT, + }, + + [DECOR_BIG_PLANT] = + { + .id = DECOR_BIG_PLANT, + .name = _("BIG PLANT"), + .permission = DECORPERM_BEHIND_FLOOR, + .shape = DECORSHAPE_2x2, + .category = DECORCAT_PLANT, + .price = 5000, + .description = DecorDesc_BIG_PLANT, + .tiles = DecorGfx_BIG_PLANT, + }, + + [DECOR_GORGEOUS_PLANT] = + { + .id = DECOR_GORGEOUS_PLANT, + .name = _("GORGEOUS PLANT"), + .permission = DECORPERM_BEHIND_FLOOR, + .shape = DECORSHAPE_2x2, + .category = DECORCAT_PLANT, + .price = 5000, + .description = DecorDesc_GORGEOUS_PLANT, + .tiles = DecorGfx_GORGEOUS_PLANT, + }, + + [DECOR_RED_BRICK] = + { + .id = DECOR_RED_BRICK, + .name = _("RED BRICK"), + .permission = DECORPERM_SOLID_FLOOR, + .shape = DECORSHAPE_1x2, + .category = DECORCAT_ORNAMENT, + .price = 500, + .description = DecorDesc_RED_BRICK, + .tiles = DecorGfx_RED_BRICK, + }, + + [DECOR_YELLOW_BRICK] = + { + .id = DECOR_YELLOW_BRICK, + .name = _("YELLOW BRICK"), + .permission = DECORPERM_SOLID_FLOOR, + .shape = DECORSHAPE_1x2, + .category = DECORCAT_ORNAMENT, + .price = 500, + .description = DecorDesc_YELLOW_BRICK, + .tiles = DecorGfx_YELLOW_BRICK, + }, + + [DECOR_BLUE_BRICK] = + { + .id = DECOR_BLUE_BRICK, + .name = _("BLUE BRICK"), + .permission = DECORPERM_SOLID_FLOOR, + .shape = DECORSHAPE_1x2, + .category = DECORCAT_ORNAMENT, + .price = 500, + .description = DecorDesc_BLUE_BRICK, + .tiles = DecorGfx_BLUE_BRICK, + }, + + [DECOR_RED_BALLOON] = + { + .id = DECOR_RED_BALLOON, + .name = _("RED BALLOON"), + .permission = DECORPERM_PASS_FLOOR, + .shape = DECORSHAPE_1x1, + .category = DECORCAT_ORNAMENT, + .price = 500, + .description = DecorDesc_RED_BALLOON, + .tiles = DecorGfx_RED_BALLOON, + }, + + [DECOR_BLUE_BALLOON] = + { + .id = DECOR_BLUE_BALLOON, + .name = _("BLUE BALLOON"), + .permission = DECORPERM_PASS_FLOOR, + .shape = DECORSHAPE_1x1, + .category = DECORCAT_ORNAMENT, + .price = 500, + .description = DecorDesc_BLUE_BALLOON, + .tiles = DecorGfx_BLUE_BALLOON, + }, + + [DECOR_YELLOW_BALLOON] = + { + .id = DECOR_YELLOW_BALLOON, + .name = _("YELLOW BALLOON"), + .permission = DECORPERM_PASS_FLOOR, + .shape = DECORSHAPE_1x1, + .category = DECORCAT_ORNAMENT, + .price = 500, + .description = DecorDesc_YELLOW_BALLOON, + .tiles = DecorGfx_YELLOW_BALLOON, + }, + + [DECOR_RED_TENT] = + { + .id = DECOR_RED_TENT, + .name = _("RED TENT"), + .permission = DECORPERM_PASS_FLOOR, + .shape = DECORSHAPE_3x3, + .category = DECORCAT_ORNAMENT, + .price = 10000, + .description = DecorDesc_RED_TENT, + .tiles = DecorGfx_RED_TENT, + }, + + [DECOR_BLUE_TENT] = + { + .id = DECOR_BLUE_TENT, + .name = _("BLUE TENT"), + .permission = DECORPERM_PASS_FLOOR, + .shape = DECORSHAPE_3x3, + .category = DECORCAT_ORNAMENT, + .price = 10000, + .description = DecorDesc_BLUE_TENT, + .tiles = DecorGfx_BLUE_TENT, + }, + + [DECOR_SOLID_BOARD] = + { + .id = DECOR_SOLID_BOARD, + .name = _("SOLID BOARD"), + .permission = DECORPERM_PASS_FLOOR, + .shape = DECORSHAPE_1x2, + .category = DECORCAT_ORNAMENT, + .price = 3000, + .description = DecorDesc_SOLID_BOARD, + .tiles = DecorGfx_SOLID_BOARD, + }, + + [DECOR_SLIDE] = + { + .id = DECOR_SLIDE, + .name = _("SLIDE"), + .permission = DECORPERM_PASS_FLOOR, + .shape = DECORSHAPE_2x4, + .category = DECORCAT_ORNAMENT, + .price = 8000, + .description = DecorDesc_SLIDE, + .tiles = DecorGfx_SLIDE, + }, + + [DECOR_FENCE_LENGTH] = + { + .id = DECOR_FENCE_LENGTH, + .name = _("FENCE LENGTH"), + .permission = DECORPERM_SOLID_FLOOR, + .shape = DECORSHAPE_1x1, + .category = DECORCAT_ORNAMENT, + .price = 500, + .description = DecorDesc_FENCE_LENGTH, + .tiles = DecorGfx_FENCE_LENGTH, + }, + + [DECOR_FENCE_WIDTH] = + { + .id = DECOR_FENCE_WIDTH, + .name = _("FENCE WIDTH"), + .permission = DECORPERM_SOLID_FLOOR, + .shape = DECORSHAPE_1x1, + .category = DECORCAT_ORNAMENT, + .price = 500, + .description = DecorDesc_FENCE_WIDTH, + .tiles = DecorGfx_FENCE_WIDTH, + }, + + [DECOR_TIRE] = + { + .id = DECOR_TIRE, + .name = _("TIRE"), + .permission = DECORPERM_SOLID_FLOOR, + .shape = DECORSHAPE_2x2, + .category = DECORCAT_ORNAMENT, + .price = 800, + .description = DecorDesc_TIRE, + .tiles = DecorGfx_TIRE, + }, + + [DECOR_STAND] = + { + .id = DECOR_STAND, + .name = _("STAND"), + .permission = DECORPERM_PASS_FLOOR, + .shape = DECORSHAPE_4x2, + .category = DECORCAT_ORNAMENT, + .price = 7000, + .description = DecorDesc_STAND, + .tiles = DecorGfx_STAND, + }, + + [DECOR_MUD_BALL] = + { + .id = DECOR_MUD_BALL, + .name = _("MUD BALL"), + .permission = DECORPERM_PASS_FLOOR, + .shape = DECORSHAPE_1x1, + .category = DECORCAT_ORNAMENT, + .price = 200, + .description = DecorDesc_MUD_BALL, + .tiles = DecorGfx_MUD_BALL, + }, + + [DECOR_BREAKABLE_DOOR] = + { + .id = DECOR_BREAKABLE_DOOR, + .name = _("BREAKABLE DOOR"), + .permission = DECORPERM_PASS_FLOOR, + .shape = DECORSHAPE_1x2, + .category = DECORCAT_ORNAMENT, + .price = 3000, + .description = DecorDesc_BREAKABLE_DOOR, + .tiles = DecorGfx_BREAKABLE_DOOR, + }, + + [DECOR_SAND_ORNAMENT] = + { + .id = DECOR_SAND_ORNAMENT, + .name = _("SAND ORNAMENT"), + .permission = DECORPERM_BEHIND_FLOOR, + .shape = DECORSHAPE_1x2, + .category = DECORCAT_ORNAMENT, + .price = 3000, + .description = DecorDesc_SAND_ORNAMENT, + .tiles = DecorGfx_SAND_ORNAMENT, + }, + + [DECOR_SILVER_SHIELD] = + { + .id = DECOR_SILVER_SHIELD, + .name = _("SILVER SHIELD"), + .permission = DECORPERM_BEHIND_FLOOR, + .shape = DECORSHAPE_1x2, + .category = DECORCAT_ORNAMENT, + .price = 0, + .description = DecorDesc_SILVER_SHIELD, + .tiles = DecorGfx_SILVER_SHIELD, + }, + + [DECOR_GOLD_SHIELD] = + { + .id = DECOR_GOLD_SHIELD, + .name = _("GOLD SHIELD"), + .permission = DECORPERM_BEHIND_FLOOR, + .shape = DECORSHAPE_1x2, + .category = DECORCAT_ORNAMENT, + .price = 0, + .description = DecorDesc_GOLD_SHIELD, + .tiles = DecorGfx_GOLD_SHIELD, + }, + + [DECOR_GLASS_ORNAMENT] = + { + .id = DECOR_GLASS_ORNAMENT, + .name = _("GLASS ORNAMENT"), + .permission = DECORPERM_BEHIND_FLOOR, + .shape = DECORSHAPE_1x2, + .category = DECORCAT_ORNAMENT, + .price = 0, + .description = DecorDesc_GLASS_ORNAMENT, + .tiles = DecorGfx_GLASS_ORNAMENT, + }, + + [DECOR_TV] = + { + .id = DECOR_TV, + .name = _("TV"), + .permission = DECORPERM_SOLID_FLOOR, + .shape = DECORSHAPE_1x1, + .category = DECORCAT_ORNAMENT, + .price = 3000, + .description = DecorDesc_TV, + .tiles = DecorGfx_TV, + }, + + [DECOR_ROUND_TV] = + { + .id = DECOR_ROUND_TV, + .name = _("ROUND TV"), + .permission = DECORPERM_SOLID_FLOOR, + .shape = DECORSHAPE_1x1, + .category = DECORCAT_ORNAMENT, + .price = 4000, + .description = DecorDesc_ROUND_TV, + .tiles = DecorGfx_ROUND_TV, + }, + + [DECOR_CUTE_TV] = + { + .id = DECOR_CUTE_TV, + .name = _("CUTE TV"), + .permission = DECORPERM_SOLID_FLOOR, + .shape = DECORSHAPE_1x1, + .category = DECORCAT_ORNAMENT, + .price = 4000, + .description = DecorDesc_CUTE_TV, + .tiles = DecorGfx_CUTE_TV, + }, + + [DECOR_GLITTER_MAT] = + { + .id = DECOR_GLITTER_MAT, + .name = _("GLITTER MAT"), + .permission = DECORPERM_PASS_FLOOR, + .shape = DECORSHAPE_1x1, + .category = DECORCAT_MAT, + .price = 2000, + .description = DecorDesc_GLITTER_MAT, + .tiles = DecorGfx_GLITTER_MAT, + }, + + [DECOR_JUMP_MAT] = + { + .id = DECOR_JUMP_MAT, + .name = _("JUMP MAT"), + .permission = DECORPERM_PASS_FLOOR, + .shape = DECORSHAPE_1x1, + .category = DECORCAT_MAT, + .price = 2000, + .description = DecorDesc_JUMP_MAT, + .tiles = DecorGfx_JUMP_MAT, + }, + + [DECOR_SPIN_MAT] = + { + .id = DECOR_SPIN_MAT, + .name = _("SPIN MAT"), + .permission = DECORPERM_PASS_FLOOR, + .shape = DECORSHAPE_1x1, + .category = DECORCAT_MAT, + .price = 2000, + .description = DecorDesc_SPIN_MAT, + .tiles = DecorGfx_SPIN_MAT, + }, + + [DECOR_C_LOW_NOTE_MAT] = + { + .id = DECOR_C_LOW_NOTE_MAT, + .name = _("C Low NOTE MAT"), + .permission = DECORPERM_PASS_FLOOR, + .shape = DECORSHAPE_1x1, + .category = DECORCAT_MAT, + .price = 500, + .description = DecorDesc_C_LOW_NOTE_MAT, + .tiles = DecorGfx_C_LOW_NOTE_MAT, + }, + + [DECOR_D_NOTE_MAT] = + { + .id = DECOR_D_NOTE_MAT, + .name = _("D NOTE MAT"), + .permission = DECORPERM_PASS_FLOOR, + .shape = DECORSHAPE_1x1, + .category = DECORCAT_MAT, + .price = 500, + .description = DecorDesc_D_NOTE_MAT, + .tiles = DecorGfx_D_NOTE_MAT, + }, + + [DECOR_E_NOTE_MAT] = + { + .id = DECOR_E_NOTE_MAT, + .name = _("E NOTE MAT"), + .permission = DECORPERM_PASS_FLOOR, + .shape = DECORSHAPE_1x1, + .category = DECORCAT_MAT, + .price = 500, + .description = DecorDesc_E_NOTE_MAT, + .tiles = DecorGfx_E_NOTE_MAT, + }, + + [DECOR_F_NOTE_MAT] = + { + .id = DECOR_F_NOTE_MAT, + .name = _("F NOTE MAT"), + .permission = DECORPERM_PASS_FLOOR, + .shape = DECORSHAPE_1x1, + .category = DECORCAT_MAT, + .price = 500, + .description = DecorDesc_F_NOTE_MAT, + .tiles = DecorGfx_F_NOTE_MAT, + }, + + [DECOR_G_NOTE_MAT] = + { + .id = DECOR_G_NOTE_MAT, + .name = _("G NOTE MAT"), + .permission = DECORPERM_PASS_FLOOR, + .shape = DECORSHAPE_1x1, + .category = DECORCAT_MAT, + .price = 500, + .description = DecorDesc_G_NOTE_MAT, + .tiles = DecorGfx_G_NOTE_MAT, + }, + + [DECOR_A_NOTE_MAT] = + { + .id = DECOR_A_NOTE_MAT, + .name = _("A NOTE MAT"), + .permission = DECORPERM_PASS_FLOOR, + .shape = DECORSHAPE_1x1, + .category = DECORCAT_MAT, + .price = 500, + .description = DecorDesc_A_NOTE_MAT, + .tiles = DecorGfx_A_NOTE_MAT, + }, + + [DECOR_B_NOTE_MAT] = + { + .id = DECOR_B_NOTE_MAT, + .name = _("B NOTE MAT"), + .permission = DECORPERM_PASS_FLOOR, + .shape = DECORSHAPE_1x1, + .category = DECORCAT_MAT, + .price = 500, + .description = DecorDesc_B_NOTE_MAT, + .tiles = DecorGfx_B_NOTE_MAT, + }, + + [DECOR_C_HIGH_NOTE_MAT] = + { + .id = DECOR_C_HIGH_NOTE_MAT, + .name = _("C High NOTE MAT"), + .permission = DECORPERM_PASS_FLOOR, + .shape = DECORSHAPE_1x1, + .category = DECORCAT_MAT, + .price = 500, + .description = DecorDesc_C_HIGH_NOTE_MAT, + .tiles = DecorGfx_C_HIGH_NOTE_MAT, + }, + + [DECOR_SURF_MAT] = + { + .id = DECOR_SURF_MAT, + .name = _("SURF MAT"), + .permission = DECORPERM_PASS_FLOOR, + .shape = DECORSHAPE_3x3, + .category = DECORCAT_MAT, + .price = 4000, + .description = DecorDesc_SURF_MAT, + .tiles = DecorGfx_SURF_MAT, + }, + + [DECOR_THUNDER_MAT] = + { + .id = DECOR_THUNDER_MAT, + .name = _("THUNDER MAT"), + .permission = DECORPERM_PASS_FLOOR, + .shape = DECORSHAPE_3x3, + .category = DECORCAT_MAT, + .price = 4000, + .description = DecorDesc_THUNDER_MAT, + .tiles = DecorGfx_THUNDER_MAT, + }, + + [DECOR_FIRE_BLAST_MAT] = + { + .id = DECOR_FIRE_BLAST_MAT, + .name = _("FIRE BLAST MAT"), + .permission = DECORPERM_PASS_FLOOR, + .shape = DECORSHAPE_3x3, + .category = DECORCAT_MAT, + .price = 4000, + .description = DecorDesc_FIRE_BLAST_MAT, + .tiles = DecorGfx_FIRE_BLAST_MAT, + }, + + [DECOR_POWDER_SNOW_MAT] = + { + .id = DECOR_POWDER_SNOW_MAT, + .name = _("POWDER SNOW MAT"), + .permission = DECORPERM_PASS_FLOOR, + .shape = DECORSHAPE_3x3, + .category = DECORCAT_MAT, + .price = 4000, + .description = DecorDesc_POWDER_SNOW_MAT, + .tiles = DecorGfx_POWDER_SNOW_MAT, + }, + + [DECOR_ATTRACT_MAT] = + { + .id = DECOR_ATTRACT_MAT, + .name = _("ATTRACT MAT"), + .permission = DECORPERM_PASS_FLOOR, + .shape = DECORSHAPE_3x3, + .category = DECORCAT_MAT, + .price = 4000, + .description = DecorDesc_ATTRACT_MAT, + .tiles = DecorGfx_ATTRACT_MAT, + }, + + [DECOR_FISSURE_MAT] = + { + .id = DECOR_FISSURE_MAT, + .name = _("FISSURE MAT"), + .permission = DECORPERM_PASS_FLOOR, + .shape = DECORSHAPE_3x3, + .category = DECORCAT_MAT, + .price = 4000, + .description = DecorDesc_FISSURE_MAT, + .tiles = DecorGfx_FISSURE_MAT, + }, + + [DECOR_SPIKES_MAT] = + { + .id = DECOR_SPIKES_MAT, + .name = _("SPIKES MAT"), + .permission = DECORPERM_PASS_FLOOR, + .shape = DECORSHAPE_3x3, + .category = DECORCAT_MAT, + .price = 4000, + .description = DecorDesc_SPIKES_MAT, + .tiles = DecorGfx_SPIKES_MAT, + }, + + [DECOR_BALL_POSTER] = + { + .id = DECOR_BALL_POSTER, + .name = _("BALL POSTER"), + .permission = DECORPERM_NA_WALL, + .shape = DECORSHAPE_1x1, + .category = DECORCAT_POSTER, + .price = 1000, + .description = DecorDesc_BALL_POSTER, + .tiles = DecorGfx_BALL_POSTER, + }, + + [DECOR_GREEN_POSTER] = + { + .id = DECOR_GREEN_POSTER, + .name = _("GREEN POSTER"), + .permission = DECORPERM_NA_WALL, + .shape = DECORSHAPE_1x1, + .category = DECORCAT_POSTER, + .price = 1000, + .description = DecorDesc_GREEN_POSTER, + .tiles = DecorGfx_GREEN_POSTER, + }, + + [DECOR_RED_POSTER] = + { + .id = DECOR_RED_POSTER, + .name = _("RED POSTER"), + .permission = DECORPERM_NA_WALL, + .shape = DECORSHAPE_1x1, + .category = DECORCAT_POSTER, + .price = 1000, + .description = DecorDesc_RED_POSTER, + .tiles = DecorGfx_RED_POSTER, + }, + + [DECOR_BLUE_POSTER] = + { + .id = DECOR_BLUE_POSTER, + .name = _("BLUE POSTER"), + .permission = DECORPERM_NA_WALL, + .shape = DECORSHAPE_1x1, + .category = DECORCAT_POSTER, + .price = 1000, + .description = DecorDesc_BLUE_POSTER, + .tiles = DecorGfx_BLUE_POSTER, + }, + + [DECOR_CUTE_POSTER] = + { + .id = DECOR_CUTE_POSTER, + .name = _("CUTE POSTER"), + .permission = DECORPERM_NA_WALL, + .shape = DECORSHAPE_1x1, + .category = DECORCAT_POSTER, + .price = 1000, + .description = DecorDesc_CUTE_POSTER, + .tiles = DecorGfx_CUTE_POSTER, + }, + + [DECOR_PIKA_POSTER] = + { + .id = DECOR_PIKA_POSTER, + .name = _("PIKA POSTER"), + .permission = DECORPERM_NA_WALL, + .shape = DECORSHAPE_2x1, + .category = DECORCAT_POSTER, + .price = 1500, + .description = DecorDesc_PIKA_POSTER, + .tiles = DecorGfx_PIKA_POSTER, + }, + + [DECOR_LONG_POSTER] = + { + .id = DECOR_LONG_POSTER, + .name = _("LONG POSTER"), + .permission = DECORPERM_NA_WALL, + .shape = DECORSHAPE_2x1, + .category = DECORCAT_POSTER, + .price = 1500, + .description = DecorDesc_LONG_POSTER, + .tiles = DecorGfx_LONG_POSTER, + }, + + [DECOR_SEA_POSTER] = + { + .id = DECOR_SEA_POSTER, + .name = _("SEA POSTER"), + .permission = DECORPERM_NA_WALL, + .shape = DECORSHAPE_2x1, + .category = DECORCAT_POSTER, + .price = 1500, + .description = DecorDesc_SEA_POSTER, + .tiles = DecorGfx_SEA_POSTER, + }, + + [DECOR_SKY_POSTER] = + { + .id = DECOR_SKY_POSTER, + .name = _("SKY POSTER"), + .permission = DECORPERM_NA_WALL, + .shape = DECORSHAPE_2x1, + .category = DECORCAT_POSTER, + .price = 1500, + .description = DecorDesc_SKY_POSTER, + .tiles = DecorGfx_SKY_POSTER, + }, + + [DECOR_KISS_POSTER] = + { + .id = DECOR_KISS_POSTER, + .name = _("KISS POSTER"), + .permission = DECORPERM_NA_WALL, + .shape = DECORSHAPE_2x1, + .category = DECORCAT_POSTER, + .price = 1500, + .description = DecorDesc_KISS_POSTER, + .tiles = DecorGfx_KISS_POSTER, + }, + + [DECOR_PICHU_DOLL] = + { + .id = DECOR_PICHU_DOLL, + .name = _("PICHU DOLL"), + .permission = DECORPERM_SPRITE, + .shape = DECORSHAPE_1x1, + .category = DECORCAT_DOLL, + .price = 3000, + .description = DecorDesc_PICHU_DOLL, + .tiles = DecorGfx_PICHU_DOLL, + }, + + [DECOR_PIKACHU_DOLL] = + { + .id = DECOR_PIKACHU_DOLL, + .name = _("PIKACHU DOLL"), + .permission = DECORPERM_SPRITE, + .shape = DECORSHAPE_1x1, + .category = DECORCAT_DOLL, + .price = 3000, + .description = DecorDesc_PIKACHU_DOLL, + .tiles = DecorGfx_PIKACHU_DOLL, + }, + + [DECOR_MARILL_DOLL] = + { + .id = DECOR_MARILL_DOLL, + .name = _("MARILL DOLL"), + .permission = DECORPERM_SPRITE, + .shape = DECORSHAPE_1x1, + .category = DECORCAT_DOLL, + .price = 3000, + .description = DecorDesc_MARILL_DOLL, + .tiles = DecorGfx_MARILL_DOLL, + }, + + [DECOR_TOGEPI_DOLL] = + { + .id = DECOR_TOGEPI_DOLL, + .name = _("TOGEPI DOLL"), + .permission = DECORPERM_SPRITE, + .shape = DECORSHAPE_1x1, + .category = DECORCAT_DOLL, + .price = 3000, + .description = DecorDesc_TOGEPI_DOLL, + .tiles = DecorGfx_TOGEPI_DOLL, + }, + + [DECOR_CYNDAQUIL_DOLL] = + { + .id = DECOR_CYNDAQUIL_DOLL, + .name = _("CYNDAQUIL DOLL"), + .permission = DECORPERM_SPRITE, + .shape = DECORSHAPE_1x1, + .category = DECORCAT_DOLL, + .price = 3000, + .description = DecorDesc_CYNDAQUIL_DOLL, + .tiles = DecorGfx_CYNDAQUIL_DOLL, + }, + + [DECOR_CHIKORITA_DOLL] = + { + .id = DECOR_CHIKORITA_DOLL, + .name = _("CHIKORITA DOLL"), + .permission = DECORPERM_SPRITE, + .shape = DECORSHAPE_1x1, + .category = DECORCAT_DOLL, + .price = 3000, + .description = DecorDesc_CHIKORITA_DOLL, + .tiles = DecorGfx_CHIKORITA_DOLL, + }, + + [DECOR_TOTODILE_DOLL] = + { + .id = DECOR_TOTODILE_DOLL, + .name = _("TOTODILE DOLL"), + .permission = DECORPERM_SPRITE, + .shape = DECORSHAPE_1x1, + .category = DECORCAT_DOLL, + .price = 3000, + .description = DecorDesc_TOTODILE_DOLL, + .tiles = DecorGfx_TOTODILE_DOLL, + }, + + [DECOR_JIGGLYPUFF_DOLL] = + { + .id = DECOR_JIGGLYPUFF_DOLL, + .name = _("JIGGLYPUFF DOLL"), + .permission = DECORPERM_SPRITE, + .shape = DECORSHAPE_1x1, + .category = DECORCAT_DOLL, + .price = 3000, + .description = DecorDesc_JIGGLYPUFF_DOLL, + .tiles = DecorGfx_JIGGLYPUFF_DOLL, + }, + + [DECOR_MEOWTH_DOLL] = + { + .id = DECOR_MEOWTH_DOLL, + .name = _("MEOWTH DOLL"), + .permission = DECORPERM_SPRITE, + .shape = DECORSHAPE_1x1, + .category = DECORCAT_DOLL, + .price = 3000, + .description = DecorDesc_MEOWTH_DOLL, + .tiles = DecorGfx_MEOWTH_DOLL, + }, + + [DECOR_CLEFAIRY_DOLL] = + { + .id = DECOR_CLEFAIRY_DOLL, + .name = _("CLEFAIRY DOLL"), + .permission = DECORPERM_SPRITE, + .shape = DECORSHAPE_1x1, + .category = DECORCAT_DOLL, + .price = 3000, + .description = DecorDesc_CLEFAIRY_DOLL, + .tiles = DecorGfx_CLEFAIRY_DOLL, + }, + + [DECOR_DITTO_DOLL] = + { + .id = DECOR_DITTO_DOLL, + .name = _("DITTO DOLL"), + .permission = DECORPERM_SPRITE, + .shape = DECORSHAPE_1x1, + .category = DECORCAT_DOLL, + .price = 3000, + .description = DecorDesc_DITTO_DOLL, + .tiles = DecorGfx_DITTO_DOLL, + }, + + [DECOR_SMOOCHUM_DOLL] = + { + .id = DECOR_SMOOCHUM_DOLL, + .name = _("SMOOCHUM DOLL"), + .permission = DECORPERM_SPRITE, + .shape = DECORSHAPE_1x1, + .category = DECORCAT_DOLL, + .price = 3000, + .description = DecorDesc_SMOOCHUM_DOLL, + .tiles = DecorGfx_SMOOCHUM_DOLL, + }, + + [DECOR_TREECKO_DOLL] = + { + .id = DECOR_TREECKO_DOLL, + .name = _("TREECKO DOLL"), + .permission = DECORPERM_SPRITE, + .shape = DECORSHAPE_1x1, + .category = DECORCAT_DOLL, + .price = 3000, + .description = DecorDesc_TREECKO_DOLL, + .tiles = DecorGfx_TREECKO_DOLL, + }, + + [DECOR_TORCHIC_DOLL] = + { + .id = DECOR_TORCHIC_DOLL, + .name = _("TORCHIC DOLL"), + .permission = DECORPERM_SPRITE, + .shape = DECORSHAPE_1x1, + .category = DECORCAT_DOLL, + .price = 3000, + .description = DecorDesc_TORCHIC_DOLL, + .tiles = DecorGfx_TORCHIC_DOLL, + }, + + [DECOR_MUDKIP_DOLL] = + { + .id = DECOR_MUDKIP_DOLL, + .name = _("MUDKIP DOLL"), + .permission = DECORPERM_SPRITE, + .shape = DECORSHAPE_1x1, + .category = DECORCAT_DOLL, + .price = 3000, + .description = DecorDesc_MUDKIP_DOLL, + .tiles = DecorGfx_MUDKIP_DOLL, + }, + + [DECOR_DUSKULL_DOLL] = + { + .id = DECOR_DUSKULL_DOLL, + .name = _("DUSKULL DOLL"), + .permission = DECORPERM_SPRITE, + .shape = DECORSHAPE_1x1, + .category = DECORCAT_DOLL, + .price = 3000, + .description = DecorDesc_DUSKULL_DOLL, + .tiles = DecorGfx_DUSKULL_DOLL, + }, + + [DECOR_WYNAUT_DOLL] = + { + .id = DECOR_WYNAUT_DOLL, + .name = _("WYNAUT DOLL"), + .permission = DECORPERM_SPRITE, + .shape = DECORSHAPE_1x1, + .category = DECORCAT_DOLL, + .price = 3000, + .description = DecorDesc_WYNAUT_DOLL, + .tiles = DecorGfx_WYNAUT_DOLL, + }, + + [DECOR_BALTOY_DOLL] = + { + .id = DECOR_BALTOY_DOLL, + .name = _("BALTOY DOLL"), + .permission = DECORPERM_SPRITE, + .shape = DECORSHAPE_1x1, + .category = DECORCAT_DOLL, + .price = 3000, + .description = DecorDesc_BALTOY_DOLL, + .tiles = DecorGfx_BALTOY_DOLL, + }, + + [DECOR_KECLEON_DOLL] = + { + .id = DECOR_KECLEON_DOLL, + .name = _("KECLEON DOLL"), + .permission = DECORPERM_SPRITE, + .shape = DECORSHAPE_1x1, + .category = DECORCAT_DOLL, + .price = 3000, + .description = DecorDesc_KECLEON_DOLL, + .tiles = DecorGfx_KECLEON_DOLL, + }, + + [DECOR_AZURILL_DOLL] = + { + .id = DECOR_AZURILL_DOLL, + .name = _("AZURILL DOLL"), + .permission = DECORPERM_SPRITE, + .shape = DECORSHAPE_1x1, + .category = DECORCAT_DOLL, + .price = 3000, + .description = DecorDesc_AZURILL_DOLL, + .tiles = DecorGfx_AZURILL_DOLL, + }, + + [DECOR_SKITTY_DOLL] = + { + .id = DECOR_SKITTY_DOLL, + .name = _("SKITTY DOLL"), + .permission = DECORPERM_SPRITE, + .shape = DECORSHAPE_1x1, + .category = DECORCAT_DOLL, + .price = 3000, + .description = DecorDesc_SKITTY_DOLL, + .tiles = DecorGfx_SKITTY_DOLL, + }, + + [DECOR_SWABLU_DOLL] = + { + .id = DECOR_SWABLU_DOLL, + .name = _("SWABLU DOLL"), + .permission = DECORPERM_SPRITE, + .shape = DECORSHAPE_1x1, + .category = DECORCAT_DOLL, + .price = 3000, + .description = DecorDesc_SWABLU_DOLL, + .tiles = DecorGfx_SWABLU_DOLL, + }, + + [DECOR_GULPIN_DOLL] = + { + .id = DECOR_GULPIN_DOLL, + .name = _("GULPIN DOLL"), + .permission = DECORPERM_SPRITE, + .shape = DECORSHAPE_1x1, + .category = DECORCAT_DOLL, + .price = 3000, + .description = DecorDesc_GULPIN_DOLL, + .tiles = DecorGfx_GULPIN_DOLL, + }, + + [DECOR_LOTAD_DOLL] = + { + .id = DECOR_LOTAD_DOLL, + .name = _("LOTAD DOLL"), + .permission = DECORPERM_SPRITE, + .shape = DECORSHAPE_1x1, + .category = DECORCAT_DOLL, + .price = 3000, + .description = DecorDesc_LOTAD_DOLL, + .tiles = DecorGfx_LOTAD_DOLL, + }, + + [DECOR_SEEDOT_DOLL] = + { + .id = DECOR_SEEDOT_DOLL, + .name = _("SEEDOT DOLL"), + .permission = DECORPERM_SPRITE, + .shape = DECORSHAPE_1x1, + .category = DECORCAT_DOLL, + .price = 3000, + .description = DecorDesc_SEEDOT_DOLL, + .tiles = DecorGfx_SEEDOT_DOLL, + }, + + [DECOR_PIKA_CUSHION] = + { + .id = DECOR_PIKA_CUSHION, + .name = _("PIKA CUSHION"), + .permission = DECORPERM_SPRITE, + .shape = DECORSHAPE_1x1, + .category = DECORCAT_CUSHION, + .price = 2000, + .description = DecorDesc_PIKA_CUSHION, + .tiles = DecorGfx_PIKA_CUSHION, + }, + + [DECOR_ROUND_CUSHION] = + { + .id = DECOR_ROUND_CUSHION, + .name = _("ROUND CUSHION"), + .permission = DECORPERM_SPRITE, + .shape = DECORSHAPE_1x1, + .category = DECORCAT_CUSHION, + .price = 2000, + .description = DecorDesc_ROUND_CUSHION, + .tiles = DecorGfx_ROUND_CUSHION, + }, + + [DECOR_KISS_CUSHION] = + { + .id = DECOR_KISS_CUSHION, + .name = _("KISS CUSHION"), + .permission = DECORPERM_SPRITE, + .shape = DECORSHAPE_1x1, + .category = DECORCAT_CUSHION, + .price = 2000, + .description = DecorDesc_KISS_CUSHION, + .tiles = DecorGfx_KISS_CUSHION, + }, + + [DECOR_ZIGZAG_CUSHION] = + { + .id = DECOR_ZIGZAG_CUSHION, + .name = _("ZIGZAG CUSHION"), + .permission = DECORPERM_SPRITE, + .shape = DECORSHAPE_1x1, + .category = DECORCAT_CUSHION, + .price = 2000, + .description = DecorDesc_ZIGZAG_CUSHION, + .tiles = DecorGfx_ZIGZAG_CUSHION, + }, + + [DECOR_SPIN_CUSHION] = + { + .id = DECOR_SPIN_CUSHION, + .name = _("SPIN CUSHION"), + .permission = DECORPERM_SPRITE, + .shape = DECORSHAPE_1x1, + .category = DECORCAT_CUSHION, + .price = 2000, + .description = DecorDesc_SPIN_CUSHION, + .tiles = DecorGfx_SPIN_CUSHION, + }, + + [DECOR_DIAMOND_CUSHION] = + { + .id = DECOR_DIAMOND_CUSHION, + .name = _("DIAMOND CUSHION"), + .permission = DECORPERM_SPRITE, + .shape = DECORSHAPE_1x1, + .category = DECORCAT_CUSHION, + .price = 2000, + .description = DecorDesc_DIAMOND_CUSHION, + .tiles = DecorGfx_DIAMOND_CUSHION, + }, + + [DECOR_BALL_CUSHION] = + { + .id = DECOR_BALL_CUSHION, + .name = _("BALL CUSHION"), + .permission = DECORPERM_SPRITE, + .shape = DECORSHAPE_1x1, + .category = DECORCAT_CUSHION, + .price = 2000, + .description = DecorDesc_BALL_CUSHION, + .tiles = DecorGfx_BALL_CUSHION, + }, + + [DECOR_GRASS_CUSHION] = + { + .id = DECOR_GRASS_CUSHION, + .name = _("GRASS CUSHION"), + .permission = DECORPERM_SPRITE, + .shape = DECORSHAPE_1x1, + .category = DECORCAT_CUSHION, + .price = 2000, + .description = DecorDesc_GRASS_CUSHION, + .tiles = DecorGfx_GRASS_CUSHION, + }, + + [DECOR_FIRE_CUSHION] = + { + .id = DECOR_FIRE_CUSHION, + .name = _("FIRE CUSHION"), + .permission = DECORPERM_SPRITE, + .shape = DECORSHAPE_1x1, + .category = DECORCAT_CUSHION, + .price = 2000, + .description = DecorDesc_FIRE_CUSHION, + .tiles = DecorGfx_FIRE_CUSHION, + }, + + [DECOR_WATER_CUSHION] = + { + .id = DECOR_WATER_CUSHION, + .name = _("WATER CUSHION"), + .permission = DECORPERM_SPRITE, + .shape = DECORSHAPE_1x1, + .category = DECORCAT_CUSHION, + .price = 2000, + .description = DecorDesc_WATER_CUSHION, + .tiles = DecorGfx_WATER_CUSHION, + }, + + [DECOR_SNORLAX_DOLL] = + { + .id = DECOR_SNORLAX_DOLL, + .name = _("SNORLAX DOLL"), + .permission = DECORPERM_SPRITE, + .shape = DECORSHAPE_1x2, + .category = DECORCAT_DOLL, + .price = 10000, + .description = DecorDesc_SNORLAX_DOLL, + .tiles = DecorGfx_SNORLAX_DOLL, + }, + + [DECOR_RHYDON_DOLL] = + { + .id = DECOR_RHYDON_DOLL, + .name = _("RHYDON DOLL"), + .permission = DECORPERM_SPRITE, + .shape = DECORSHAPE_1x2, + .category = DECORCAT_DOLL, + .price = 10000, + .description = DecorDesc_RHYDON_DOLL, + .tiles = DecorGfx_RHYDON_DOLL, + }, + + [DECOR_LAPRAS_DOLL] = + { + .id = DECOR_LAPRAS_DOLL, + .name = _("LAPRAS DOLL"), + .permission = DECORPERM_SPRITE, + .shape = DECORSHAPE_1x2, + .category = DECORCAT_DOLL, + .price = 10000, + .description = DecorDesc_LAPRAS_DOLL, + .tiles = DecorGfx_LAPRAS_DOLL, + }, + + [DECOR_VENUSAUR_DOLL] = + { + .id = DECOR_VENUSAUR_DOLL, + .name = _("VENUSAUR DOLL"), + .permission = DECORPERM_SPRITE, + .shape = DECORSHAPE_1x2, + .category = DECORCAT_DOLL, + .price = 10000, + .description = DecorDesc_VENUSAUR_DOLL, + .tiles = DecorGfx_VENUSAUR_DOLL, + }, + + [DECOR_CHARIZARD_DOLL] = + { + .id = DECOR_CHARIZARD_DOLL, + .name = _("CHARIZARD DOLL"), + .permission = DECORPERM_SPRITE, + .shape = DECORSHAPE_1x2, + .category = DECORCAT_DOLL, + .price = 10000, + .description = DecorDesc_CHARIZARD_DOLL, + .tiles = DecorGfx_CHARIZARD_DOLL, + }, + + [DECOR_BLASTOISE_DOLL] = + { + .id = DECOR_BLASTOISE_DOLL, + .name = _("BLASTOISE DOLL"), + .permission = DECORPERM_SPRITE, + .shape = DECORSHAPE_1x2, + .category = DECORCAT_DOLL, + .price = 10000, + .description = DecorDesc_BLASTOISE_DOLL, + .tiles = DecorGfx_BLASTOISE_DOLL, + }, + + [DECOR_WAILMER_DOLL] = + { + .id = DECOR_WAILMER_DOLL, + .name = _("WAILMER DOLL"), + .permission = DECORPERM_SPRITE, + .shape = DECORSHAPE_1x2, + .category = DECORCAT_DOLL, + .price = 10000, + .description = DecorDesc_WAILMER_DOLL, + .tiles = DecorGfx_WAILMER_DOLL, + }, + + [DECOR_REGIROCK_DOLL] = + { + .id = DECOR_REGIROCK_DOLL, + .name = _("REGIROCK DOLL"), + .permission = DECORPERM_SPRITE, + .shape = DECORSHAPE_1x2, + .category = DECORCAT_DOLL, + .price = 10000, + .description = DecorDesc_REGIROCK_DOLL, + .tiles = DecorGfx_REGIROCK_DOLL, + }, + + [DECOR_REGICE_DOLL] = + { + .id = DECOR_REGICE_DOLL, + .name = _("REGICE DOLL"), + .permission = DECORPERM_SPRITE, + .shape = DECORSHAPE_1x2, + .category = DECORCAT_DOLL, + .price = 10000, + .description = DecorDesc_REGICE_DOLL, + .tiles = DecorGfx_REGICE_DOLL, + }, + + [DECOR_REGISTEEL_DOLL] = + { + .id = DECOR_REGISTEEL_DOLL, + .name = _("REGISTEEL DOLL"), + .permission = DECORPERM_SPRITE, + .shape = DECORSHAPE_1x2, + .category = DECORCAT_DOLL, + .price = 10000, + .description = DecorDesc_REGISTEEL_DOLL, + .tiles = DecorGfx_REGISTEEL_DOLL, + } }; diff --git a/src/data/decoration/tilemaps.h b/src/data/decoration/tilemaps.h index 12fe31dc0..eebb3acb2 100644 --- a/src/data/decoration/tilemaps.h +++ b/src/data/decoration/tilemaps.h @@ -1,37 +1,37 @@ -const u8 Unknown_085A6FB0[] = { +static const u8 sDecorTilemap_1x1_Tiles[] = { 0x00, 0x01, 0x02, 0x03 }; -const u8 Unknown_085A6FB4[] = { +static const u8 sDecorTilemap_3x1_Tiles[] = { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d }; -const u8 Unknown_085A6FC0[] = { +static const u8 sDecorTilemap_2x2_Tiles[] = { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f }; -const u8 Unknown_085A6FD0[] = { +static const u8 sDecorTilemap_1x3_Tiles[] = { 0x00, 0x01, 0x04, 0x05, 0x08, 0x09, 0x0c, 0x0d, 0x10, 0x11, 0x14, 0x15 }; -const u8 Unknown_085A6FDC[] = { +static const u8 sDecorTilemap_2x1_Tiles[] = { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07 }; -const u8 Unknown_085A6FE4[] = { +static const u8 sDecorTilemap_4x2_Tiles[] = { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f }; -const u8 Unknown_085A7004[] = { +static const u8 sDecorTilemap_3x3_Tiles[] = { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, @@ -40,60 +40,60 @@ const u8 Unknown_085A7004[] = { 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d }; -const u8 Unknown_085A7028[] = { +static const u8 sDecorTilemap_3x2_Tiles[] = { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d }; -const u8 Unknown_085A7040[] = { +static const u8 sDecorTilemap_1x1_Y[] = { 0x00, 0x00, 0x00, 0x00 }; -const u8 Unknown_085A7044[] = { +static const u8 sDecorTilemap_2x1_Y[] = { 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01 }; -const u8 Unknown_085A704C[] = { +static const u8 sDecorTilemap_3x1_Y[] = { 0x00, 0x00, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x02, 0x02 }; -const u8 Unknown_085A7058[] = { +static const u8 sDecorTilemap_4x2_Y[] = { 0x00, 0x00, 0x01, 0x01, 0x02, 0x02, 0x03, 0x03, 0x00, 0x00, 0x01, 0x01, 0x02, 0x02, 0x03, 0x03, 0x04, 0x04, 0x05, 0x05, 0x06, 0x06, 0x07, 0x07, 0x04, 0x04, 0x05, 0x05, 0x06, 0x06, 0x07, 0x07 }; -const u8 Unknown_085A7078[] = { +static const u8 sDecorTilemap_2x2_Y[] = { 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x02, 0x02, 0x03, 0x03, 0x02, 0x02, 0x03, 0x03 }; -const u8 Unknown_085A7088[] = { +static const u8 sDecorTilemap_1x2_Y[] = { 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01 }; -const u8 Unknown_085A7090[] = { +static const u8 sDecorTilemap_1x3_Y[] = { 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02 }; -const u8 Unknown_085A709C[] = { +static const u8 sDecorTilemap_2x4_Y[] = { 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x02, 0x02, 0x03, 0x03, 0x02, 0x02, 0x03, 0x03, 0x04, 0x04, 0x05, 0x05, 0x04, 0x04, 0x05, 0x05, 0x06, 0x06, 0x07, 0x07, 0x06, 0x06, 0x07, 0x07 }; -const u8 Unknown_085A70BC[] = { +static const u8 sDecorTilemap_3x3_Y[] = { 0x00, 0x00, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x02, 0x02, 0x03, 0x03, 0x04, 0x04, 0x05, 0x05, @@ -102,60 +102,60 @@ const u8 Unknown_085A70BC[] = { 0x06, 0x06, 0x07, 0x07, 0x08, 0x08 }; -const u8 Unknown_085A70E0[] = { +static const u8 sDecorTilemap_3x2_Y[] = { 0x00, 0x00, 0x01, 0x01, 0x02, 0x02, 0x00, 0x00, 0x01, 0x01, 0x02, 0x02, 0x03, 0x03, 0x04, 0x04, 0x05, 0x05, 0x03, 0x03, 0x04, 0x04, 0x05, 0x05 }; -const u8 Unknown_085A70F8[] = { +static const u8 sDecorTilemap_1x1_X[] = { 0x04, 0x05, 0x06, 0x07 }; -const u8 Unknown_085A70FC[] = { +static const u8 sDecorTilemap_2x1_X[] = { 0x04, 0x05, 0x04, 0x05, 0x06, 0x07, 0x06, 0x07 }; -const u8 Unknown_085A7104[] = { +static const u8 sDecorTilemap_3x1_X[] = { 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07 }; -const u8 Unknown_085A7110[] = { +static const u8 sDecorTilemap_4x2_X[] = { 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07 }; -const u8 Unknown_085A7130[] = { +static const u8 sDecorTilemap_2x2_X[] = { 0x04, 0x05, 0x04, 0x05, 0x06, 0x07, 0x06, 0x07, 0x04, 0x05, 0x04, 0x05, 0x06, 0x07, 0x06, 0x07 }; -const u8 Unknown_085A7140[] = { +static const u8 sDecorTilemap_1x2_X[] = { 0x04, 0x05, 0x06, 0x07, 0x04, 0x05, 0x06, 0x07 }; -const u8 Unknown_085A7148[] = { +static const u8 sDecorTilemap_1x3_X[] = { 0x04, 0x05, 0x06, 0x07, 0x04, 0x05, 0x06, 0x07, 0x04, 0x05, 0x06, 0x07 }; -const u8 Unknown_085A7154[] = { +static const u8 sDecorTilemap_2x4_X[] = { 0x04, 0x05, 0x04, 0x05, 0x06, 0x07, 0x06, 0x07, 0x04, 0x05, 0x04, 0x05, 0x06, 0x07, 0x06, 0x07, 0x04, 0x05, 0x04, 0x05, 0x06, 0x07, 0x06, 0x07, 0x04, 0x05, 0x04, 0x05, 0x06, 0x07, 0x06, 0x07 }; -const u8 Unknown_085A7174[] = { +static const u8 sDecorTilemap_3x3_X[] = { 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, @@ -164,67 +164,78 @@ const u8 Unknown_085A7174[] = { 0x06, 0x07, 0x06, 0x07, 0x06, 0x07 }; -const u8 Unknown_085A7198[] = { +static const u8 sDecorTilemap_3x2_X[] = { 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07, 0x04, 0x05, 0x04, 0x05, 0x04, 0x05, 0x06, 0x07, 0x06, 0x07, 0x06, 0x07 }; -const struct { +#define DECORSIZE(width, height)((width) * (height) * 4) + +static const struct { const u8 *tiles; const u8 *y; const u8 *x; u8 size; -} gUnknown_085A71B0[] = { - { - Unknown_085A6FB0, - Unknown_085A7040, - Unknown_085A70F8, - 0x04 - }, { - Unknown_085A6FDC, - Unknown_085A7044, - Unknown_085A70FC, - 0x08 - }, { - Unknown_085A6FB4, - Unknown_085A704C, - Unknown_085A7104, - 0x0c - }, { - Unknown_085A6FE4, - Unknown_085A7058, - Unknown_085A7110, - 0x20 - }, { - Unknown_085A6FC0, - Unknown_085A7078, - Unknown_085A7130, - 0x10 - }, { - Unknown_085A6FDC, - Unknown_085A7088, - Unknown_085A7140, - 0x08 - }, { - Unknown_085A6FD0, - Unknown_085A7090, - Unknown_085A7148, - 0x0c - }, { - Unknown_085A6FE4, - Unknown_085A709C, - Unknown_085A7154, - 0x20 - }, { - Unknown_085A7004, - Unknown_085A70BC, - Unknown_085A7174, - 0x24 - }, { - Unknown_085A7028, - Unknown_085A70E0, - Unknown_085A7198, - 0x18 +} sDecorTilemaps[] = { + [DECORSHAPE_1x1] = { + .tiles = sDecorTilemap_1x1_Tiles, + .y = sDecorTilemap_1x1_Y, + .x = sDecorTilemap_1x1_X, + .size = DECORSIZE(1, 1) + }, + [DECORSHAPE_2x1] = { + .tiles = sDecorTilemap_2x1_Tiles, + .y = sDecorTilemap_2x1_Y, + .x = sDecorTilemap_2x1_X, + .size = DECORSIZE(2, 1) + }, + [DECORSHAPE_3x1] = { + .tiles = sDecorTilemap_3x1_Tiles, + .y = sDecorTilemap_3x1_Y, + .x = sDecorTilemap_3x1_X, + .size = DECORSIZE(3, 1) + }, + [DECORSHAPE_4x2] = { + .tiles = sDecorTilemap_4x2_Tiles, + .y = sDecorTilemap_4x2_Y, + .x = sDecorTilemap_4x2_X, + .size = DECORSIZE(4, 2) + }, + [DECORSHAPE_2x2] = { + .tiles = sDecorTilemap_2x2_Tiles, + .y = sDecorTilemap_2x2_Y, + .x = sDecorTilemap_2x2_X, + .size = DECORSIZE(2, 2) + }, + [DECORSHAPE_1x2] = { + .tiles = sDecorTilemap_2x1_Tiles, + .y = sDecorTilemap_1x2_Y, + .x = sDecorTilemap_1x2_X, + .size = DECORSIZE(1, 2) + }, + [DECORSHAPE_1x3] = { + .tiles = sDecorTilemap_1x3_Tiles, + .y = sDecorTilemap_1x3_Y, + .x = sDecorTilemap_1x3_X, + .size = DECORSIZE(1, 3) + }, + [DECORSHAPE_2x4] = { + .tiles = sDecorTilemap_4x2_Tiles, + .y = sDecorTilemap_2x4_Y, + .x = sDecorTilemap_2x4_X, + .size = DECORSIZE(2, 4) + }, + [DECORSHAPE_3x3] = { + .tiles = sDecorTilemap_3x3_Tiles, + .y = sDecorTilemap_3x3_Y, + .x = sDecorTilemap_3x3_X, + .size = DECORSIZE(3, 3) + }, + [DECORSHAPE_3x2] = { + .tiles = sDecorTilemap_3x2_Tiles, + .y = sDecorTilemap_3x2_Y, + .x = sDecorTilemap_3x2_X, + .size = DECORSIZE(3, 2) }}; diff --git a/src/data/decoration/tiles.h b/src/data/decoration/tiles.h index de5c43575..1b25da3d4 100644 --- a/src/data/decoration/tiles.h +++ b/src/data/decoration/tiles.h @@ -1,4 +1,4 @@ -#define DECOR_TILE(name) (METATILE_SecretBase_##name - 0x200) +#define DECOR_TILE(name) (METATILE_SecretBase_##name - NUM_TILES_IN_PRIMARY) const u16 DecorGfx_SMALL_DESK[] = { DECOR_TILE(SmallDesk) diff --git a/src/data/easy_chat/easy_chat_groups.h b/src/data/easy_chat/easy_chat_groups.h index df114d980..a89f228fe 100755 --- a/src/data/easy_chat/easy_chat_groups.h +++ b/src/data/easy_chat/easy_chat_groups.h @@ -26,112 +26,112 @@ const struct EasyChatGroup gEasyChatGroups[] = { { .wordData = {.valueList = gEasyChatGroup_Pokemon}, - .numWords = 202, - .numEnabledWords = 202, + .numWords = ARRAY_COUNT(gEasyChatGroup_Pokemon), + .numEnabledWords = ARRAY_COUNT(gEasyChatGroup_Pokemon), }, { .wordData = {.words = gEasyChatGroup_Trainer}, - .numWords = 27, - .numEnabledWords = 21, + .numWords = ARRAY_COUNT(gEasyChatGroup_Trainer), + .numEnabledWords = ARRAY_COUNT(gEasyChatGroup_Trainer) - 6, // Excludes Red, Green, Flame, Gold, Leaf, and Silver }, { .wordData = {.words = gEasyChatGroup_Status}, - .numWords = 109, - .numEnabledWords = 109, + .numWords = ARRAY_COUNT(gEasyChatGroup_Status), + .numEnabledWords = ARRAY_COUNT(gEasyChatGroup_Status), }, { .wordData = {.words = gEasyChatGroup_Battle}, - .numWords = 63, - .numEnabledWords = 63, + .numWords = ARRAY_COUNT(gEasyChatGroup_Battle), + .numEnabledWords = ARRAY_COUNT(gEasyChatGroup_Battle), }, { .wordData = {.words = gEasyChatGroup_Greetings}, - .numWords = 42, - .numEnabledWords = 42, + .numWords = ARRAY_COUNT(gEasyChatGroup_Greetings), + .numEnabledWords = ARRAY_COUNT(gEasyChatGroup_Greetings), }, { .wordData = {.words = gEasyChatGroup_People}, - .numWords = 75, - .numEnabledWords = 75, + .numWords = ARRAY_COUNT(gEasyChatGroup_People), + .numEnabledWords = ARRAY_COUNT(gEasyChatGroup_People), }, { .wordData = {.words = gEasyChatGroup_Voices}, - .numWords = 63, - .numEnabledWords = 63, + .numWords = ARRAY_COUNT(gEasyChatGroup_Voices), + .numEnabledWords = ARRAY_COUNT(gEasyChatGroup_Voices), }, { .wordData = {.words = gEasyChatGroup_Speech}, - .numWords = 60, - .numEnabledWords = 60, + .numWords = ARRAY_COUNT(gEasyChatGroup_Speech), + .numEnabledWords = ARRAY_COUNT(gEasyChatGroup_Speech), }, { .wordData = {.words = gEasyChatGroup_Endings}, - .numWords = 69, - .numEnabledWords = 69, + .numWords = ARRAY_COUNT(gEasyChatGroup_Endings), + .numEnabledWords = ARRAY_COUNT(gEasyChatGroup_Endings), }, { .wordData = {.words = gEasyChatGroup_Feelings}, - .numWords = 69, - .numEnabledWords = 69, + .numWords = ARRAY_COUNT(gEasyChatGroup_Feelings), + .numEnabledWords = ARRAY_COUNT(gEasyChatGroup_Feelings), }, { .wordData = {.words = gEasyChatGroup_Conditions}, - .numWords = 69, - .numEnabledWords = 69, + .numWords = ARRAY_COUNT(gEasyChatGroup_Conditions), + .numEnabledWords = ARRAY_COUNT(gEasyChatGroup_Conditions), }, { .wordData = {.words = gEasyChatGroup_Actions}, - .numWords = 78, - .numEnabledWords = 78, + .numWords = ARRAY_COUNT(gEasyChatGroup_Actions), + .numEnabledWords = ARRAY_COUNT(gEasyChatGroup_Actions), }, { .wordData = {.words = gEasyChatGroup_Lifestyle}, - .numWords = 45, - .numEnabledWords = 45, + .numWords = ARRAY_COUNT(gEasyChatGroup_Lifestyle), + .numEnabledWords = ARRAY_COUNT(gEasyChatGroup_Lifestyle), }, { .wordData = {.words = gEasyChatGroup_Hobbies}, - .numWords = 54, - .numEnabledWords = 54, + .numWords = ARRAY_COUNT(gEasyChatGroup_Hobbies), + .numEnabledWords = ARRAY_COUNT(gEasyChatGroup_Hobbies), }, { .wordData = {.words = gEasyChatGroup_Time}, - .numWords = 45, - .numEnabledWords = 45, + .numWords = ARRAY_COUNT(gEasyChatGroup_Time), + .numEnabledWords = ARRAY_COUNT(gEasyChatGroup_Time), }, { .wordData = {.words = gEasyChatGroup_Misc}, - .numWords = 42, - .numEnabledWords = 42, + .numWords = ARRAY_COUNT(gEasyChatGroup_Misc), + .numEnabledWords = ARRAY_COUNT(gEasyChatGroup_Misc), }, { .wordData = {.words = gEasyChatGroup_Adjectives}, - .numWords = 36, - .numEnabledWords = 36, + .numWords = ARRAY_COUNT(gEasyChatGroup_Adjectives), + .numEnabledWords = ARRAY_COUNT(gEasyChatGroup_Adjectives), }, { .wordData = {.words = gEasyChatGroup_Events}, - .numWords = 29, - .numEnabledWords = 29, + .numWords = ARRAY_COUNT(gEasyChatGroup_Events), + .numEnabledWords = ARRAY_COUNT(gEasyChatGroup_Events), }, { .wordData = {.valueList = gEasyChatGroup_Move1}, - .numWords = 154, - .numEnabledWords = 154, + .numWords = ARRAY_COUNT(gEasyChatGroup_Move1), + .numEnabledWords = ARRAY_COUNT(gEasyChatGroup_Move1), }, { .wordData = {.valueList = gEasyChatGroup_Move2}, - .numWords = 200, - .numEnabledWords = 200, + .numWords = ARRAY_COUNT(gEasyChatGroup_Move2), + .numEnabledWords = ARRAY_COUNT(gEasyChatGroup_Move2), }, { .wordData = {.words = gEasyChatGroup_TrendySaying}, - .numWords = 33, - .numEnabledWords = 33, + .numWords = ARRAY_COUNT(gEasyChatGroup_TrendySaying), + .numEnabledWords = ARRAY_COUNT(gEasyChatGroup_TrendySaying), }, { .wordData = {.valueList = gEasyChatGroup_Pokemon2}, - .numWords = 251, - .numEnabledWords = 251, + .numWords = ARRAY_COUNT(gEasyChatGroup_Pokemon2), + .numEnabledWords = ARRAY_COUNT(gEasyChatGroup_Pokemon2), }, }; diff --git a/src/data/graphics/pokemon.h b/src/data/graphics/pokemon.h index 651f368df..e279db7c1 100644 --- a/src/data/graphics/pokemon.h +++ b/src/data/graphics/pokemon.h @@ -121,7 +121,7 @@ const u32 gMonFrontPic_Goldeen[] = INCBIN_U32("graphics/pokemon/goldeen/anim_fro const u32 gMonFrontPic_Seaking[] = INCBIN_U32("graphics/pokemon/seaking/anim_front.4bpp.lz"); const u32 gMonFrontPic_Staryu[] = INCBIN_U32("graphics/pokemon/staryu/anim_front.4bpp.lz"); const u32 gMonFrontPic_Starmie[] = INCBIN_U32("graphics/pokemon/starmie/anim_front.4bpp.lz"); -const u32 gMonFrontPic_Mrmime[] = INCBIN_U32("graphics/pokemon/mr_mime/anim_front.4bpp.lz"); +const u32 gMonFrontPic_MrMime[] = INCBIN_U32("graphics/pokemon/mr_mime/anim_front.4bpp.lz"); const u32 gMonFrontPic_Scyther[] = INCBIN_U32("graphics/pokemon/scyther/anim_front.4bpp.lz"); const u32 gMonFrontPic_Jynx[] = INCBIN_U32("graphics/pokemon/jynx/anim_front.4bpp.lz"); const u32 gMonFrontPic_Electabuzz[] = INCBIN_U32("graphics/pokemon/electabuzz/anim_front.4bpp.lz"); @@ -439,7 +439,7 @@ const u32 gMonFrontPic_Skuntank[] = INCBIN_U32("graphics/pokemon/skuntank/anim_f const u32 gMonFrontPic_Bronzor[] = INCBIN_U32("graphics/pokemon/bronzor/anim_front.4bpp.lz"); const u32 gMonFrontPic_Bronzong[] = INCBIN_U32("graphics/pokemon/bronzong/anim_front.4bpp.lz"); const u32 gMonFrontPic_Bonsly[] = INCBIN_U32("graphics/pokemon/bonsly/anim_front.4bpp.lz"); -const u32 gMonFrontPic_Mimejr[] = INCBIN_U32("graphics/pokemon/mimejr/anim_front.4bpp.lz"); +const u32 gMonFrontPic_MimeJr[] = INCBIN_U32("graphics/pokemon/mime_jr/anim_front.4bpp.lz"); const u32 gMonFrontPic_Happiny[] = INCBIN_U32("graphics/pokemon/happiny/anim_front.4bpp.lz"); const u32 gMonFrontPic_Chatot[] = INCBIN_U32("graphics/pokemon/chatot/anim_front.4bpp.lz"); const u32 gMonFrontPic_Spiritomb[] = INCBIN_U32("graphics/pokemon/spiritomb/anim_front.4bpp.lz"); @@ -772,7 +772,7 @@ const u32 gMonFrontPic_Golisopod[] = INCBIN_U32("graphics/pokemon/golisopod/fron const u32 gMonFrontPic_Sandygast[] = INCBIN_U32("graphics/pokemon/sandygast/front.4bpp.lz"); const u32 gMonFrontPic_Palossand[] = INCBIN_U32("graphics/pokemon/palossand/front.4bpp.lz"); const u32 gMonFrontPic_Pyukumuku[] = INCBIN_U32("graphics/pokemon/pyukumuku/front.4bpp.lz"); -const u32 gMonFrontPic_Type_null[] = INCBIN_U32("graphics/pokemon/type_null/front.4bpp.lz"); +const u32 gMonFrontPic_TypeNull[] = INCBIN_U32("graphics/pokemon/type_null/front.4bpp.lz"); const u32 gMonFrontPic_Silvally[] = INCBIN_U32("graphics/pokemon/silvally/front.4bpp.lz"); const u32 gMonFrontPic_Minior[] = INCBIN_U32("graphics/pokemon/minior/front.4bpp.lz"); const u32 gMonFrontPic_Komala[] = INCBIN_U32("graphics/pokemon/komala/front.4bpp.lz"); @@ -782,13 +782,13 @@ const u32 gMonFrontPic_Mimikyu[] = INCBIN_U32("graphics/pokemon/mimikyu/front.4b const u32 gMonFrontPic_Bruxish[] = INCBIN_U32("graphics/pokemon/bruxish/front.4bpp.lz"); const u32 gMonFrontPic_Drampa[] = INCBIN_U32("graphics/pokemon/drampa/front.4bpp.lz"); const u32 gMonFrontPic_Dhelmise[] = INCBIN_U32("graphics/pokemon/dhelmise/front.4bpp.lz"); -const u32 gMonFrontPic_Jangmo_o[] = INCBIN_U32("graphics/pokemon/jangmo_o/front.4bpp.lz"); -const u32 gMonFrontPic_Hakamo_o[] = INCBIN_U32("graphics/pokemon/hakamo_o/front.4bpp.lz"); -const u32 gMonFrontPic_Kommo_o[] = INCBIN_U32("graphics/pokemon/kommo_o/front.4bpp.lz"); -const u32 gMonFrontPic_Tapu_koko[] = INCBIN_U32("graphics/pokemon/tapu_koko/front.4bpp.lz"); -const u32 gMonFrontPic_Tapu_lele[] = INCBIN_U32("graphics/pokemon/tapu_lele/front.4bpp.lz"); -const u32 gMonFrontPic_Tapu_bulu[] = INCBIN_U32("graphics/pokemon/tapu_bulu/front.4bpp.lz"); -const u32 gMonFrontPic_Tapu_fini[] = INCBIN_U32("graphics/pokemon/tapu_fini/front.4bpp.lz"); +const u32 gMonFrontPic_Jangmoo[] = INCBIN_U32("graphics/pokemon/jangmo_o/front.4bpp.lz"); +const u32 gMonFrontPic_Hakamoo[] = INCBIN_U32("graphics/pokemon/hakamo_o/front.4bpp.lz"); +const u32 gMonFrontPic_Kommoo[] = INCBIN_U32("graphics/pokemon/kommo_o/front.4bpp.lz"); +const u32 gMonFrontPic_TapuKoko[] = INCBIN_U32("graphics/pokemon/tapu_koko/front.4bpp.lz"); +const u32 gMonFrontPic_TapuLele[] = INCBIN_U32("graphics/pokemon/tapu_lele/front.4bpp.lz"); +const u32 gMonFrontPic_TapuBulu[] = INCBIN_U32("graphics/pokemon/tapu_bulu/front.4bpp.lz"); +const u32 gMonFrontPic_TapuFini[] = INCBIN_U32("graphics/pokemon/tapu_fini/front.4bpp.lz"); const u32 gMonFrontPic_Cosmog[] = INCBIN_U32("graphics/pokemon/cosmog/front.4bpp.lz"); const u32 gMonFrontPic_Cosmoem[] = INCBIN_U32("graphics/pokemon/cosmoem/front.4bpp.lz"); const u32 gMonFrontPic_Solgaleo[] = INCBIN_U32("graphics/pokemon/solgaleo/front.4bpp.lz"); @@ -1104,7 +1104,7 @@ const u32 gMonFrontPic_Zygarde10[] = INCBIN_U32("graphics/pokemon/zygarde/10_per const u32 gMonFrontPic_ZygardeComplete[] = INCBIN_U32("graphics/pokemon/zygarde/complete/front.4bpp.lz"); const u32 gMonFrontPic_HoopaUnbound[] = INCBIN_U32("graphics/pokemon/hoopa/unbound/front.4bpp.lz"); const u32 gMonFrontPic_OricorioPomPom[] = INCBIN_U32("graphics/pokemon/oricorio/pom_pom/front.4bpp.lz"); -const u32 gMonFrontPic_OricorioPau[] = INCBIN_U32("graphics/pokemon/oricorio/pa_u/front.4bpp.lz"); +const u32 gMonFrontPic_OricorioPau[] = INCBIN_U32("graphics/pokemon/oricorio/pau/front.4bpp.lz"); const u32 gMonFrontPic_OricorioSensu[] = INCBIN_U32("graphics/pokemon/oricorio/sensu/front.4bpp.lz"); const u32 gMonFrontPic_LycanrocMidnight[] = INCBIN_U32("graphics/pokemon/lycanroc/midnight/front.4bpp.lz"); const u32 gMonFrontPic_LycanrocDusk[] = INCBIN_U32("graphics/pokemon/lycanroc/dusk/front.4bpp.lz"); @@ -1261,7 +1261,7 @@ const u32 gMonBackPic_Goldeen[] = INCBIN_U32("graphics/pokemon/goldeen/back.4bpp const u32 gMonBackPic_Seaking[] = INCBIN_U32("graphics/pokemon/seaking/back.4bpp.lz"); const u32 gMonBackPic_Staryu[] = INCBIN_U32("graphics/pokemon/staryu/back.4bpp.lz"); const u32 gMonBackPic_Starmie[] = INCBIN_U32("graphics/pokemon/starmie/back.4bpp.lz"); -const u32 gMonBackPic_Mrmime[] = INCBIN_U32("graphics/pokemon/mr_mime/back.4bpp.lz"); +const u32 gMonBackPic_MrMime[] = INCBIN_U32("graphics/pokemon/mr_mime/back.4bpp.lz"); const u32 gMonBackPic_Scyther[] = INCBIN_U32("graphics/pokemon/scyther/back.4bpp.lz"); const u32 gMonBackPic_Jynx[] = INCBIN_U32("graphics/pokemon/jynx/back.4bpp.lz"); const u32 gMonBackPic_Electabuzz[] = INCBIN_U32("graphics/pokemon/electabuzz/back.4bpp.lz"); @@ -1579,7 +1579,7 @@ const u32 gMonBackPic_Skuntank[] = INCBIN_U32("graphics/pokemon/skuntank/back.4b const u32 gMonBackPic_Bronzor[] = INCBIN_U32("graphics/pokemon/bronzor/back.4bpp.lz"); const u32 gMonBackPic_Bronzong[] = INCBIN_U32("graphics/pokemon/bronzong/back.4bpp.lz"); const u32 gMonBackPic_Bonsly[] = INCBIN_U32("graphics/pokemon/bonsly/back.4bpp.lz"); -const u32 gMonBackPic_Mimejr[] = INCBIN_U32("graphics/pokemon/mimejr/back.4bpp.lz"); +const u32 gMonBackPic_MimeJr[] = INCBIN_U32("graphics/pokemon/mime_jr/back.4bpp.lz"); const u32 gMonBackPic_Happiny[] = INCBIN_U32("graphics/pokemon/happiny/back.4bpp.lz"); const u32 gMonBackPic_Chatot[] = INCBIN_U32("graphics/pokemon/chatot/back.4bpp.lz"); const u32 gMonBackPic_Spiritomb[] = INCBIN_U32("graphics/pokemon/spiritomb/back.4bpp.lz"); @@ -1912,7 +1912,7 @@ const u32 gMonBackPic_Golisopod[] = INCBIN_U32("graphics/pokemon/golisopod/back. const u32 gMonBackPic_Sandygast[] = INCBIN_U32("graphics/pokemon/sandygast/back.4bpp.lz"); const u32 gMonBackPic_Palossand[] = INCBIN_U32("graphics/pokemon/palossand/back.4bpp.lz"); const u32 gMonBackPic_Pyukumuku[] = INCBIN_U32("graphics/pokemon/pyukumuku/back.4bpp.lz"); -const u32 gMonBackPic_Type_null[] = INCBIN_U32("graphics/pokemon/type_null/back.4bpp.lz"); +const u32 gMonBackPic_TypeNull[] = INCBIN_U32("graphics/pokemon/type_null/back.4bpp.lz"); const u32 gMonBackPic_Silvally[] = INCBIN_U32("graphics/pokemon/silvally/back.4bpp.lz"); const u32 gMonBackPic_Minior[] = INCBIN_U32("graphics/pokemon/minior/back.4bpp.lz"); const u32 gMonBackPic_Komala[] = INCBIN_U32("graphics/pokemon/komala/back.4bpp.lz"); @@ -1922,13 +1922,13 @@ const u32 gMonBackPic_Mimikyu[] = INCBIN_U32("graphics/pokemon/mimikyu/back.4bpp const u32 gMonBackPic_Bruxish[] = INCBIN_U32("graphics/pokemon/bruxish/back.4bpp.lz"); const u32 gMonBackPic_Drampa[] = INCBIN_U32("graphics/pokemon/drampa/back.4bpp.lz"); const u32 gMonBackPic_Dhelmise[] = INCBIN_U32("graphics/pokemon/dhelmise/back.4bpp.lz"); -const u32 gMonBackPic_Jangmo_o[] = INCBIN_U32("graphics/pokemon/jangmo_o/back.4bpp.lz"); -const u32 gMonBackPic_Hakamo_o[] = INCBIN_U32("graphics/pokemon/hakamo_o/back.4bpp.lz"); -const u32 gMonBackPic_Kommo_o[] = INCBIN_U32("graphics/pokemon/kommo_o/back.4bpp.lz"); -const u32 gMonBackPic_Tapu_koko[] = INCBIN_U32("graphics/pokemon/tapu_koko/back.4bpp.lz"); -const u32 gMonBackPic_Tapu_lele[] = INCBIN_U32("graphics/pokemon/tapu_lele/back.4bpp.lz"); -const u32 gMonBackPic_Tapu_bulu[] = INCBIN_U32("graphics/pokemon/tapu_bulu/back.4bpp.lz"); -const u32 gMonBackPic_Tapu_fini[] = INCBIN_U32("graphics/pokemon/tapu_fini/back.4bpp.lz"); +const u32 gMonBackPic_Jangmoo[] = INCBIN_U32("graphics/pokemon/jangmo_o/back.4bpp.lz"); +const u32 gMonBackPic_Hakamoo[] = INCBIN_U32("graphics/pokemon/hakamo_o/back.4bpp.lz"); +const u32 gMonBackPic_Kommoo[] = INCBIN_U32("graphics/pokemon/kommo_o/back.4bpp.lz"); +const u32 gMonBackPic_TapuKoko[] = INCBIN_U32("graphics/pokemon/tapu_koko/back.4bpp.lz"); +const u32 gMonBackPic_TapuLele[] = INCBIN_U32("graphics/pokemon/tapu_lele/back.4bpp.lz"); +const u32 gMonBackPic_TapuBulu[] = INCBIN_U32("graphics/pokemon/tapu_bulu/back.4bpp.lz"); +const u32 gMonBackPic_TapuFini[] = INCBIN_U32("graphics/pokemon/tapu_fini/back.4bpp.lz"); const u32 gMonBackPic_Cosmog[] = INCBIN_U32("graphics/pokemon/cosmog/back.4bpp.lz"); const u32 gMonBackPic_Cosmoem[] = INCBIN_U32("graphics/pokemon/cosmoem/back.4bpp.lz"); const u32 gMonBackPic_Solgaleo[] = INCBIN_U32("graphics/pokemon/solgaleo/back.4bpp.lz"); @@ -2244,7 +2244,7 @@ const u32 gMonBackPic_Zygarde10[] = INCBIN_U32("graphics/pokemon/zygarde/10_perc const u32 gMonBackPic_ZygardeComplete[] = INCBIN_U32("graphics/pokemon/zygarde/complete/back.4bpp.lz"); const u32 gMonBackPic_HoopaUnbound[] = INCBIN_U32("graphics/pokemon/hoopa/unbound/back.4bpp.lz"); const u32 gMonBackPic_OricorioPomPom[] = INCBIN_U32("graphics/pokemon/oricorio/pom_pom/back.4bpp.lz"); -const u32 gMonBackPic_OricorioPau[] = INCBIN_U32("graphics/pokemon/oricorio/pa_u/back.4bpp.lz"); +const u32 gMonBackPic_OricorioPau[] = INCBIN_U32("graphics/pokemon/oricorio/pau/back.4bpp.lz"); const u32 gMonBackPic_OricorioSensu[] = INCBIN_U32("graphics/pokemon/oricorio/sensu/back.4bpp.lz"); const u32 gMonBackPic_LycanrocMidnight[] = INCBIN_U32("graphics/pokemon/lycanroc/midnight/back.4bpp.lz"); const u32 gMonBackPic_LycanrocDusk[] = INCBIN_U32("graphics/pokemon/lycanroc/dusk/back.4bpp.lz"); @@ -2400,7 +2400,7 @@ const u32 gMonPalette_Goldeen[] = INCBIN_U32("graphics/pokemon/goldeen/normal.gb const u32 gMonPalette_Seaking[] = INCBIN_U32("graphics/pokemon/seaking/normal.gbapal.lz"); const u32 gMonPalette_Staryu[] = INCBIN_U32("graphics/pokemon/staryu/normal.gbapal.lz"); const u32 gMonPalette_Starmie[] = INCBIN_U32("graphics/pokemon/starmie/normal.gbapal.lz"); -const u32 gMonPalette_Mrmime[] = INCBIN_U32("graphics/pokemon/mr_mime/normal.gbapal.lz"); +const u32 gMonPalette_MrMime[] = INCBIN_U32("graphics/pokemon/mr_mime/normal.gbapal.lz"); const u32 gMonPalette_Scyther[] = INCBIN_U32("graphics/pokemon/scyther/normal.gbapal.lz"); const u32 gMonPalette_Jynx[] = INCBIN_U32("graphics/pokemon/jynx/normal.gbapal.lz"); const u32 gMonPalette_Electabuzz[] = INCBIN_U32("graphics/pokemon/electabuzz/normal.gbapal.lz"); @@ -2717,7 +2717,7 @@ const u32 gMonPalette_Skuntank[] = INCBIN_U32("graphics/pokemon/skuntank/normal. const u32 gMonPalette_Bronzor[] = INCBIN_U32("graphics/pokemon/bronzor/normal.gbapal.lz"); const u32 gMonPalette_Bronzong[] = INCBIN_U32("graphics/pokemon/bronzong/normal.gbapal.lz"); const u32 gMonPalette_Bonsly[] = INCBIN_U32("graphics/pokemon/bonsly/normal.gbapal.lz"); -const u32 gMonPalette_Mimejr[] = INCBIN_U32("graphics/pokemon/mimejr/normal.gbapal.lz"); +const u32 gMonPalette_MimeJr[] = INCBIN_U32("graphics/pokemon/mime_jr/normal.gbapal.lz"); const u32 gMonPalette_Happiny[] = INCBIN_U32("graphics/pokemon/happiny/normal.gbapal.lz"); const u32 gMonPalette_Chatot[] = INCBIN_U32("graphics/pokemon/chatot/normal.gbapal.lz"); const u32 gMonPalette_Spiritomb[] = INCBIN_U32("graphics/pokemon/spiritomb/normal.gbapal.lz"); @@ -3050,7 +3050,7 @@ const u32 gMonPalette_Golisopod[] = INCBIN_U32("graphics/pokemon/golisopod/norma const u32 gMonPalette_Sandygast[] = INCBIN_U32("graphics/pokemon/sandygast/normal.gbapal.lz"); const u32 gMonPalette_Palossand[] = INCBIN_U32("graphics/pokemon/palossand/normal.gbapal.lz"); const u32 gMonPalette_Pyukumuku[] = INCBIN_U32("graphics/pokemon/pyukumuku/normal.gbapal.lz"); -const u32 gMonPalette_Type_null[] = INCBIN_U32("graphics/pokemon/type_null/normal.gbapal.lz"); +const u32 gMonPalette_TypeNull[] = INCBIN_U32("graphics/pokemon/type_null/normal.gbapal.lz"); const u32 gMonPalette_Silvally[] = INCBIN_U32("graphics/pokemon/silvally/normal.gbapal.lz"); const u32 gMonPalette_Minior[] = INCBIN_U32("graphics/pokemon/minior/normal.gbapal.lz"); const u32 gMonPalette_Komala[] = INCBIN_U32("graphics/pokemon/komala/normal.gbapal.lz"); @@ -3060,13 +3060,13 @@ const u32 gMonPalette_Mimikyu[] = INCBIN_U32("graphics/pokemon/mimikyu/normal.gb const u32 gMonPalette_Bruxish[] = INCBIN_U32("graphics/pokemon/bruxish/normal.gbapal.lz"); const u32 gMonPalette_Drampa[] = INCBIN_U32("graphics/pokemon/drampa/normal.gbapal.lz"); const u32 gMonPalette_Dhelmise[] = INCBIN_U32("graphics/pokemon/dhelmise/normal.gbapal.lz"); -const u32 gMonPalette_Jangmo_o[] = INCBIN_U32("graphics/pokemon/jangmo_o/normal.gbapal.lz"); -const u32 gMonPalette_Hakamo_o[] = INCBIN_U32("graphics/pokemon/hakamo_o/normal.gbapal.lz"); -const u32 gMonPalette_Kommo_o[] = INCBIN_U32("graphics/pokemon/kommo_o/normal.gbapal.lz"); -const u32 gMonPalette_Tapu_koko[] = INCBIN_U32("graphics/pokemon/tapu_koko/normal.gbapal.lz"); -const u32 gMonPalette_Tapu_lele[] = INCBIN_U32("graphics/pokemon/tapu_lele/normal.gbapal.lz"); -const u32 gMonPalette_Tapu_bulu[] = INCBIN_U32("graphics/pokemon/tapu_bulu/normal.gbapal.lz"); -const u32 gMonPalette_Tapu_fini[] = INCBIN_U32("graphics/pokemon/tapu_fini/normal.gbapal.lz"); +const u32 gMonPalette_Jangmoo[] = INCBIN_U32("graphics/pokemon/jangmo_o/normal.gbapal.lz"); +const u32 gMonPalette_Hakamoo[] = INCBIN_U32("graphics/pokemon/hakamo_o/normal.gbapal.lz"); +const u32 gMonPalette_Kommoo[] = INCBIN_U32("graphics/pokemon/kommo_o/normal.gbapal.lz"); +const u32 gMonPalette_TapuKoko[] = INCBIN_U32("graphics/pokemon/tapu_koko/normal.gbapal.lz"); +const u32 gMonPalette_TapuLele[] = INCBIN_U32("graphics/pokemon/tapu_lele/normal.gbapal.lz"); +const u32 gMonPalette_TapuBulu[] = INCBIN_U32("graphics/pokemon/tapu_bulu/normal.gbapal.lz"); +const u32 gMonPalette_TapuFini[] = INCBIN_U32("graphics/pokemon/tapu_fini/normal.gbapal.lz"); const u32 gMonPalette_Cosmog[] = INCBIN_U32("graphics/pokemon/cosmog/normal.gbapal.lz"); const u32 gMonPalette_Cosmoem[] = INCBIN_U32("graphics/pokemon/cosmoem/normal.gbapal.lz"); const u32 gMonPalette_Solgaleo[] = INCBIN_U32("graphics/pokemon/solgaleo/normal.gbapal.lz"); @@ -3385,7 +3385,7 @@ const u32 gMonPalette_Zygarde10[] = INCBIN_U32("graphics/pokemon/zygarde/10_perc const u32 gMonPalette_ZygardeComplete[] = INCBIN_U32("graphics/pokemon/zygarde/complete/normal.gbapal.lz"); const u32 gMonPalette_HoopaUnbound[] = INCBIN_U32("graphics/pokemon/hoopa/unbound/normal.gbapal.lz"); const u32 gMonPalette_OricorioPomPom[] = INCBIN_U32("graphics/pokemon/oricorio/pom_pom/normal.gbapal.lz"); -const u32 gMonPalette_OricorioPau[] = INCBIN_U32("graphics/pokemon/oricorio/pa_u/normal.gbapal.lz"); +const u32 gMonPalette_OricorioPau[] = INCBIN_U32("graphics/pokemon/oricorio/pau/normal.gbapal.lz"); const u32 gMonPalette_OricorioSensu[] = INCBIN_U32("graphics/pokemon/oricorio/sensu/normal.gbapal.lz"); const u32 gMonPalette_LycanrocMidnight[] = INCBIN_U32("graphics/pokemon/lycanroc/midnight/normal.gbapal.lz"); const u32 gMonPalette_LycanrocDusk[] = INCBIN_U32("graphics/pokemon/lycanroc/dusk/normal.gbapal.lz"); @@ -3565,7 +3565,7 @@ const u32 gMonShinyPalette_Goldeen[] = INCBIN_U32("graphics/pokemon/goldeen/shin const u32 gMonShinyPalette_Seaking[] = INCBIN_U32("graphics/pokemon/seaking/shiny.gbapal.lz"); const u32 gMonShinyPalette_Staryu[] = INCBIN_U32("graphics/pokemon/staryu/shiny.gbapal.lz"); const u32 gMonShinyPalette_Starmie[] = INCBIN_U32("graphics/pokemon/starmie/shiny.gbapal.lz"); -const u32 gMonShinyPalette_Mrmime[] = INCBIN_U32("graphics/pokemon/mr_mime/shiny.gbapal.lz"); +const u32 gMonShinyPalette_MrMime[] = INCBIN_U32("graphics/pokemon/mr_mime/shiny.gbapal.lz"); const u32 gMonShinyPalette_Scyther[] = INCBIN_U32("graphics/pokemon/scyther/shiny.gbapal.lz"); const u32 gMonShinyPalette_Jynx[] = INCBIN_U32("graphics/pokemon/jynx/shiny.gbapal.lz"); const u32 gMonShinyPalette_Electabuzz[] = INCBIN_U32("graphics/pokemon/electabuzz/shiny.gbapal.lz"); @@ -3882,7 +3882,7 @@ const u32 gMonShinyPalette_Skuntank[] = INCBIN_U32("graphics/pokemon/skuntank/sh const u32 gMonShinyPalette_Bronzor[] = INCBIN_U32("graphics/pokemon/bronzor/shiny.gbapal.lz"); const u32 gMonShinyPalette_Bronzong[] = INCBIN_U32("graphics/pokemon/bronzong/shiny.gbapal.lz"); const u32 gMonShinyPalette_Bonsly[] = INCBIN_U32("graphics/pokemon/bonsly/shiny.gbapal.lz"); -const u32 gMonShinyPalette_Mimejr[] = INCBIN_U32("graphics/pokemon/mimejr/shiny.gbapal.lz"); +const u32 gMonShinyPalette_MimeJr[] = INCBIN_U32("graphics/pokemon/mime_jr/shiny.gbapal.lz"); const u32 gMonShinyPalette_Happiny[] = INCBIN_U32("graphics/pokemon/happiny/shiny.gbapal.lz"); const u32 gMonShinyPalette_Chatot[] = INCBIN_U32("graphics/pokemon/chatot/shiny.gbapal.lz"); const u32 gMonShinyPalette_Spiritomb[] = INCBIN_U32("graphics/pokemon/spiritomb/shiny.gbapal.lz"); @@ -4215,7 +4215,7 @@ const u32 gMonShinyPalette_Golisopod[] = INCBIN_U32("graphics/pokemon/golisopod/ const u32 gMonShinyPalette_Sandygast[] = INCBIN_U32("graphics/pokemon/sandygast/shiny.gbapal.lz"); const u32 gMonShinyPalette_Palossand[] = INCBIN_U32("graphics/pokemon/palossand/shiny.gbapal.lz"); const u32 gMonShinyPalette_Pyukumuku[] = INCBIN_U32("graphics/pokemon/pyukumuku/shiny.gbapal.lz"); -const u32 gMonShinyPalette_Type_null[] = INCBIN_U32("graphics/pokemon/type_null/shiny.gbapal.lz"); +const u32 gMonShinyPalette_TypeNull[] = INCBIN_U32("graphics/pokemon/type_null/shiny.gbapal.lz"); const u32 gMonShinyPalette_Silvally[] = INCBIN_U32("graphics/pokemon/silvally/shiny.gbapal.lz"); const u32 gMonShinyPalette_Minior[] = INCBIN_U32("graphics/pokemon/minior/shiny.gbapal.lz"); const u32 gMonShinyPalette_Komala[] = INCBIN_U32("graphics/pokemon/komala/shiny.gbapal.lz"); @@ -4225,13 +4225,13 @@ const u32 gMonShinyPalette_Mimikyu[] = INCBIN_U32("graphics/pokemon/mimikyu/shin const u32 gMonShinyPalette_Bruxish[] = INCBIN_U32("graphics/pokemon/bruxish/shiny.gbapal.lz"); const u32 gMonShinyPalette_Drampa[] = INCBIN_U32("graphics/pokemon/drampa/shiny.gbapal.lz"); const u32 gMonShinyPalette_Dhelmise[] = INCBIN_U32("graphics/pokemon/dhelmise/shiny.gbapal.lz"); -const u32 gMonShinyPalette_Jangmo_o[] = INCBIN_U32("graphics/pokemon/jangmo_o/shiny.gbapal.lz"); -const u32 gMonShinyPalette_Hakamo_o[] = INCBIN_U32("graphics/pokemon/hakamo_o/shiny.gbapal.lz"); -const u32 gMonShinyPalette_Kommo_o[] = INCBIN_U32("graphics/pokemon/kommo_o/shiny.gbapal.lz"); -const u32 gMonShinyPalette_Tapu_koko[] = INCBIN_U32("graphics/pokemon/tapu_koko/shiny.gbapal.lz"); -const u32 gMonShinyPalette_Tapu_lele[] = INCBIN_U32("graphics/pokemon/tapu_lele/shiny.gbapal.lz"); -const u32 gMonShinyPalette_Tapu_bulu[] = INCBIN_U32("graphics/pokemon/tapu_bulu/shiny.gbapal.lz"); -const u32 gMonShinyPalette_Tapu_fini[] = INCBIN_U32("graphics/pokemon/tapu_fini/shiny.gbapal.lz"); +const u32 gMonShinyPalette_Jangmoo[] = INCBIN_U32("graphics/pokemon/jangmo_o/shiny.gbapal.lz"); +const u32 gMonShinyPalette_Hakamoo[] = INCBIN_U32("graphics/pokemon/hakamo_o/shiny.gbapal.lz"); +const u32 gMonShinyPalette_Kommoo[] = INCBIN_U32("graphics/pokemon/kommo_o/shiny.gbapal.lz"); +const u32 gMonShinyPalette_TapuKoko[] = INCBIN_U32("graphics/pokemon/tapu_koko/shiny.gbapal.lz"); +const u32 gMonShinyPalette_TapuLele[] = INCBIN_U32("graphics/pokemon/tapu_lele/shiny.gbapal.lz"); +const u32 gMonShinyPalette_TapuBulu[] = INCBIN_U32("graphics/pokemon/tapu_bulu/shiny.gbapal.lz"); +const u32 gMonShinyPalette_TapuFini[] = INCBIN_U32("graphics/pokemon/tapu_fini/shiny.gbapal.lz"); const u32 gMonShinyPalette_Cosmog[] = INCBIN_U32("graphics/pokemon/cosmog/shiny.gbapal.lz"); const u32 gMonShinyPalette_Cosmoem[] = INCBIN_U32("graphics/pokemon/cosmoem/shiny.gbapal.lz"); const u32 gMonShinyPalette_Solgaleo[] = INCBIN_U32("graphics/pokemon/solgaleo/shiny.gbapal.lz"); @@ -4550,7 +4550,7 @@ const u32 gMonShinyPalette_Zygarde10[] = INCBIN_U32("graphics/pokemon/zygarde/10 const u32 gMonShinyPalette_ZygardeComplete[] = INCBIN_U32("graphics/pokemon/zygarde/complete/shiny.gbapal.lz"); const u32 gMonShinyPalette_HoopaUnbound[] = INCBIN_U32("graphics/pokemon/hoopa/unbound/shiny.gbapal.lz"); const u32 gMonShinyPalette_OricorioPomPom[] = INCBIN_U32("graphics/pokemon/oricorio/pom_pom/shiny.gbapal.lz"); -const u32 gMonShinyPalette_OricorioPau[] = INCBIN_U32("graphics/pokemon/oricorio/pa_u/shiny.gbapal.lz"); +const u32 gMonShinyPalette_OricorioPau[] = INCBIN_U32("graphics/pokemon/oricorio/pau/shiny.gbapal.lz"); const u32 gMonShinyPalette_OricorioSensu[] = INCBIN_U32("graphics/pokemon/oricorio/sensu/shiny.gbapal.lz"); const u32 gMonShinyPalette_LycanrocMidnight[] = INCBIN_U32("graphics/pokemon/lycanroc/midnight/shiny.gbapal.lz"); const u32 gMonShinyPalette_LycanrocDusk[] = INCBIN_U32("graphics/pokemon/lycanroc/dusk/shiny.gbapal.lz"); @@ -4722,7 +4722,7 @@ const u8 gMonIcon_Goldeen[] = INCBIN_U8("graphics/pokemon/goldeen/icon.4bpp"); const u8 gMonIcon_Seaking[] = INCBIN_U8("graphics/pokemon/seaking/icon.4bpp"); const u8 gMonIcon_Staryu[] = INCBIN_U8("graphics/pokemon/staryu/icon.4bpp"); const u8 gMonIcon_Starmie[] = INCBIN_U8("graphics/pokemon/starmie/icon.4bpp"); -const u8 gMonIcon_Mrmime[] = INCBIN_U8("graphics/pokemon/mr_mime/icon.4bpp"); +const u8 gMonIcon_MrMime[] = INCBIN_U8("graphics/pokemon/mr_mime/icon.4bpp"); const u8 gMonIcon_Scyther[] = INCBIN_U8("graphics/pokemon/scyther/icon.4bpp"); const u8 gMonIcon_Jynx[] = INCBIN_U8("graphics/pokemon/jynx/icon.4bpp"); const u8 gMonIcon_Electabuzz[] = INCBIN_U8("graphics/pokemon/electabuzz/icon.4bpp"); @@ -5039,7 +5039,7 @@ const u8 gMonIcon_Skuntank[] = INCBIN_U8("graphics/pokemon/skuntank/icon.4bpp"); const u8 gMonIcon_Bronzor[] = INCBIN_U8("graphics/pokemon/bronzor/icon.4bpp"); const u8 gMonIcon_Bronzong[] = INCBIN_U8("graphics/pokemon/bronzong/icon.4bpp"); const u8 gMonIcon_Bonsly[] = INCBIN_U8("graphics/pokemon/bonsly/icon.4bpp"); -const u8 gMonIcon_Mimejr[] = INCBIN_U8("graphics/pokemon/mimejr/icon.4bpp"); +const u8 gMonIcon_MimeJr[] = INCBIN_U8("graphics/pokemon/mime_jr/icon.4bpp"); const u8 gMonIcon_Happiny[] = INCBIN_U8("graphics/pokemon/happiny/icon.4bpp"); const u8 gMonIcon_Chatot[] = INCBIN_U8("graphics/pokemon/chatot/icon.4bpp"); const u8 gMonIcon_Spiritomb[] = INCBIN_U8("graphics/pokemon/spiritomb/icon.4bpp"); @@ -5372,7 +5372,7 @@ const u8 gMonIcon_Golisopod[] = INCBIN_U8("graphics/pokemon/golisopod/icon.4bpp" const u8 gMonIcon_Sandygast[] = INCBIN_U8("graphics/pokemon/sandygast/icon.4bpp"); const u8 gMonIcon_Palossand[] = INCBIN_U8("graphics/pokemon/palossand/icon.4bpp"); const u8 gMonIcon_Pyukumuku[] = INCBIN_U8("graphics/pokemon/pyukumuku/icon.4bpp"); -const u8 gMonIcon_Type_null[] = INCBIN_U8("graphics/pokemon/type_null/icon.4bpp"); +const u8 gMonIcon_TypeNull[] = INCBIN_U8("graphics/pokemon/type_null/icon.4bpp"); const u8 gMonIcon_Silvally[] = INCBIN_U8("graphics/pokemon/silvally/icon.4bpp"); const u8 gMonIcon_Minior[] = INCBIN_U8("graphics/pokemon/minior/icon.4bpp"); const u8 gMonIcon_Komala[] = INCBIN_U8("graphics/pokemon/komala/icon.4bpp"); @@ -5382,13 +5382,13 @@ const u8 gMonIcon_Mimikyu[] = INCBIN_U8("graphics/pokemon/mimikyu/icon.4bpp"); const u8 gMonIcon_Bruxish[] = INCBIN_U8("graphics/pokemon/bruxish/icon.4bpp"); const u8 gMonIcon_Drampa[] = INCBIN_U8("graphics/pokemon/drampa/icon.4bpp"); const u8 gMonIcon_Dhelmise[] = INCBIN_U8("graphics/pokemon/dhelmise/icon.4bpp"); -const u8 gMonIcon_Jangmo_o[] = INCBIN_U8("graphics/pokemon/jangmo_o/icon.4bpp"); -const u8 gMonIcon_Hakamo_o[] = INCBIN_U8("graphics/pokemon/hakamo_o/icon.4bpp"); -const u8 gMonIcon_Kommo_o[] = INCBIN_U8("graphics/pokemon/kommo_o/icon.4bpp"); -const u8 gMonIcon_Tapu_koko[] = INCBIN_U8("graphics/pokemon/tapu_koko/icon.4bpp"); -const u8 gMonIcon_Tapu_lele[] = INCBIN_U8("graphics/pokemon/tapu_lele/icon.4bpp"); -const u8 gMonIcon_Tapu_bulu[] = INCBIN_U8("graphics/pokemon/tapu_bulu/icon.4bpp"); -const u8 gMonIcon_Tapu_fini[] = INCBIN_U8("graphics/pokemon/tapu_fini/icon.4bpp"); +const u8 gMonIcon_Jangmoo[] = INCBIN_U8("graphics/pokemon/jangmo_o/icon.4bpp"); +const u8 gMonIcon_Hakamoo[] = INCBIN_U8("graphics/pokemon/hakamo_o/icon.4bpp"); +const u8 gMonIcon_Kommoo[] = INCBIN_U8("graphics/pokemon/kommo_o/icon.4bpp"); +const u8 gMonIcon_TapuKoko[] = INCBIN_U8("graphics/pokemon/tapu_koko/icon.4bpp"); +const u8 gMonIcon_TapuLele[] = INCBIN_U8("graphics/pokemon/tapu_lele/icon.4bpp"); +const u8 gMonIcon_TapuBulu[] = INCBIN_U8("graphics/pokemon/tapu_bulu/icon.4bpp"); +const u8 gMonIcon_TapuFini[] = INCBIN_U8("graphics/pokemon/tapu_fini/icon.4bpp"); const u8 gMonIcon_Cosmog[] = INCBIN_U8("graphics/pokemon/cosmog/icon.4bpp"); const u8 gMonIcon_Cosmoem[] = INCBIN_U8("graphics/pokemon/cosmoem/icon.4bpp"); const u8 gMonIcon_Solgaleo[] = INCBIN_U8("graphics/pokemon/solgaleo/icon.4bpp"); @@ -5603,7 +5603,7 @@ const u8 gMonIcon_Zygarde10[] = INCBIN_U8("graphics/pokemon/zygarde/10_percent/i const u8 gMonIcon_ZygardeComplete[] = INCBIN_U8("graphics/pokemon/zygarde/complete/icon.4bpp"); const u8 gMonIcon_HoopaUnbound[] = INCBIN_U8("graphics/pokemon/hoopa/unbound/icon.4bpp"); const u8 gMonIcon_OricorioPomPom[] = INCBIN_U8("graphics/pokemon/oricorio/pom_pom/icon.4bpp"); -const u8 gMonIcon_OricorioPau[] = INCBIN_U8("graphics/pokemon/oricorio/pa_u/icon.4bpp"); +const u8 gMonIcon_OricorioPau[] = INCBIN_U8("graphics/pokemon/oricorio/pau/icon.4bpp"); const u8 gMonIcon_OricorioSensu[] = INCBIN_U8("graphics/pokemon/oricorio/sensu/icon.4bpp"); const u8 gMonIcon_LycanrocMidnight[] = INCBIN_U8("graphics/pokemon/lycanroc/midnight/icon.4bpp"); const u8 gMonIcon_LycanrocDusk[] = INCBIN_U8("graphics/pokemon/lycanroc/dusk/icon.4bpp"); @@ -5744,7 +5744,7 @@ const u8 gMonFootprint_Goldeen[] = INCBIN_U8("graphics/pokemon/goldeen/footprint const u8 gMonFootprint_Seaking[] = INCBIN_U8("graphics/pokemon/seaking/footprint.1bpp"); const u8 gMonFootprint_Staryu[] = INCBIN_U8("graphics/pokemon/staryu/footprint.1bpp"); const u8 gMonFootprint_Starmie[] = INCBIN_U8("graphics/pokemon/starmie/footprint.1bpp"); -const u8 gMonFootprint_Mrmime[] = INCBIN_U8("graphics/pokemon/mr_mime/footprint.1bpp"); +const u8 gMonFootprint_MrMime[] = INCBIN_U8("graphics/pokemon/mr_mime/footprint.1bpp"); const u8 gMonFootprint_Scyther[] = INCBIN_U8("graphics/pokemon/scyther/footprint.1bpp"); const u8 gMonFootprint_Jynx[] = INCBIN_U8("graphics/pokemon/jynx/footprint.1bpp"); const u8 gMonFootprint_Electabuzz[] = INCBIN_U8("graphics/pokemon/electabuzz/footprint.1bpp"); @@ -6061,7 +6061,7 @@ const u8 gMonFootprint_Skuntank[] = INCBIN_U8("graphics/pokemon/skuntank/footpri const u8 gMonFootprint_Bronzor[] = INCBIN_U8("graphics/pokemon/bronzor/footprint.1bpp"); const u8 gMonFootprint_Bronzong[] = INCBIN_U8("graphics/pokemon/bronzong/footprint.1bpp"); const u8 gMonFootprint_Bonsly[] = INCBIN_U8("graphics/pokemon/bonsly/footprint.1bpp"); -const u8 gMonFootprint_MimeJr[] = INCBIN_U8("graphics/pokemon/mimejr/footprint.1bpp"); +const u8 gMonFootprint_MimeJr[] = INCBIN_U8("graphics/pokemon/mime_jr/footprint.1bpp"); const u8 gMonFootprint_Happiny[] = INCBIN_U8("graphics/pokemon/happiny/footprint.1bpp"); const u8 gMonFootprint_Chatot[] = INCBIN_U8("graphics/pokemon/chatot/footprint.1bpp"); const u8 gMonFootprint_Spiritomb[] = INCBIN_U8("graphics/pokemon/spiritomb/footprint.1bpp"); diff --git a/src/data/items.h b/src/data/items.h index 30beb5352..443c45f1a 100644 --- a/src/data/items.h +++ b/src/data/items.h @@ -7,9 +7,8 @@ const struct Item gItems[] = .price = 0, .description = sDummyDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, // Pokeballs @@ -21,10 +20,10 @@ const struct Item gItems[] = .price = 0, .description = sMasterBallDesc, .pocket = POCKET_POKE_BALLS, - .type = 0, - .battleUsage = 2, + .type = ITEM_MASTER_BALL - FIRST_BALL, + .battleUsage = ITEM_B_USE_OTHER, .battleUseFunc = ItemUseInBattle_PokeBall, - .secondaryId = 0, + .secondaryId = ITEM_MASTER_BALL - FIRST_BALL, }, [ITEM_ULTRA_BALL] = @@ -34,10 +33,10 @@ const struct Item gItems[] = .price = 1200, .description = sUltraBallDesc, .pocket = POCKET_POKE_BALLS, - .type = 1, - .battleUsage = 2, + .type = ITEM_ULTRA_BALL - FIRST_BALL, + .battleUsage = ITEM_B_USE_OTHER, .battleUseFunc = ItemUseInBattle_PokeBall, - .secondaryId = 1, + .secondaryId = ITEM_ULTRA_BALL - FIRST_BALL, }, [ITEM_GREAT_BALL] = @@ -47,10 +46,10 @@ const struct Item gItems[] = .price = 600, .description = sGreatBallDesc, .pocket = POCKET_POKE_BALLS, - .type = 2, - .battleUsage = 2, + .type = ITEM_GREAT_BALL - FIRST_BALL, + .battleUsage = ITEM_B_USE_OTHER, .battleUseFunc = ItemUseInBattle_PokeBall, - .secondaryId = 2, + .secondaryId = ITEM_GREAT_BALL - FIRST_BALL, }, [ITEM_POKE_BALL] = @@ -60,10 +59,10 @@ const struct Item gItems[] = .price = 200, .description = sPokeBallDesc, .pocket = POCKET_POKE_BALLS, - .type = 3, - .battleUsage = 2, + .type = ITEM_POKE_BALL - FIRST_BALL, + .battleUsage = ITEM_B_USE_OTHER, .battleUseFunc = ItemUseInBattle_PokeBall, - .secondaryId = 3, + .secondaryId = ITEM_POKE_BALL - FIRST_BALL, }, [ITEM_SAFARI_BALL] = @@ -73,10 +72,10 @@ const struct Item gItems[] = .price = 0, .description = sSafariBallDesc, .pocket = POCKET_POKE_BALLS, - .type = 4, - .battleUsage = 2, + .type = ITEM_SAFARI_BALL - FIRST_BALL, + .battleUsage = ITEM_B_USE_OTHER, .battleUseFunc = ItemUseInBattle_PokeBall, - .secondaryId = 4, + .secondaryId = ITEM_SAFARI_BALL - FIRST_BALL, }, [ITEM_NET_BALL] = @@ -86,10 +85,10 @@ const struct Item gItems[] = .price = 1000, .description = sNetBallDesc, .pocket = POCKET_POKE_BALLS, - .type = 5, - .battleUsage = 2, + .type = ITEM_NET_BALL - FIRST_BALL, + .battleUsage = ITEM_B_USE_OTHER, .battleUseFunc = ItemUseInBattle_PokeBall, - .secondaryId = 5, + .secondaryId = ITEM_NET_BALL - FIRST_BALL, }, [ITEM_DIVE_BALL] = @@ -99,10 +98,10 @@ const struct Item gItems[] = .price = 1000, .description = sDiveBallDesc, .pocket = POCKET_POKE_BALLS, - .type = 6, - .battleUsage = 2, + .type = ITEM_DIVE_BALL - FIRST_BALL, + .battleUsage = ITEM_B_USE_OTHER, .battleUseFunc = ItemUseInBattle_PokeBall, - .secondaryId = 6, + .secondaryId = ITEM_DIVE_BALL - FIRST_BALL, }, [ITEM_NEST_BALL] = @@ -112,10 +111,10 @@ const struct Item gItems[] = .price = 1000, .description = sNestBallDesc, .pocket = POCKET_POKE_BALLS, - .type = 7, - .battleUsage = 2, + .type = ITEM_NEST_BALL - FIRST_BALL, + .battleUsage = ITEM_B_USE_OTHER, .battleUseFunc = ItemUseInBattle_PokeBall, - .secondaryId = 7, + .secondaryId = ITEM_NEST_BALL - FIRST_BALL, }, [ITEM_REPEAT_BALL] = @@ -125,10 +124,10 @@ const struct Item gItems[] = .price = 1000, .description = sRepeatBallDesc, .pocket = POCKET_POKE_BALLS, - .type = 8, - .battleUsage = 2, + .type = ITEM_REPEAT_BALL - FIRST_BALL, + .battleUsage = ITEM_B_USE_OTHER, .battleUseFunc = ItemUseInBattle_PokeBall, - .secondaryId = 8, + .secondaryId = ITEM_REPEAT_BALL - FIRST_BALL, }, [ITEM_TIMER_BALL] = @@ -138,10 +137,10 @@ const struct Item gItems[] = .price = 1000, .description = sTimerBallDesc, .pocket = POCKET_POKE_BALLS, - .type = 9, - .battleUsage = 2, + .type = ITEM_TIMER_BALL - FIRST_BALL, + .battleUsage = ITEM_B_USE_OTHER, .battleUseFunc = ItemUseInBattle_PokeBall, - .secondaryId = 9, + .secondaryId = ITEM_TIMER_BALL - FIRST_BALL, }, [ITEM_LUXURY_BALL] = @@ -151,10 +150,10 @@ const struct Item gItems[] = .price = 1000, .description = sLuxuryBallDesc, .pocket = POCKET_POKE_BALLS, - .type = 10, - .battleUsage = 2, + .type = ITEM_LUXURY_BALL - FIRST_BALL, + .battleUsage = ITEM_B_USE_OTHER, .battleUseFunc = ItemUseInBattle_PokeBall, - .secondaryId = 10, + .secondaryId = ITEM_LUXURY_BALL - FIRST_BALL, }, [ITEM_PREMIER_BALL] = @@ -164,10 +163,10 @@ const struct Item gItems[] = .price = 200, .description = sPremierBallDesc, .pocket = POCKET_POKE_BALLS, - .type = 11, - .battleUsage = 2, + .type = ITEM_PREMIER_BALL - FIRST_BALL, + .battleUsage = ITEM_B_USE_OTHER, .battleUseFunc = ItemUseInBattle_PokeBall, - .secondaryId = 11, + .secondaryId = ITEM_PREMIER_BALL - FIRST_BALL, }, // Medicine @@ -180,11 +179,10 @@ const struct Item gItems[] = .holdEffectParam = 20, .description = sPotionDesc, .pocket = POCKET_ITEMS, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_Medicine, - .battleUsage = 1, + .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_Medicine, - .secondaryId = 0, }, [ITEM_ANTIDOTE] = @@ -194,11 +192,10 @@ const struct Item gItems[] = .price = 100, .description = sAntidoteDesc, .pocket = POCKET_ITEMS, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_Medicine, - .battleUsage = 1, + .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_Medicine, - .secondaryId = 0, }, [ITEM_BURN_HEAL] = @@ -208,11 +205,10 @@ const struct Item gItems[] = .price = 250, .description = sBurnHealDesc, .pocket = POCKET_ITEMS, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_Medicine, - .battleUsage = 1, + .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_Medicine, - .secondaryId = 0, }, [ITEM_ICE_HEAL] = @@ -222,11 +218,10 @@ const struct Item gItems[] = .price = 250, .description = sIceHealDesc, .pocket = POCKET_ITEMS, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_Medicine, - .battleUsage = 1, + .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_Medicine, - .secondaryId = 0, }, [ITEM_AWAKENING] = @@ -236,11 +231,10 @@ const struct Item gItems[] = .price = 250, .description = sAwakeningDesc, .pocket = POCKET_ITEMS, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_Medicine, - .battleUsage = 1, + .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_Medicine, - .secondaryId = 0, }, [ITEM_PARALYZE_HEAL] = @@ -250,11 +244,10 @@ const struct Item gItems[] = .price = 200, .description = sParalyzeHealDesc, .pocket = POCKET_ITEMS, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_Medicine, - .battleUsage = 1, + .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_Medicine, - .secondaryId = 0, }, [ITEM_FULL_RESTORE] = @@ -265,11 +258,10 @@ const struct Item gItems[] = .holdEffectParam = 255, .description = sFullRestoreDesc, .pocket = POCKET_ITEMS, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_Medicine, - .battleUsage = 1, + .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_Medicine, - .secondaryId = 0, }, [ITEM_MAX_POTION] = @@ -280,11 +272,10 @@ const struct Item gItems[] = .holdEffectParam = 255, .description = sMaxPotionDesc, .pocket = POCKET_ITEMS, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_Medicine, - .battleUsage = 1, + .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_Medicine, - .secondaryId = 0, }, [ITEM_HYPER_POTION] = @@ -295,11 +286,10 @@ const struct Item gItems[] = .holdEffectParam = 200, .description = sHyperPotionDesc, .pocket = POCKET_ITEMS, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_Medicine, - .battleUsage = 1, + .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_Medicine, - .secondaryId = 0, }, [ITEM_SUPER_POTION] = @@ -310,11 +300,10 @@ const struct Item gItems[] = .holdEffectParam = 50, .description = sSuperPotionDesc, .pocket = POCKET_ITEMS, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_Medicine, - .battleUsage = 1, + .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_Medicine, - .secondaryId = 0, }, [ITEM_FULL_HEAL] = @@ -324,11 +313,10 @@ const struct Item gItems[] = .price = 600, .description = sFullHealDesc, .pocket = POCKET_ITEMS, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_Medicine, - .battleUsage = 1, + .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_Medicine, - .secondaryId = 0, }, [ITEM_REVIVE] = @@ -338,11 +326,10 @@ const struct Item gItems[] = .price = 1500, .description = sReviveDesc, .pocket = POCKET_ITEMS, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_Medicine, - .battleUsage = 1, + .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_Medicine, - .secondaryId = 0, }, [ITEM_MAX_REVIVE] = @@ -352,11 +339,10 @@ const struct Item gItems[] = .price = 4000, .description = sMaxReviveDesc, .pocket = POCKET_ITEMS, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_Medicine, - .battleUsage = 1, + .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_Medicine, - .secondaryId = 0, }, [ITEM_FRESH_WATER] = @@ -367,11 +353,10 @@ const struct Item gItems[] = .holdEffectParam = 50, .description = sFreshWaterDesc, .pocket = POCKET_ITEMS, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_Medicine, - .battleUsage = 1, + .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_Medicine, - .secondaryId = 0, }, [ITEM_SODA_POP] = @@ -382,11 +367,10 @@ const struct Item gItems[] = .holdEffectParam = 60, .description = sSodaPopDesc, .pocket = POCKET_ITEMS, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_Medicine, - .battleUsage = 1, + .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_Medicine, - .secondaryId = 0, }, [ITEM_LEMONADE] = @@ -397,11 +381,10 @@ const struct Item gItems[] = .holdEffectParam = 80, .description = sLemonadeDesc, .pocket = POCKET_ITEMS, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_Medicine, - .battleUsage = 1, + .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_Medicine, - .secondaryId = 0, }, [ITEM_MOOMOO_MILK] = @@ -412,11 +395,10 @@ const struct Item gItems[] = .holdEffectParam = 100, .description = sMoomooMilkDesc, .pocket = POCKET_ITEMS, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_Medicine, - .battleUsage = 1, + .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_Medicine, - .secondaryId = 0, }, [ITEM_ENERGY_POWDER] = @@ -426,11 +408,10 @@ const struct Item gItems[] = .price = 500, .description = sEnergyPowderDesc, .pocket = POCKET_ITEMS, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_Medicine, - .battleUsage = 1, + .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_Medicine, - .secondaryId = 0, }, [ITEM_ENERGY_ROOT] = @@ -440,11 +421,10 @@ const struct Item gItems[] = .price = 800, .description = sEnergyRootDesc, .pocket = POCKET_ITEMS, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_Medicine, - .battleUsage = 1, + .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_Medicine, - .secondaryId = 0, }, [ITEM_HEAL_POWDER] = @@ -454,11 +434,10 @@ const struct Item gItems[] = .price = 450, .description = sHealPowderDesc, .pocket = POCKET_ITEMS, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_Medicine, - .battleUsage = 1, + .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_Medicine, - .secondaryId = 0, }, [ITEM_REVIVAL_HERB] = @@ -468,11 +447,10 @@ const struct Item gItems[] = .price = 2800, .description = sRevivalHerbDesc, .pocket = POCKET_ITEMS, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_Medicine, - .battleUsage = 1, + .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_Medicine, - .secondaryId = 0, }, [ITEM_ETHER] = @@ -483,11 +461,10 @@ const struct Item gItems[] = .holdEffectParam = 10, .description = sEtherDesc, .pocket = POCKET_ITEMS, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_PPRecovery, - .battleUsage = 1, + .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_PPRecovery, - .secondaryId = 0, }, [ITEM_MAX_ETHER] = @@ -498,11 +475,10 @@ const struct Item gItems[] = .holdEffectParam = 255, .description = sMaxEtherDesc, .pocket = POCKET_ITEMS, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_PPRecovery, - .battleUsage = 1, + .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_PPRecovery, - .secondaryId = 0, }, [ITEM_ELIXIR] = @@ -513,11 +489,10 @@ const struct Item gItems[] = .holdEffectParam = 10, .description = sElixirDesc, .pocket = POCKET_ITEMS, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_PPRecovery, - .battleUsage = 1, + .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_PPRecovery, - .secondaryId = 0, }, [ITEM_MAX_ELIXIR] = @@ -528,11 +503,10 @@ const struct Item gItems[] = .holdEffectParam = 255, .description = sMaxElixirDesc, .pocket = POCKET_ITEMS, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_PPRecovery, - .battleUsage = 1, + .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_PPRecovery, - .secondaryId = 0, }, [ITEM_LAVA_COOKIE] = @@ -542,11 +516,10 @@ const struct Item gItems[] = .price = 200, .description = sLavaCookieDesc, .pocket = POCKET_ITEMS, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_Medicine, - .battleUsage = 1, + .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_Medicine, - .secondaryId = 0, }, [ITEM_BLUE_FLUTE] = @@ -556,11 +529,10 @@ const struct Item gItems[] = .price = 100, .description = sBlueFluteDesc, .pocket = POCKET_ITEMS, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_Medicine, - .battleUsage = 1, + .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_Medicine, - .secondaryId = 0, }, [ITEM_YELLOW_FLUTE] = @@ -570,11 +542,10 @@ const struct Item gItems[] = .price = 200, .description = sYellowFluteDesc, .pocket = POCKET_ITEMS, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 1, + .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_Medicine, - .secondaryId = 0, }, [ITEM_RED_FLUTE] = @@ -584,11 +555,10 @@ const struct Item gItems[] = .price = 300, .description = sRedFluteDesc, .pocket = POCKET_ITEMS, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 1, + .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_Medicine, - .secondaryId = 0, }, [ITEM_BLACK_FLUTE] = @@ -599,9 +569,8 @@ const struct Item gItems[] = .holdEffectParam = 50, .description = sBlackFluteDesc, .pocket = POCKET_ITEMS, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_BlackWhiteFlute, - .secondaryId = 0, }, [ITEM_WHITE_FLUTE] = @@ -612,9 +581,8 @@ const struct Item gItems[] = .holdEffectParam = 150, .description = sWhiteFluteDesc, .pocket = POCKET_ITEMS, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_BlackWhiteFlute, - .secondaryId = 0, }, [ITEM_BERRY_JUICE] = @@ -626,11 +594,10 @@ const struct Item gItems[] = .holdEffectParam = 20, .description = sBerryJuiceDesc, .pocket = POCKET_ITEMS, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_Medicine, - .battleUsage = 1, + .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_Medicine, - .secondaryId = 0, }, [ITEM_SACRED_ASH] = @@ -640,9 +607,8 @@ const struct Item gItems[] = .price = 200, .description = sSacredAshDesc, .pocket = POCKET_ITEMS, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_SacredAsh, - .secondaryId = 0, }, // Collectibles @@ -654,9 +620,8 @@ const struct Item gItems[] = .price = 20, .description = sShoalSaltDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_SHOAL_SHELL] = @@ -666,9 +631,8 @@ const struct Item gItems[] = .price = 20, .description = sShoalShellDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_RED_SHARD] = @@ -678,9 +642,8 @@ const struct Item gItems[] = .price = 200, .description = sRedShardDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_BLUE_SHARD] = @@ -690,9 +653,8 @@ const struct Item gItems[] = .price = 200, .description = sBlueShardDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_YELLOW_SHARD] = @@ -702,9 +664,8 @@ const struct Item gItems[] = .price = 200, .description = sYellowShardDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_GREEN_SHARD] = @@ -714,9 +675,8 @@ const struct Item gItems[] = .price = 200, .description = sGreenShardDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_034] = @@ -726,9 +686,8 @@ const struct Item gItems[] = .price = 0, .description = sDummyDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_035] = @@ -738,9 +697,8 @@ const struct Item gItems[] = .price = 0, .description = sDummyDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_036] = @@ -750,9 +708,8 @@ const struct Item gItems[] = .price = 0, .description = sDummyDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_037] = @@ -762,9 +719,8 @@ const struct Item gItems[] = .price = 0, .description = sDummyDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_038] = @@ -774,9 +730,8 @@ const struct Item gItems[] = .price = 0, .description = sDummyDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_039] = @@ -786,9 +741,8 @@ const struct Item gItems[] = .price = 0, .description = sDummyDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_03A] = @@ -798,9 +752,8 @@ const struct Item gItems[] = .price = 0, .description = sDummyDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_03B] = @@ -810,9 +763,8 @@ const struct Item gItems[] = .price = 0, .description = sDummyDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_03C] = @@ -822,9 +774,8 @@ const struct Item gItems[] = .price = 0, .description = sDummyDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_03D] = @@ -834,9 +785,8 @@ const struct Item gItems[] = .price = 0, .description = sDummyDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_03E] = @@ -846,9 +796,8 @@ const struct Item gItems[] = .price = 0, .description = sDummyDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, // Vitamins @@ -860,9 +809,8 @@ const struct Item gItems[] = .price = 9800, .description = sHPUpDesc, .pocket = POCKET_ITEMS, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_Medicine, - .secondaryId = 0, }, [ITEM_PROTEIN] = @@ -872,9 +820,8 @@ const struct Item gItems[] = .price = 9800, .description = sProteinDesc, .pocket = POCKET_ITEMS, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_Medicine, - .secondaryId = 0, }, [ITEM_IRON] = @@ -884,9 +831,8 @@ const struct Item gItems[] = .price = 9800, .description = sIronDesc, .pocket = POCKET_ITEMS, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_Medicine, - .secondaryId = 0, }, [ITEM_CARBOS] = @@ -896,9 +842,8 @@ const struct Item gItems[] = .price = 9800, .description = sCarbosDesc, .pocket = POCKET_ITEMS, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_Medicine, - .secondaryId = 0, }, [ITEM_CALCIUM] = @@ -908,9 +853,8 @@ const struct Item gItems[] = .price = 9800, .description = sCalciumDesc, .pocket = POCKET_ITEMS, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_Medicine, - .secondaryId = 0, }, [ITEM_RARE_CANDY] = @@ -920,9 +864,8 @@ const struct Item gItems[] = .price = 4800, .description = sRareCandyDesc, .pocket = POCKET_ITEMS, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_RareCandy, - .secondaryId = 0, }, [ITEM_PP_UP] = @@ -932,9 +875,8 @@ const struct Item gItems[] = .price = 9800, .description = sPPUpDesc, .pocket = POCKET_ITEMS, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_PPUp, - .secondaryId = 0, }, [ITEM_ZINC] = @@ -944,9 +886,8 @@ const struct Item gItems[] = .price = 9800, .description = sZincDesc, .pocket = POCKET_ITEMS, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_Medicine, - .secondaryId = 0, }, [ITEM_PP_MAX] = @@ -956,9 +897,8 @@ const struct Item gItems[] = .price = 9800, .description = sPPMaxDesc, .pocket = POCKET_ITEMS, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_PPUp, - .secondaryId = 0, }, [ITEM_048] = @@ -968,9 +908,8 @@ const struct Item gItems[] = .price = 0, .description = sDummyDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, // Battle items @@ -982,11 +921,10 @@ const struct Item gItems[] = .price = 700, .description = sGuardSpecDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 2, + .battleUsage = ITEM_B_USE_OTHER, .battleUseFunc = ItemUseInBattle_StatIncrease, - .secondaryId = 0, }, [ITEM_DIRE_HIT] = @@ -996,11 +934,10 @@ const struct Item gItems[] = .price = 650, .description = sDireHitDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 2, + .battleUsage = ITEM_B_USE_OTHER, .battleUseFunc = ItemUseInBattle_StatIncrease, - .secondaryId = 0, }, [ITEM_X_ATTACK] = @@ -1010,11 +947,10 @@ const struct Item gItems[] = .price = 500, .description = sXAttackDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 2, + .battleUsage = ITEM_B_USE_OTHER, .battleUseFunc = ItemUseInBattle_StatIncrease, - .secondaryId = 0, }, [ITEM_X_DEFEND] = @@ -1024,11 +960,10 @@ const struct Item gItems[] = .price = 550, .description = sXDefendDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 2, + .battleUsage = ITEM_B_USE_OTHER, .battleUseFunc = ItemUseInBattle_StatIncrease, - .secondaryId = 0, }, [ITEM_X_SPEED] = @@ -1038,11 +973,10 @@ const struct Item gItems[] = .price = 350, .description = sXSpeedDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 2, + .battleUsage = ITEM_B_USE_OTHER, .battleUseFunc = ItemUseInBattle_StatIncrease, - .secondaryId = 0, }, [ITEM_X_ACCURACY] = @@ -1052,11 +986,10 @@ const struct Item gItems[] = .price = 950, .description = sXAccuracyDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 2, + .battleUsage = ITEM_B_USE_OTHER, .battleUseFunc = ItemUseInBattle_StatIncrease, - .secondaryId = 0, }, [ITEM_X_SPECIAL] = @@ -1066,11 +999,10 @@ const struct Item gItems[] = .price = 350, .description = sXSpecialDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 2, + .battleUsage = ITEM_B_USE_OTHER, .battleUseFunc = ItemUseInBattle_StatIncrease, - .secondaryId = 0, }, [ITEM_POKE_DOLL] = @@ -1080,11 +1012,10 @@ const struct Item gItems[] = .price = 1000, .description = sPokeDollDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 2, + .battleUsage = ITEM_B_USE_OTHER, .battleUseFunc = ItemUseInBattle_Escape, - .secondaryId = 0, }, [ITEM_FLUFFY_TAIL] = @@ -1094,11 +1025,10 @@ const struct Item gItems[] = .price = 1000, .description = sFluffyTailDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 2, + .battleUsage = ITEM_B_USE_OTHER, .battleUseFunc = ItemUseInBattle_Escape, - .secondaryId = 0, }, [ITEM_052] = @@ -1108,9 +1038,8 @@ const struct Item gItems[] = .price = 0, .description = sDummyDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, // Field items @@ -1123,9 +1052,8 @@ const struct Item gItems[] = .holdEffectParam = 200, .description = sSuperRepelDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_Repel, - .secondaryId = 0, }, [ITEM_MAX_REPEL] = @@ -1136,9 +1064,8 @@ const struct Item gItems[] = .holdEffectParam = 250, .description = sMaxRepelDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_Repel, - .secondaryId = 0, }, [ITEM_ESCAPE_ROPE] = @@ -1148,9 +1075,8 @@ const struct Item gItems[] = .price = 550, .description = sEscapeRopeDesc, .pocket = POCKET_ITEMS, - .type = 2, + .type = ITEM_USE_FIELD, .fieldUseFunc = ItemUseOutOfBattle_EscapeRope, - .secondaryId = 0, }, [ITEM_REPEL] = @@ -1161,9 +1087,8 @@ const struct Item gItems[] = .holdEffectParam = 100, .description = sRepelDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_Repel, - .secondaryId = 0, }, [ITEM_057] = @@ -1173,9 +1098,8 @@ const struct Item gItems[] = .price = 0, .description = sDummyDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_058] = @@ -1185,9 +1109,8 @@ const struct Item gItems[] = .price = 0, .description = sDummyDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_059] = @@ -1197,9 +1120,8 @@ const struct Item gItems[] = .price = 0, .description = sDummyDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_05A] = @@ -1209,9 +1131,8 @@ const struct Item gItems[] = .price = 0, .description = sDummyDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_05B] = @@ -1221,9 +1142,8 @@ const struct Item gItems[] = .price = 0, .description = sDummyDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_05C] = @@ -1233,9 +1153,8 @@ const struct Item gItems[] = .price = 0, .description = sDummyDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, // Evolution stones @@ -1247,9 +1166,8 @@ const struct Item gItems[] = .price = 2100, .description = sSunStoneDesc, .pocket = POCKET_ITEMS, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone, - .secondaryId = 0, }, [ITEM_MOON_STONE] = @@ -1259,9 +1177,8 @@ const struct Item gItems[] = .price = 0, .description = sMoonStoneDesc, .pocket = POCKET_ITEMS, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone, - .secondaryId = 0, }, [ITEM_FIRE_STONE] = @@ -1271,9 +1188,8 @@ const struct Item gItems[] = .price = 2100, .description = sFireStoneDesc, .pocket = POCKET_ITEMS, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone, - .secondaryId = 0, }, [ITEM_THUNDER_STONE] = @@ -1283,9 +1199,8 @@ const struct Item gItems[] = .price = 2100, .description = sThunderStoneDesc, .pocket = POCKET_ITEMS, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone, - .secondaryId = 0, }, [ITEM_WATER_STONE] = @@ -1295,9 +1210,8 @@ const struct Item gItems[] = .price = 2100, .description = sWaterStoneDesc, .pocket = POCKET_ITEMS, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone, - .secondaryId = 0, }, [ITEM_LEAF_STONE] = @@ -1307,9 +1221,8 @@ const struct Item gItems[] = .price = 2100, .description = sLeafStoneDesc, .pocket = POCKET_ITEMS, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone, - .secondaryId = 0, }, [ITEM_063] = @@ -1319,9 +1232,8 @@ const struct Item gItems[] = .price = 0, .description = sDummyDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_064] = @@ -1331,9 +1243,8 @@ const struct Item gItems[] = .price = 0, .description = sDummyDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_065] = @@ -1343,9 +1254,8 @@ const struct Item gItems[] = .price = 0, .description = sDummyDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_066] = @@ -1355,9 +1265,8 @@ const struct Item gItems[] = .price = 0, .description = sDummyDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, // Valuable items @@ -1369,9 +1278,8 @@ const struct Item gItems[] = .price = 500, .description = sTinyMushroomDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_BIG_MUSHROOM] = @@ -1381,9 +1289,8 @@ const struct Item gItems[] = .price = 5000, .description = sBigMushroomDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_069] = @@ -1393,9 +1300,8 @@ const struct Item gItems[] = .price = 0, .description = sDummyDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_PEARL] = @@ -1405,9 +1311,8 @@ const struct Item gItems[] = .price = 1400, .description = sPearlDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_BIG_PEARL] = @@ -1417,9 +1322,8 @@ const struct Item gItems[] = .price = 7500, .description = sBigPearlDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_STARDUST] = @@ -1429,9 +1333,8 @@ const struct Item gItems[] = .price = 2000, .description = sStardustDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_STAR_PIECE] = @@ -1441,9 +1344,8 @@ const struct Item gItems[] = .price = 9800, .description = sStarPieceDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_NUGGET] = @@ -1453,9 +1355,8 @@ const struct Item gItems[] = .price = 10000, .description = sNuggetDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_HEART_SCALE] = @@ -1465,9 +1366,8 @@ const struct Item gItems[] = .price = 100, .description = sHeartScaleDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_070] = @@ -1477,9 +1377,8 @@ const struct Item gItems[] = .price = 0, .description = sDummyDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_071] = @@ -1489,9 +1388,8 @@ const struct Item gItems[] = .price = 0, .description = sDummyDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_072] = @@ -1501,9 +1399,8 @@ const struct Item gItems[] = .price = 0, .description = sDummyDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_073] = @@ -1513,9 +1410,8 @@ const struct Item gItems[] = .price = 0, .description = sDummyDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_074] = @@ -1525,9 +1421,8 @@ const struct Item gItems[] = .price = 0, .description = sDummyDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_075] = @@ -1537,9 +1432,8 @@ const struct Item gItems[] = .price = 0, .description = sDummyDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_076] = @@ -1549,9 +1443,8 @@ const struct Item gItems[] = .price = 0, .description = sDummyDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_077] = @@ -1561,9 +1454,8 @@ const struct Item gItems[] = .price = 0, .description = sDummyDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_078] = @@ -1573,9 +1465,8 @@ const struct Item gItems[] = .price = 0, .description = sDummyDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, // Mail @@ -1586,9 +1477,9 @@ const struct Item gItems[] = .price = 50, .description = sOrangeMailDesc, .pocket = POCKET_ITEMS, - .type = 0, + .type = ITEM_USE_MAIL, .fieldUseFunc = ItemUseOutOfBattle_Mail, - .secondaryId = 0, + .secondaryId = ITEM_ORANGE_MAIL - FIRST_MAIL_INDEX, }, [ITEM_HARBOR_MAIL] = @@ -1598,9 +1489,9 @@ const struct Item gItems[] = .price = 50, .description = sHarborMailDesc, .pocket = POCKET_ITEMS, - .type = 0, + .type = ITEM_USE_MAIL, .fieldUseFunc = ItemUseOutOfBattle_Mail, - .secondaryId = 1, + .secondaryId = ITEM_HARBOR_MAIL - FIRST_MAIL_INDEX, }, [ITEM_GLITTER_MAIL] = @@ -1610,9 +1501,9 @@ const struct Item gItems[] = .price = 50, .description = sGlitterMailDesc, .pocket = POCKET_ITEMS, - .type = 0, + .type = ITEM_USE_MAIL, .fieldUseFunc = ItemUseOutOfBattle_Mail, - .secondaryId = 2, + .secondaryId = ITEM_GLITTER_MAIL - FIRST_MAIL_INDEX, }, [ITEM_MECH_MAIL] = @@ -1622,9 +1513,9 @@ const struct Item gItems[] = .price = 50, .description = sMechMailDesc, .pocket = POCKET_ITEMS, - .type = 0, + .type = ITEM_USE_MAIL, .fieldUseFunc = ItemUseOutOfBattle_Mail, - .secondaryId = 3, + .secondaryId = ITEM_MECH_MAIL - FIRST_MAIL_INDEX, }, [ITEM_WOOD_MAIL] = @@ -1634,9 +1525,9 @@ const struct Item gItems[] = .price = 50, .description = sWoodMailDesc, .pocket = POCKET_ITEMS, - .type = 0, + .type = ITEM_USE_MAIL, .fieldUseFunc = ItemUseOutOfBattle_Mail, - .secondaryId = 4, + .secondaryId = ITEM_WOOD_MAIL - FIRST_MAIL_INDEX, }, [ITEM_WAVE_MAIL] = @@ -1646,9 +1537,9 @@ const struct Item gItems[] = .price = 50, .description = sWaveMailDesc, .pocket = POCKET_ITEMS, - .type = 0, + .type = ITEM_USE_MAIL, .fieldUseFunc = ItemUseOutOfBattle_Mail, - .secondaryId = 5, + .secondaryId = ITEM_WAVE_MAIL - FIRST_MAIL_INDEX, }, [ITEM_BEAD_MAIL] = @@ -1658,9 +1549,9 @@ const struct Item gItems[] = .price = 50, .description = sBeadMailDesc, .pocket = POCKET_ITEMS, - .type = 0, + .type = ITEM_USE_MAIL, .fieldUseFunc = ItemUseOutOfBattle_Mail, - .secondaryId = 6, + .secondaryId = ITEM_BEAD_MAIL - FIRST_MAIL_INDEX, }, [ITEM_SHADOW_MAIL] = @@ -1670,9 +1561,9 @@ const struct Item gItems[] = .price = 50, .description = sShadowMailDesc, .pocket = POCKET_ITEMS, - .type = 0, + .type = ITEM_USE_MAIL, .fieldUseFunc = ItemUseOutOfBattle_Mail, - .secondaryId = 7, + .secondaryId = ITEM_SHADOW_MAIL - FIRST_MAIL_INDEX, }, [ITEM_TROPIC_MAIL] = @@ -1682,9 +1573,9 @@ const struct Item gItems[] = .price = 50, .description = sTropicMailDesc, .pocket = POCKET_ITEMS, - .type = 0, + .type = ITEM_USE_MAIL, .fieldUseFunc = ItemUseOutOfBattle_Mail, - .secondaryId = 8, + .secondaryId = ITEM_TROPIC_MAIL - FIRST_MAIL_INDEX, }, [ITEM_DREAM_MAIL] = @@ -1694,9 +1585,9 @@ const struct Item gItems[] = .price = 50, .description = sDreamMailDesc, .pocket = POCKET_ITEMS, - .type = 0, + .type = ITEM_USE_MAIL, .fieldUseFunc = ItemUseOutOfBattle_Mail, - .secondaryId = 9, + .secondaryId = ITEM_DREAM_MAIL - FIRST_MAIL_INDEX, }, [ITEM_FAB_MAIL] = @@ -1706,9 +1597,9 @@ const struct Item gItems[] = .price = 50, .description = sFabMailDesc, .pocket = POCKET_ITEMS, - .type = 0, + .type = ITEM_USE_MAIL, .fieldUseFunc = ItemUseOutOfBattle_Mail, - .secondaryId = 10, + .secondaryId = ITEM_FAB_MAIL - FIRST_MAIL_INDEX, }, [ITEM_RETRO_MAIL] = @@ -1718,9 +1609,9 @@ const struct Item gItems[] = .price = 0, .description = sRetroMailDesc, .pocket = POCKET_ITEMS, - .type = 0, + .type = ITEM_USE_MAIL, .fieldUseFunc = ItemUseOutOfBattle_Mail, - .secondaryId = 11, + .secondaryId = ITEM_RETRO_MAIL - FIRST_MAIL_INDEX, }, // Berries @@ -1733,11 +1624,10 @@ const struct Item gItems[] = .holdEffect = HOLD_EFFECT_CURE_PAR, .description = sCheriBerryDesc, .pocket = POCKET_BERRIES, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_Medicine, - .battleUsage = 1, + .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_Medicine, - .secondaryId = 0, }, [ITEM_CHESTO_BERRY] = @@ -1748,11 +1638,10 @@ const struct Item gItems[] = .holdEffect = HOLD_EFFECT_CURE_SLP, .description = sChestoBerryDesc, .pocket = POCKET_BERRIES, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_Medicine, - .battleUsage = 1, + .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_Medicine, - .secondaryId = 0, }, [ITEM_PECHA_BERRY] = @@ -1763,11 +1652,10 @@ const struct Item gItems[] = .holdEffect = HOLD_EFFECT_CURE_PSN, .description = sPechaBerryDesc, .pocket = POCKET_BERRIES, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_Medicine, - .battleUsage = 1, + .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_Medicine, - .secondaryId = 0, }, [ITEM_RAWST_BERRY] = @@ -1778,11 +1666,10 @@ const struct Item gItems[] = .holdEffect = HOLD_EFFECT_CURE_BRN, .description = sRawstBerryDesc, .pocket = POCKET_BERRIES, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_Medicine, - .battleUsage = 1, + .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_Medicine, - .secondaryId = 0, }, [ITEM_ASPEAR_BERRY] = @@ -1793,11 +1680,10 @@ const struct Item gItems[] = .holdEffect = HOLD_EFFECT_CURE_FRZ, .description = sAspearBerryDesc, .pocket = POCKET_BERRIES, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_Medicine, - .battleUsage = 1, + .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_Medicine, - .secondaryId = 0, }, [ITEM_LEPPA_BERRY] = @@ -1809,11 +1695,10 @@ const struct Item gItems[] = .holdEffectParam = 10, .description = sLeppaBerryDesc, .pocket = POCKET_BERRIES, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_PPRecovery, - .battleUsage = 1, + .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_PPRecovery, - .secondaryId = 0, }, [ITEM_ORAN_BERRY] = @@ -1825,11 +1710,10 @@ const struct Item gItems[] = .holdEffectParam = 10, .description = sOranBerryDesc, .pocket = POCKET_BERRIES, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_Medicine, - .battleUsage = 1, + .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_Medicine, - .secondaryId = 0, }, [ITEM_PERSIM_BERRY] = @@ -1840,11 +1724,10 @@ const struct Item gItems[] = .holdEffect = HOLD_EFFECT_CURE_CONFUSION, .description = sPersimBerryDesc, .pocket = POCKET_BERRIES, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 1, + .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_Medicine, - .secondaryId = 0, }, [ITEM_LUM_BERRY] = @@ -1855,11 +1738,10 @@ const struct Item gItems[] = .holdEffect = HOLD_EFFECT_CURE_STATUS, .description = sLumBerryDesc, .pocket = POCKET_BERRIES, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_Medicine, - .battleUsage = 1, + .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_Medicine, - .secondaryId = 0, }, [ITEM_SITRUS_BERRY] = @@ -1871,11 +1753,10 @@ const struct Item gItems[] = .holdEffectParam = 30, .description = sSitrusBerryDesc, .pocket = POCKET_BERRIES, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_Medicine, - .battleUsage = 1, + .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_Medicine, - .secondaryId = 0, }, [ITEM_FIGY_BERRY] = @@ -1887,9 +1768,8 @@ const struct Item gItems[] = .holdEffectParam = 8, .description = sFigyBerryDesc, .pocket = POCKET_BERRIES, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_WIKI_BERRY] = @@ -1901,9 +1781,8 @@ const struct Item gItems[] = .holdEffectParam = 8, .description = sWikiBerryDesc, .pocket = POCKET_BERRIES, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_MAGO_BERRY] = @@ -1915,9 +1794,8 @@ const struct Item gItems[] = .holdEffectParam = 8, .description = sMagoBerryDesc, .pocket = POCKET_BERRIES, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_AGUAV_BERRY] = @@ -1929,9 +1807,8 @@ const struct Item gItems[] = .holdEffectParam = 8, .description = sAguavBerryDesc, .pocket = POCKET_BERRIES, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_IAPAPA_BERRY] = @@ -1943,9 +1820,8 @@ const struct Item gItems[] = .holdEffectParam = 8, .description = sIapapaBerryDesc, .pocket = POCKET_BERRIES, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_RAZZ_BERRY] = @@ -1955,9 +1831,8 @@ const struct Item gItems[] = .price = 20, .description = sRazzBerryDesc, .pocket = POCKET_BERRIES, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_BLUK_BERRY] = @@ -1967,9 +1842,8 @@ const struct Item gItems[] = .price = 20, .description = sBlukBerryDesc, .pocket = POCKET_BERRIES, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_NANAB_BERRY] = @@ -1979,9 +1853,8 @@ const struct Item gItems[] = .price = 20, .description = sNanabBerryDesc, .pocket = POCKET_BERRIES, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_WEPEAR_BERRY] = @@ -1991,9 +1864,8 @@ const struct Item gItems[] = .price = 20, .description = sWepearBerryDesc, .pocket = POCKET_BERRIES, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_PINAP_BERRY] = @@ -2003,9 +1875,8 @@ const struct Item gItems[] = .price = 20, .description = sPinapBerryDesc, .pocket = POCKET_BERRIES, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_POMEG_BERRY] = @@ -2015,9 +1886,8 @@ const struct Item gItems[] = .price = 20, .description = sPomegBerryDesc, .pocket = POCKET_BERRIES, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_ReduceEV, - .secondaryId = 0, }, [ITEM_KELPSY_BERRY] = @@ -2027,9 +1897,8 @@ const struct Item gItems[] = .price = 20, .description = sKelpsyBerryDesc, .pocket = POCKET_BERRIES, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_ReduceEV, - .secondaryId = 0, }, [ITEM_QUALOT_BERRY] = @@ -2039,9 +1908,8 @@ const struct Item gItems[] = .price = 20, .description = sQualotBerryDesc, .pocket = POCKET_BERRIES, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_ReduceEV, - .secondaryId = 0, }, [ITEM_HONDEW_BERRY] = @@ -2051,9 +1919,8 @@ const struct Item gItems[] = .price = 20, .description = sHondewBerryDesc, .pocket = POCKET_BERRIES, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_ReduceEV, - .secondaryId = 0, }, [ITEM_GREPA_BERRY] = @@ -2063,9 +1930,8 @@ const struct Item gItems[] = .price = 20, .description = sGrepaBerryDesc, .pocket = POCKET_BERRIES, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_ReduceEV, - .secondaryId = 0, }, [ITEM_TAMATO_BERRY] = @@ -2075,9 +1941,8 @@ const struct Item gItems[] = .price = 20, .description = sTamatoBerryDesc, .pocket = POCKET_BERRIES, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_ReduceEV, - .secondaryId = 0, }, [ITEM_CORNN_BERRY] = @@ -2087,9 +1952,8 @@ const struct Item gItems[] = .price = 20, .description = sCornnBerryDesc, .pocket = POCKET_BERRIES, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_MAGOST_BERRY] = @@ -2099,9 +1963,8 @@ const struct Item gItems[] = .price = 20, .description = sMagostBerryDesc, .pocket = POCKET_BERRIES, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_RABUTA_BERRY] = @@ -2111,9 +1974,8 @@ const struct Item gItems[] = .price = 20, .description = sRabutaBerryDesc, .pocket = POCKET_BERRIES, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_NOMEL_BERRY] = @@ -2123,9 +1985,8 @@ const struct Item gItems[] = .price = 20, .description = sNomelBerryDesc, .pocket = POCKET_BERRIES, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_SPELON_BERRY] = @@ -2135,9 +1996,8 @@ const struct Item gItems[] = .price = 20, .description = sSpelonBerryDesc, .pocket = POCKET_BERRIES, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_PAMTRE_BERRY] = @@ -2147,9 +2007,8 @@ const struct Item gItems[] = .price = 20, .description = sPamtreBerryDesc, .pocket = POCKET_BERRIES, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_WATMEL_BERRY] = @@ -2159,9 +2018,8 @@ const struct Item gItems[] = .price = 20, .description = sWatmelBerryDesc, .pocket = POCKET_BERRIES, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_DURIN_BERRY] = @@ -2171,9 +2029,8 @@ const struct Item gItems[] = .price = 20, .description = sDurinBerryDesc, .pocket = POCKET_BERRIES, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_BELUE_BERRY] = @@ -2183,9 +2040,8 @@ const struct Item gItems[] = .price = 20, .description = sBelueBerryDesc, .pocket = POCKET_BERRIES, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_LIECHI_BERRY] = @@ -2197,9 +2053,8 @@ const struct Item gItems[] = .holdEffectParam = 4, .description = sLiechiBerryDesc, .pocket = POCKET_BERRIES, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_GANLON_BERRY] = @@ -2211,9 +2066,8 @@ const struct Item gItems[] = .holdEffectParam = 4, .description = sGanlonBerryDesc, .pocket = POCKET_BERRIES, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_SALAC_BERRY] = @@ -2225,9 +2079,8 @@ const struct Item gItems[] = .holdEffectParam = 4, .description = sSalacBerryDesc, .pocket = POCKET_BERRIES, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_PETAYA_BERRY] = @@ -2239,9 +2092,8 @@ const struct Item gItems[] = .holdEffectParam = 4, .description = sPetayaBerryDesc, .pocket = POCKET_BERRIES, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_APICOT_BERRY] = @@ -2253,9 +2105,8 @@ const struct Item gItems[] = .holdEffectParam = 4, .description = sApicotBerryDesc, .pocket = POCKET_BERRIES, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_LANSAT_BERRY] = @@ -2267,9 +2118,8 @@ const struct Item gItems[] = .holdEffectParam = 4, .description = sLansatBerryDesc, .pocket = POCKET_BERRIES, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_STARF_BERRY] = @@ -2281,9 +2131,8 @@ const struct Item gItems[] = .holdEffectParam = 4, .description = sStarfBerryDesc, .pocket = POCKET_BERRIES, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_ENIGMA_BERRY] = @@ -2293,11 +2142,10 @@ const struct Item gItems[] = .price = 20, .description = sEnigmaBerryDesc, .pocket = POCKET_BERRIES, - .type = 4, + .type = ITEM_USE_BAG_MENU, // Type handled by ItemUseOutOfBattle_EnigmaBerry .fieldUseFunc = ItemUseOutOfBattle_EnigmaBerry, - .battleUsage = 1, + .battleUsage = ITEM_B_USE_MEDICINE, .battleUseFunc = ItemUseInBattle_EnigmaBerry, - .secondaryId = 0, }, [ITEM_0B0] = @@ -2307,9 +2155,8 @@ const struct Item gItems[] = .price = 0, .description = sDummyDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_0B1] = @@ -2319,9 +2166,8 @@ const struct Item gItems[] = .price = 0, .description = sDummyDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_0B2] = @@ -2331,9 +2177,8 @@ const struct Item gItems[] = .price = 0, .description = sDummyDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, // Hold items @@ -2347,9 +2192,8 @@ const struct Item gItems[] = .holdEffectParam = 10, .description = sBrightPowderDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_WHITE_HERB] = @@ -2360,9 +2204,8 @@ const struct Item gItems[] = .holdEffect = HOLD_EFFECT_RESTORE_STATS, .description = sWhiteHerbDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_MACHO_BRACE] = @@ -2373,9 +2216,8 @@ const struct Item gItems[] = .holdEffect = HOLD_EFFECT_MACHO_BRACE, .description = sMachoBraceDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_EXP_SHARE] = @@ -2386,9 +2228,8 @@ const struct Item gItems[] = .holdEffect = HOLD_EFFECT_EXP_SHARE, .description = sExpShareDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_QUICK_CLAW] = @@ -2400,9 +2241,8 @@ const struct Item gItems[] = .holdEffectParam = 20, .description = sQuickClawDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_SOOTHE_BELL] = @@ -2413,9 +2253,8 @@ const struct Item gItems[] = .holdEffect = HOLD_EFFECT_HAPPINESS_UP, .description = sSootheBellDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_MENTAL_HERB] = @@ -2426,9 +2265,8 @@ const struct Item gItems[] = .holdEffect = HOLD_EFFECT_CURE_ATTRACT, .description = sMentalHerbDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_CHOICE_BAND] = @@ -2439,9 +2277,8 @@ const struct Item gItems[] = .holdEffect = HOLD_EFFECT_CHOICE_BAND, .description = sChoiceBandDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_KINGS_ROCK] = @@ -2453,9 +2290,8 @@ const struct Item gItems[] = .holdEffectParam = 10, .description = sKingsRockDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_SILVER_POWDER] = @@ -2467,9 +2303,8 @@ const struct Item gItems[] = .holdEffectParam = 10, .description = sSilverPowderDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_AMULET_COIN] = @@ -2481,9 +2316,8 @@ const struct Item gItems[] = .holdEffectParam = 10, .description = sAmuletCoinDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_CLEANSE_TAG] = @@ -2494,9 +2328,8 @@ const struct Item gItems[] = .holdEffect = HOLD_EFFECT_REPEL, .description = sCleanseTagDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_SOUL_DEW] = @@ -2507,9 +2340,8 @@ const struct Item gItems[] = .holdEffect = HOLD_EFFECT_SOUL_DEW, .description = sSoulDewDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_DEEP_SEA_TOOTH] = @@ -2520,9 +2352,8 @@ const struct Item gItems[] = .holdEffect = HOLD_EFFECT_DEEP_SEA_TOOTH, .description = sDeepSeaToothDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_DEEP_SEA_SCALE] = @@ -2533,9 +2364,8 @@ const struct Item gItems[] = .holdEffect = HOLD_EFFECT_DEEP_SEA_SCALE, .description = sDeepSeaScaleDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_SMOKE_BALL] = @@ -2546,9 +2376,8 @@ const struct Item gItems[] = .holdEffect = HOLD_EFFECT_CAN_ALWAYS_RUN, .description = sSmokeBallDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_EVERSTONE] = @@ -2559,9 +2388,8 @@ const struct Item gItems[] = .holdEffect = HOLD_EFFECT_PREVENT_EVOLVE, .description = sEverstoneDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_FOCUS_BAND] = @@ -2573,9 +2401,8 @@ const struct Item gItems[] = .holdEffectParam = 10, .description = sFocusBandDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_LUCKY_EGG] = @@ -2586,9 +2413,8 @@ const struct Item gItems[] = .holdEffect = HOLD_EFFECT_LUCKY_EGG, .description = sLuckyEggDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_SCOPE_LENS] = @@ -2599,9 +2425,8 @@ const struct Item gItems[] = .holdEffect = HOLD_EFFECT_SCOPE_LENS, .description = sScopeLensDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_METAL_COAT] = @@ -2613,9 +2438,8 @@ const struct Item gItems[] = .holdEffectParam = 10, .description = sMetalCoatDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_LEFTOVERS] = @@ -2627,9 +2451,8 @@ const struct Item gItems[] = .holdEffectParam = 10, .description = sLeftoversDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_DRAGON_SCALE] = @@ -2641,9 +2464,8 @@ const struct Item gItems[] = .holdEffectParam = 10, .description = sDragonScaleDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_LIGHT_BALL] = @@ -2654,9 +2476,8 @@ const struct Item gItems[] = .holdEffect = HOLD_EFFECT_LIGHT_BALL, .description = sLightBallDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_SOFT_SAND] = @@ -2668,9 +2489,8 @@ const struct Item gItems[] = .holdEffectParam = 10, .description = sSoftSandDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_HARD_STONE] = @@ -2682,9 +2502,8 @@ const struct Item gItems[] = .holdEffectParam = 10, .description = sHardStoneDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_MIRACLE_SEED] = @@ -2696,9 +2515,8 @@ const struct Item gItems[] = .holdEffectParam = 10, .description = sMiracleSeedDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_BLACK_GLASSES] = @@ -2710,9 +2528,8 @@ const struct Item gItems[] = .holdEffectParam = 10, .description = sBlackGlassesDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_BLACK_BELT] = @@ -2724,9 +2541,8 @@ const struct Item gItems[] = .holdEffectParam = 10, .description = sBlackBeltDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_MAGNET] = @@ -2738,9 +2554,8 @@ const struct Item gItems[] = .holdEffectParam = 10, .description = sMagnetDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_MYSTIC_WATER] = @@ -2752,9 +2567,8 @@ const struct Item gItems[] = .holdEffectParam = 10, .description = sMysticWaterDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_SHARP_BEAK] = @@ -2766,9 +2580,8 @@ const struct Item gItems[] = .holdEffectParam = 10, .description = sSharpBeakDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_POISON_BARB] = @@ -2780,9 +2593,8 @@ const struct Item gItems[] = .holdEffectParam = 10, .description = sPoisonBarbDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_NEVER_MELT_ICE] = @@ -2794,9 +2606,8 @@ const struct Item gItems[] = .holdEffectParam = 10, .description = sNeverMeltIceDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_SPELL_TAG] = @@ -2808,9 +2619,8 @@ const struct Item gItems[] = .holdEffectParam = 10, .description = sSpellTagDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_TWISTED_SPOON] = @@ -2822,9 +2632,8 @@ const struct Item gItems[] = .holdEffectParam = 10, .description = sTwistedSpoonDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_CHARCOAL] = @@ -2836,9 +2645,8 @@ const struct Item gItems[] = .holdEffectParam = 10, .description = sCharcoalDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_DRAGON_FANG] = @@ -2850,9 +2658,8 @@ const struct Item gItems[] = .holdEffectParam = 10, .description = sDragonFangDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_SILK_SCARF] = @@ -2864,9 +2671,8 @@ const struct Item gItems[] = .holdEffectParam = 10, .description = sSilkScarfDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_UP_GRADE] = @@ -2877,9 +2683,8 @@ const struct Item gItems[] = .holdEffect = HOLD_EFFECT_UP_GRADE, .description = sUpGradeDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_SHELL_BELL] = @@ -2891,9 +2696,8 @@ const struct Item gItems[] = .holdEffectParam = 8, .description = sShellBellDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_SEA_INCENSE] = @@ -2905,9 +2709,8 @@ const struct Item gItems[] = .holdEffectParam = 5, .description = sSeaIncenseDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_LAX_INCENSE] = @@ -2919,9 +2722,8 @@ const struct Item gItems[] = .holdEffectParam = 5, .description = sLaxIncenseDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_LUCKY_PUNCH] = @@ -2932,9 +2734,8 @@ const struct Item gItems[] = .holdEffect = HOLD_EFFECT_LUCKY_PUNCH, .description = sLuckyPunchDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_METAL_POWDER] = @@ -2945,9 +2746,8 @@ const struct Item gItems[] = .holdEffect = HOLD_EFFECT_METAL_POWDER, .description = sMetalPowderDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_THICK_CLUB] = @@ -2958,9 +2758,8 @@ const struct Item gItems[] = .holdEffect = HOLD_EFFECT_THICK_CLUB, .description = sThickClubDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_STICK] = @@ -2971,9 +2770,8 @@ const struct Item gItems[] = .holdEffect = HOLD_EFFECT_STICK, .description = sStickDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_0E2] = @@ -2983,9 +2781,8 @@ const struct Item gItems[] = .price = 0, .description = sDummyDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_0E3] = @@ -2995,9 +2792,8 @@ const struct Item gItems[] = .price = 0, .description = sDummyDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_0E4] = @@ -3007,9 +2803,8 @@ const struct Item gItems[] = .price = 0, .description = sDummyDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_0E5] = @@ -3019,9 +2814,8 @@ const struct Item gItems[] = .price = 0, .description = sDummyDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_0E6] = @@ -3031,9 +2825,8 @@ const struct Item gItems[] = .price = 0, .description = sDummyDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_0E7] = @@ -3043,9 +2836,8 @@ const struct Item gItems[] = .price = 0, .description = sDummyDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_0E8] = @@ -3055,9 +2847,8 @@ const struct Item gItems[] = .price = 0, .description = sDummyDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_0E9] = @@ -3067,9 +2858,8 @@ const struct Item gItems[] = .price = 0, .description = sDummyDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_0EA] = @@ -3079,9 +2869,8 @@ const struct Item gItems[] = .price = 0, .description = sDummyDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_0EB] = @@ -3091,9 +2880,8 @@ const struct Item gItems[] = .price = 0, .description = sDummyDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_0EC] = @@ -3103,9 +2891,8 @@ const struct Item gItems[] = .price = 0, .description = sDummyDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_0ED] = @@ -3115,9 +2902,8 @@ const struct Item gItems[] = .price = 0, .description = sDummyDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_0EE] = @@ -3127,9 +2913,8 @@ const struct Item gItems[] = .price = 0, .description = sDummyDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_0EF] = @@ -3139,9 +2924,8 @@ const struct Item gItems[] = .price = 0, .description = sDummyDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_0F0] = @@ -3151,9 +2935,8 @@ const struct Item gItems[] = .price = 0, .description = sDummyDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_0F1] = @@ -3163,9 +2946,8 @@ const struct Item gItems[] = .price = 0, .description = sDummyDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_0F2] = @@ -3175,9 +2957,8 @@ const struct Item gItems[] = .price = 0, .description = sDummyDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_0F3] = @@ -3187,9 +2968,8 @@ const struct Item gItems[] = .price = 0, .description = sDummyDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_0F4] = @@ -3199,9 +2979,8 @@ const struct Item gItems[] = .price = 0, .description = sDummyDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_0F5] = @@ -3211,9 +2990,8 @@ const struct Item gItems[] = .price = 0, .description = sDummyDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_0F6] = @@ -3223,9 +3001,8 @@ const struct Item gItems[] = .price = 0, .description = sDummyDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_0F7] = @@ -3235,9 +3012,8 @@ const struct Item gItems[] = .price = 0, .description = sDummyDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_0F8] = @@ -3247,9 +3023,8 @@ const struct Item gItems[] = .price = 0, .description = sDummyDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_0F9] = @@ -3259,9 +3034,8 @@ const struct Item gItems[] = .price = 0, .description = sDummyDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_0FA] = @@ -3271,9 +3045,8 @@ const struct Item gItems[] = .price = 0, .description = sDummyDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_0FB] = @@ -3283,9 +3056,8 @@ const struct Item gItems[] = .price = 0, .description = sDummyDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_0FC] = @@ -3295,9 +3067,8 @@ const struct Item gItems[] = .price = 0, .description = sDummyDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_0FD] = @@ -3307,9 +3078,8 @@ const struct Item gItems[] = .price = 0, .description = sDummyDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_RED_SCARF] = @@ -3319,9 +3089,8 @@ const struct Item gItems[] = .price = 100, .description = sRedScarfDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_BLUE_SCARF] = @@ -3331,9 +3100,8 @@ const struct Item gItems[] = .price = 100, .description = sBlueScarfDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_PINK_SCARF] = @@ -3343,9 +3111,8 @@ const struct Item gItems[] = .price = 100, .description = sPinkScarfDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_GREEN_SCARF] = @@ -3355,9 +3122,8 @@ const struct Item gItems[] = .price = 100, .description = sGreenScarfDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_YELLOW_SCARF] = @@ -3367,9 +3133,8 @@ const struct Item gItems[] = .price = 100, .description = sYellowScarfDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, // Key items @@ -3383,9 +3148,9 @@ const struct Item gItems[] = .importance = 1, .unk19 = 1, .pocket = POCKET_KEY_ITEMS, - .type = 2, + .type = ITEM_USE_FIELD, .fieldUseFunc = ItemUseOutOfBattle_Bike, - .secondaryId = 0, + .secondaryId = MACH_BIKE, }, [ITEM_COIN_CASE] = @@ -3396,9 +3161,8 @@ const struct Item gItems[] = .description = sCoinCaseDesc, .importance = 1, .pocket = POCKET_KEY_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CoinCase, - .secondaryId = 0, }, [ITEM_ITEMFINDER] = @@ -3410,9 +3174,8 @@ const struct Item gItems[] = .importance = 1, .unk19 = 1, .pocket = POCKET_KEY_ITEMS, - .type = 2, + .type = ITEM_USE_FIELD, .fieldUseFunc = ItemUseOutOfBattle_Itemfinder, - .secondaryId = 0, }, [ITEM_OLD_ROD] = @@ -3424,7 +3187,7 @@ const struct Item gItems[] = .importance = 1, .unk19 = 1, .pocket = POCKET_KEY_ITEMS, - .type = 2, + .type = ITEM_USE_FIELD, .fieldUseFunc = ItemUseOutOfBattle_Rod, .secondaryId = OLD_ROD, }, @@ -3438,7 +3201,7 @@ const struct Item gItems[] = .importance = 1, .unk19 = 1, .pocket = POCKET_KEY_ITEMS, - .type = 2, + .type = ITEM_USE_FIELD, .fieldUseFunc = ItemUseOutOfBattle_Rod, .secondaryId = GOOD_ROD, }, @@ -3452,7 +3215,7 @@ const struct Item gItems[] = .importance = 1, .unk19 = 1, .pocket = POCKET_KEY_ITEMS, - .type = 2, + .type = ITEM_USE_FIELD, .fieldUseFunc = ItemUseOutOfBattle_Rod, .secondaryId = SUPER_ROD, }, @@ -3465,9 +3228,8 @@ const struct Item gItems[] = .description = sSSTicketDesc, .importance = 1, .pocket = POCKET_KEY_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_CONTEST_PASS] = @@ -3478,9 +3240,8 @@ const struct Item gItems[] = .description = sContestPassDesc, .importance = 1, .pocket = POCKET_KEY_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_10B] = @@ -3490,9 +3251,8 @@ const struct Item gItems[] = .price = 0, .description = sDummyDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_WAILMER_PAIL] = @@ -3503,9 +3263,8 @@ const struct Item gItems[] = .description = sWailmerPailDesc, .importance = 1, .pocket = POCKET_KEY_ITEMS, - .type = 2, + .type = ITEM_USE_FIELD, .fieldUseFunc = ItemUseOutOfBattle_WailmerPail, - .secondaryId = 0, }, [ITEM_DEVON_GOODS] = @@ -3516,9 +3275,8 @@ const struct Item gItems[] = .description = sDevonGoodsDesc, .importance = 2, .pocket = POCKET_KEY_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_SOOT_SACK] = @@ -3529,9 +3287,8 @@ const struct Item gItems[] = .description = sSootSackDesc, .importance = 1, .pocket = POCKET_KEY_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_BASEMENT_KEY] = @@ -3542,9 +3299,8 @@ const struct Item gItems[] = .description = sBasementKeyDesc, .importance = 1, .pocket = POCKET_KEY_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_ACRO_BIKE] = @@ -3556,9 +3312,9 @@ const struct Item gItems[] = .importance = 1, .unk19 = 1, .pocket = POCKET_KEY_ITEMS, - .type = 2, + .type = ITEM_USE_FIELD, .fieldUseFunc = ItemUseOutOfBattle_Bike, - .secondaryId = 1, + .secondaryId = ACRO_BIKE, }, [ITEM_POKEBLOCK_CASE] = @@ -3570,9 +3326,8 @@ const struct Item gItems[] = .importance = 1, .unk19 = 1, .pocket = POCKET_KEY_ITEMS, - .type = 3, + .type = ITEM_USE_PBLOCK_CASE, .fieldUseFunc = ItemUseOutOfBattle_PokeblockCase, - .secondaryId = 0, }, [ITEM_LETTER] = @@ -3583,9 +3338,8 @@ const struct Item gItems[] = .description = sLetterDesc, .importance = 2, .pocket = POCKET_KEY_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_EON_TICKET] = @@ -3596,7 +3350,7 @@ const struct Item gItems[] = .description = sEonTicketDesc, .importance = 1, .pocket = POCKET_KEY_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = 1, }, @@ -3609,9 +3363,8 @@ const struct Item gItems[] = .description = sRedOrbDesc, .importance = 2, .pocket = POCKET_KEY_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_BLUE_ORB] = @@ -3622,9 +3375,8 @@ const struct Item gItems[] = .description = sBlueOrbDesc, .importance = 2, .pocket = POCKET_KEY_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_SCANNER] = @@ -3635,9 +3387,8 @@ const struct Item gItems[] = .description = sScannerDesc, .importance = 1, .pocket = POCKET_KEY_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_GO_GOGGLES] = @@ -3648,9 +3399,8 @@ const struct Item gItems[] = .description = sGoGogglesDesc, .importance = 1, .pocket = POCKET_KEY_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_METEORITE] = @@ -3661,9 +3411,8 @@ const struct Item gItems[] = .description = sMeteoriteDesc, .importance = 1, .pocket = POCKET_KEY_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_ROOM_1_KEY] = @@ -3674,9 +3423,8 @@ const struct Item gItems[] = .description = sRoom1KeyDesc, .importance = 1, .pocket = POCKET_KEY_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_ROOM_2_KEY] = @@ -3687,9 +3435,8 @@ const struct Item gItems[] = .description = sRoom2KeyDesc, .importance = 1, .pocket = POCKET_KEY_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_ROOM_4_KEY] = @@ -3700,9 +3447,8 @@ const struct Item gItems[] = .description = sRoom4KeyDesc, .importance = 1, .pocket = POCKET_KEY_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_ROOM_6_KEY] = @@ -3713,9 +3459,8 @@ const struct Item gItems[] = .description = sRoom6KeyDesc, .importance = 1, .pocket = POCKET_KEY_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_STORAGE_KEY] = @@ -3726,9 +3471,8 @@ const struct Item gItems[] = .description = sStorageKeyDesc, .importance = 1, .pocket = POCKET_KEY_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_ROOT_FOSSIL] = @@ -3739,9 +3483,8 @@ const struct Item gItems[] = .description = sRootFossilDesc, .importance = 1, .pocket = POCKET_KEY_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_CLAW_FOSSIL] = @@ -3752,9 +3495,8 @@ const struct Item gItems[] = .description = sClawFossilDesc, .importance = 1, .pocket = POCKET_KEY_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_DEVON_SCOPE] = @@ -3765,9 +3507,8 @@ const struct Item gItems[] = .description = sDevonScopeDesc, .importance = 1, .pocket = POCKET_KEY_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, // TMs/HMs @@ -3779,9 +3520,8 @@ const struct Item gItems[] = .price = 3000, .description = sTM01Desc, .pocket = POCKET_TM_HM, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .secondaryId = 0, }, [ITEM_TM02_DRAGON_CLAW] = @@ -3791,9 +3531,8 @@ const struct Item gItems[] = .price = 3000, .description = sTM02Desc, .pocket = POCKET_TM_HM, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .secondaryId = 0, }, [ITEM_TM03_WATER_PULSE] = @@ -3803,9 +3542,8 @@ const struct Item gItems[] = .price = 3000, .description = sTM03Desc, .pocket = POCKET_TM_HM, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .secondaryId = 0, }, [ITEM_TM04_CALM_MIND] = @@ -3815,9 +3553,8 @@ const struct Item gItems[] = .price = 3000, .description = sTM04Desc, .pocket = POCKET_TM_HM, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .secondaryId = 0, }, [ITEM_TM05_ROAR] = @@ -3827,9 +3564,8 @@ const struct Item gItems[] = .price = 1000, .description = sTM05Desc, .pocket = POCKET_TM_HM, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .secondaryId = 0, }, [ITEM_TM06_TOXIC] = @@ -3839,9 +3575,8 @@ const struct Item gItems[] = .price = 3000, .description = sTM06Desc, .pocket = POCKET_TM_HM, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .secondaryId = 0, }, [ITEM_TM07_HAIL] = @@ -3851,9 +3586,8 @@ const struct Item gItems[] = .price = 3000, .description = sTM07Desc, .pocket = POCKET_TM_HM, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .secondaryId = 0, }, [ITEM_TM08_BULK_UP] = @@ -3863,9 +3597,8 @@ const struct Item gItems[] = .price = 3000, .description = sTM08Desc, .pocket = POCKET_TM_HM, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .secondaryId = 0, }, [ITEM_TM09_BULLET_SEED] = @@ -3875,9 +3608,8 @@ const struct Item gItems[] = .price = 3000, .description = sTM09Desc, .pocket = POCKET_TM_HM, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .secondaryId = 0, }, [ITEM_TM10_HIDDEN_POWER] = @@ -3887,9 +3619,8 @@ const struct Item gItems[] = .price = 3000, .description = sTM10Desc, .pocket = POCKET_TM_HM, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .secondaryId = 0, }, [ITEM_TM11_SUNNY_DAY] = @@ -3899,9 +3630,8 @@ const struct Item gItems[] = .price = 2000, .description = sTM11Desc, .pocket = POCKET_TM_HM, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .secondaryId = 0, }, [ITEM_TM12_TAUNT] = @@ -3911,9 +3641,8 @@ const struct Item gItems[] = .price = 3000, .description = sTM12Desc, .pocket = POCKET_TM_HM, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .secondaryId = 0, }, [ITEM_TM13_ICE_BEAM] = @@ -3923,9 +3652,8 @@ const struct Item gItems[] = .price = 3000, .description = sTM13Desc, .pocket = POCKET_TM_HM, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .secondaryId = 0, }, [ITEM_TM14_BLIZZARD] = @@ -3935,9 +3663,8 @@ const struct Item gItems[] = .price = 5500, .description = sTM14Desc, .pocket = POCKET_TM_HM, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .secondaryId = 0, }, [ITEM_TM15_HYPER_BEAM] = @@ -3947,9 +3674,8 @@ const struct Item gItems[] = .price = 7500, .description = sTM15Desc, .pocket = POCKET_TM_HM, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .secondaryId = 0, }, [ITEM_TM16_LIGHT_SCREEN] = @@ -3959,9 +3685,8 @@ const struct Item gItems[] = .price = 3000, .description = sTM16Desc, .pocket = POCKET_TM_HM, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .secondaryId = 0, }, [ITEM_TM17_PROTECT] = @@ -3971,9 +3696,8 @@ const struct Item gItems[] = .price = 3000, .description = sTM17Desc, .pocket = POCKET_TM_HM, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .secondaryId = 0, }, [ITEM_TM18_RAIN_DANCE] = @@ -3983,9 +3707,8 @@ const struct Item gItems[] = .price = 2000, .description = sTM18Desc, .pocket = POCKET_TM_HM, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .secondaryId = 0, }, [ITEM_TM19_GIGA_DRAIN] = @@ -3995,9 +3718,8 @@ const struct Item gItems[] = .price = 3000, .description = sTM19Desc, .pocket = POCKET_TM_HM, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .secondaryId = 0, }, [ITEM_TM20_SAFEGUARD] = @@ -4007,9 +3729,8 @@ const struct Item gItems[] = .price = 3000, .description = sTM20Desc, .pocket = POCKET_TM_HM, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .secondaryId = 0, }, [ITEM_TM21_FRUSTRATION] = @@ -4019,9 +3740,8 @@ const struct Item gItems[] = .price = 1000, .description = sTM21Desc, .pocket = POCKET_TM_HM, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .secondaryId = 0, }, [ITEM_TM22_SOLARBEAM] = @@ -4031,9 +3751,8 @@ const struct Item gItems[] = .price = 3000, .description = sTM22Desc, .pocket = POCKET_TM_HM, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .secondaryId = 0, }, [ITEM_TM23_IRON_TAIL] = @@ -4043,9 +3762,8 @@ const struct Item gItems[] = .price = 3000, .description = sTM23Desc, .pocket = POCKET_TM_HM, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .secondaryId = 0, }, [ITEM_TM24_THUNDERBOLT] = @@ -4055,9 +3773,8 @@ const struct Item gItems[] = .price = 3000, .description = sTM24Desc, .pocket = POCKET_TM_HM, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .secondaryId = 0, }, [ITEM_TM25_THUNDER] = @@ -4067,9 +3784,8 @@ const struct Item gItems[] = .price = 5500, .description = sTM25Desc, .pocket = POCKET_TM_HM, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .secondaryId = 0, }, [ITEM_TM26_EARTHQUAKE] = @@ -4079,9 +3795,8 @@ const struct Item gItems[] = .price = 3000, .description = sTM26Desc, .pocket = POCKET_TM_HM, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .secondaryId = 0, }, [ITEM_TM27_RETURN] = @@ -4091,9 +3806,8 @@ const struct Item gItems[] = .price = 1000, .description = sTM27Desc, .pocket = POCKET_TM_HM, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .secondaryId = 0, }, [ITEM_TM28_DIG] = @@ -4103,9 +3817,8 @@ const struct Item gItems[] = .price = 2000, .description = sTM28Desc, .pocket = POCKET_TM_HM, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .secondaryId = 0, }, [ITEM_TM29_PSYCHIC] = @@ -4115,9 +3828,8 @@ const struct Item gItems[] = .price = 2000, .description = sTM29Desc, .pocket = POCKET_TM_HM, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .secondaryId = 0, }, [ITEM_TM30_SHADOW_BALL] = @@ -4127,9 +3839,8 @@ const struct Item gItems[] = .price = 3000, .description = sTM30Desc, .pocket = POCKET_TM_HM, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .secondaryId = 0, }, [ITEM_TM31_BRICK_BREAK] = @@ -4139,9 +3850,8 @@ const struct Item gItems[] = .price = 3000, .description = sTM31Desc, .pocket = POCKET_TM_HM, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .secondaryId = 0, }, [ITEM_TM32_DOUBLE_TEAM] = @@ -4151,9 +3861,8 @@ const struct Item gItems[] = .price = 2000, .description = sTM32Desc, .pocket = POCKET_TM_HM, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .secondaryId = 0, }, [ITEM_TM33_REFLECT] = @@ -4163,9 +3872,8 @@ const struct Item gItems[] = .price = 3000, .description = sTM33Desc, .pocket = POCKET_TM_HM, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .secondaryId = 0, }, [ITEM_TM34_SHOCK_WAVE] = @@ -4175,9 +3883,8 @@ const struct Item gItems[] = .price = 3000, .description = sTM34Desc, .pocket = POCKET_TM_HM, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .secondaryId = 0, }, [ITEM_TM35_FLAMETHROWER] = @@ -4187,9 +3894,8 @@ const struct Item gItems[] = .price = 3000, .description = sTM35Desc, .pocket = POCKET_TM_HM, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .secondaryId = 0, }, [ITEM_TM36_SLUDGE_BOMB] = @@ -4199,9 +3905,8 @@ const struct Item gItems[] = .price = 1000, .description = sTM36Desc, .pocket = POCKET_TM_HM, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .secondaryId = 0, }, [ITEM_TM37_SANDSTORM] = @@ -4211,9 +3916,8 @@ const struct Item gItems[] = .price = 2000, .description = sTM37Desc, .pocket = POCKET_TM_HM, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .secondaryId = 0, }, [ITEM_TM38_FIRE_BLAST] = @@ -4223,9 +3927,8 @@ const struct Item gItems[] = .price = 5500, .description = sTM38Desc, .pocket = POCKET_TM_HM, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .secondaryId = 0, }, [ITEM_TM39_ROCK_TOMB] = @@ -4235,9 +3938,8 @@ const struct Item gItems[] = .price = 3000, .description = sTM39Desc, .pocket = POCKET_TM_HM, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .secondaryId = 0, }, [ITEM_TM40_AERIAL_ACE] = @@ -4247,9 +3949,8 @@ const struct Item gItems[] = .price = 3000, .description = sTM40Desc, .pocket = POCKET_TM_HM, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .secondaryId = 0, }, [ITEM_TM41_TORMENT] = @@ -4259,9 +3960,8 @@ const struct Item gItems[] = .price = 3000, .description = sTM41Desc, .pocket = POCKET_TM_HM, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .secondaryId = 0, }, [ITEM_TM42_FACADE] = @@ -4271,9 +3971,8 @@ const struct Item gItems[] = .price = 3000, .description = sTM42Desc, .pocket = POCKET_TM_HM, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .secondaryId = 0, }, [ITEM_TM43_SECRET_POWER] = @@ -4283,9 +3982,8 @@ const struct Item gItems[] = .price = 3000, .description = sTM43Desc, .pocket = POCKET_TM_HM, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .secondaryId = 0, }, [ITEM_TM44_REST] = @@ -4295,9 +3993,8 @@ const struct Item gItems[] = .price = 3000, .description = sTM44Desc, .pocket = POCKET_TM_HM, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .secondaryId = 0, }, [ITEM_TM45_ATTRACT] = @@ -4307,9 +4004,8 @@ const struct Item gItems[] = .price = 3000, .description = sTM45Desc, .pocket = POCKET_TM_HM, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .secondaryId = 0, }, [ITEM_TM46_THIEF] = @@ -4319,9 +4015,8 @@ const struct Item gItems[] = .price = 3000, .description = sTM46Desc, .pocket = POCKET_TM_HM, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .secondaryId = 0, }, [ITEM_TM47_STEEL_WING] = @@ -4331,9 +4026,8 @@ const struct Item gItems[] = .price = 3000, .description = sTM47Desc, .pocket = POCKET_TM_HM, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .secondaryId = 0, }, [ITEM_TM48_SKILL_SWAP] = @@ -4343,9 +4037,8 @@ const struct Item gItems[] = .price = 3000, .description = sTM48Desc, .pocket = POCKET_TM_HM, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .secondaryId = 0, }, [ITEM_TM49_SNATCH] = @@ -4355,9 +4048,8 @@ const struct Item gItems[] = .price = 3000, .description = sTM49Desc, .pocket = POCKET_TM_HM, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .secondaryId = 0, }, [ITEM_TM50_OVERHEAT] = @@ -4367,9 +4059,8 @@ const struct Item gItems[] = .price = 3000, .description = sTM50Desc, .pocket = POCKET_TM_HM, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .secondaryId = 0, }, [ITEM_HM01_CUT] = @@ -4380,9 +4071,8 @@ const struct Item gItems[] = .description = sHM01Desc, .importance = 1, .pocket = POCKET_TM_HM, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .secondaryId = 0, }, [ITEM_HM02_FLY] = @@ -4393,9 +4083,8 @@ const struct Item gItems[] = .description = sHM02Desc, .importance = 1, .pocket = POCKET_TM_HM, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .secondaryId = 0, }, [ITEM_HM03_SURF] = @@ -4406,9 +4095,8 @@ const struct Item gItems[] = .description = sHM03Desc, .importance = 1, .pocket = POCKET_TM_HM, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .secondaryId = 0, }, [ITEM_HM04_STRENGTH] = @@ -4419,9 +4107,8 @@ const struct Item gItems[] = .description = sHM04Desc, .importance = 1, .pocket = POCKET_TM_HM, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .secondaryId = 0, }, [ITEM_HM05_FLASH] = @@ -4432,9 +4119,8 @@ const struct Item gItems[] = .description = sHM05Desc, .importance = 1, .pocket = POCKET_TM_HM, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .secondaryId = 0, }, [ITEM_HM06_ROCK_SMASH] = @@ -4445,9 +4131,8 @@ const struct Item gItems[] = .description = sHM06Desc, .importance = 1, .pocket = POCKET_TM_HM, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .secondaryId = 0, }, [ITEM_HM07_WATERFALL] = @@ -4458,9 +4143,8 @@ const struct Item gItems[] = .description = sHM07Desc, .importance = 1, .pocket = POCKET_TM_HM, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .secondaryId = 0, }, [ITEM_HM08_DIVE] = @@ -4471,9 +4155,8 @@ const struct Item gItems[] = .description = sHM08Desc, .importance = 1, .pocket = POCKET_TM_HM, - .type = 1, + .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .secondaryId = 0, }, [ITEM_15B] = @@ -4483,9 +4166,8 @@ const struct Item gItems[] = .price = 0, .description = sDummyDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_15C] = @@ -4495,9 +4177,8 @@ const struct Item gItems[] = .price = 0, .description = sDummyDesc, .pocket = POCKET_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, // FireRed/LeafGreen key items @@ -4510,9 +4191,8 @@ const struct Item gItems[] = .description = sOaksParcelDesc, .importance = 2, .pocket = POCKET_KEY_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_POKE_FLUTE] = @@ -4523,9 +4203,8 @@ const struct Item gItems[] = .description = sPokeFluteDesc, .importance = 1, .pocket = POCKET_KEY_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_SECRET_KEY] = @@ -4536,9 +4215,8 @@ const struct Item gItems[] = .description = sSecretKeyDesc, .importance = 1, .pocket = POCKET_KEY_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_BIKE_VOUCHER] = @@ -4549,9 +4227,8 @@ const struct Item gItems[] = .description = sBikeVoucherDesc, .importance = 1, .pocket = POCKET_KEY_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_GOLD_TEETH] = @@ -4562,9 +4239,8 @@ const struct Item gItems[] = .description = sGoldTeethDesc, .importance = 1, .pocket = POCKET_KEY_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_OLD_AMBER] = @@ -4575,9 +4251,8 @@ const struct Item gItems[] = .description = sOldAmberDesc, .importance = 1, .pocket = POCKET_KEY_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_CARD_KEY] = @@ -4588,9 +4263,8 @@ const struct Item gItems[] = .description = sCardKeyDesc, .importance = 1, .pocket = POCKET_KEY_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_LIFT_KEY] = @@ -4601,9 +4275,8 @@ const struct Item gItems[] = .description = sLiftKeyDesc, .importance = 1, .pocket = POCKET_KEY_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_HELIX_FOSSIL] = @@ -4614,9 +4287,8 @@ const struct Item gItems[] = .description = sHelixFossilDesc, .importance = 1, .pocket = POCKET_KEY_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_DOME_FOSSIL] = @@ -4627,9 +4299,8 @@ const struct Item gItems[] = .description = sDomeFossilDesc, .importance = 1, .pocket = POCKET_KEY_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_SILPH_SCOPE] = @@ -4640,9 +4311,8 @@ const struct Item gItems[] = .description = sSilphScopeDesc, .importance = 1, .pocket = POCKET_KEY_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_BICYCLE] = @@ -4654,9 +4324,8 @@ const struct Item gItems[] = .importance = 1, .unk19 = 1, .pocket = POCKET_KEY_ITEMS, - .type = 2, + .type = ITEM_USE_FIELD, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_TOWN_MAP] = @@ -4668,9 +4337,8 @@ const struct Item gItems[] = .importance = 1, .unk19 = 1, .pocket = POCKET_KEY_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_VS_SEEKER] = @@ -4682,9 +4350,8 @@ const struct Item gItems[] = .importance = 1, .unk19 = 1, .pocket = POCKET_KEY_ITEMS, - .type = 2, + .type = ITEM_USE_FIELD, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_FAME_CHECKER] = @@ -4696,9 +4363,8 @@ const struct Item gItems[] = .importance = 1, .unk19 = 1, .pocket = POCKET_KEY_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_TM_CASE] = @@ -4710,9 +4376,8 @@ const struct Item gItems[] = .importance = 1, .unk19 = 1, .pocket = POCKET_KEY_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_BERRY_POUCH] = @@ -4724,9 +4389,8 @@ const struct Item gItems[] = .importance = 1, .unk19 = 1, .pocket = POCKET_KEY_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_TEACHY_TV] = @@ -4738,9 +4402,8 @@ const struct Item gItems[] = .importance = 1, .unk19 = 1, .pocket = POCKET_KEY_ITEMS, - .type = 2, + .type = ITEM_USE_FIELD, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_TRI_PASS] = @@ -4752,9 +4415,8 @@ const struct Item gItems[] = .importance = 1, .unk19 = 1, .pocket = POCKET_KEY_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_RAINBOW_PASS] = @@ -4766,9 +4428,8 @@ const struct Item gItems[] = .importance = 1, .unk19 = 1, .pocket = POCKET_KEY_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_TEA] = @@ -4780,9 +4441,8 @@ const struct Item gItems[] = .importance = 1, .unk19 = 1, .pocket = POCKET_KEY_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_MYSTIC_TICKET] = @@ -4794,9 +4454,8 @@ const struct Item gItems[] = .importance = 1, .unk19 = 1, .pocket = POCKET_KEY_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_AURORA_TICKET] = @@ -4808,9 +4467,8 @@ const struct Item gItems[] = .importance = 1, .unk19 = 1, .pocket = POCKET_KEY_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_POWDER_JAR] = @@ -4822,9 +4480,8 @@ const struct Item gItems[] = .importance = 1, .unk19 = 1, .pocket = POCKET_KEY_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_PowderJar, - .secondaryId = 0, }, [ITEM_RUBY] = @@ -4836,9 +4493,8 @@ const struct Item gItems[] = .importance = 1, .unk19 = 1, .pocket = POCKET_KEY_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_SAPPHIRE] = @@ -4850,9 +4506,8 @@ const struct Item gItems[] = .importance = 1, .unk19 = 1, .pocket = POCKET_KEY_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, // Emerald-specific key items @@ -4866,9 +4521,8 @@ const struct Item gItems[] = .importance = 1, .unk19 = 1, .pocket = POCKET_KEY_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, [ITEM_OLD_SEA_MAP] = @@ -4880,8 +4534,7 @@ const struct Item gItems[] = .importance = 1, .unk19 = 1, .pocket = POCKET_KEY_ITEMS, - .type = 4, + .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .secondaryId = 0, }, }; diff --git a/src/data/party_menu.h b/src/data/party_menu.h index ee1462c52..c36d7877b 100644 --- a/src/data/party_menu.h +++ b/src/data/party_menu.h @@ -1180,62 +1180,62 @@ static const u8 *const sUnused_StatStrings[] = static const u16 sTMHMMoves[] = { - MOVE_FOCUS_PUNCH, - MOVE_DRAGON_CLAW, - MOVE_WATER_PULSE, - MOVE_CALM_MIND, - MOVE_ROAR, - MOVE_TOXIC, - MOVE_HAIL, - MOVE_BULK_UP, - MOVE_BULLET_SEED, - MOVE_HIDDEN_POWER, - MOVE_SUNNY_DAY, - MOVE_TAUNT, - MOVE_ICE_BEAM, - MOVE_BLIZZARD, - MOVE_HYPER_BEAM, - MOVE_LIGHT_SCREEN, - MOVE_PROTECT, - MOVE_RAIN_DANCE, - MOVE_GIGA_DRAIN, - MOVE_SAFEGUARD, - MOVE_FRUSTRATION, - MOVE_SOLAR_BEAM, - MOVE_IRON_TAIL, - MOVE_THUNDERBOLT, - MOVE_THUNDER, - MOVE_EARTHQUAKE, - MOVE_RETURN, - MOVE_DIG, - MOVE_PSYCHIC, - MOVE_SHADOW_BALL, - MOVE_BRICK_BREAK, - MOVE_DOUBLE_TEAM, - MOVE_REFLECT, - MOVE_SHOCK_WAVE, - MOVE_FLAMETHROWER, - MOVE_SLUDGE_BOMB, - MOVE_SANDSTORM, - MOVE_FIRE_BLAST, - MOVE_ROCK_TOMB, - MOVE_AERIAL_ACE, - MOVE_TORMENT, - MOVE_FACADE, - MOVE_SECRET_POWER, - MOVE_REST, - MOVE_ATTRACT, - MOVE_THIEF, - MOVE_STEEL_WING, - MOVE_SKILL_SWAP, - MOVE_SNATCH, - MOVE_OVERHEAT, - MOVE_CUT, - MOVE_FLY, - MOVE_SURF, - MOVE_STRENGTH, - MOVE_FLASH, - MOVE_ROCK_SMASH, - MOVE_WATERFALL, - MOVE_DIVE, + [ITEM_TM01 - ITEM_TM01] = MOVE_FOCUS_PUNCH, + [ITEM_TM02 - ITEM_TM01] = MOVE_DRAGON_CLAW, + [ITEM_TM03 - ITEM_TM01] = MOVE_WATER_PULSE, + [ITEM_TM04 - ITEM_TM01] = MOVE_CALM_MIND, + [ITEM_TM05 - ITEM_TM01] = MOVE_ROAR, + [ITEM_TM06 - ITEM_TM01] = MOVE_TOXIC, + [ITEM_TM07 - ITEM_TM01] = MOVE_HAIL, + [ITEM_TM08 - ITEM_TM01] = MOVE_BULK_UP, + [ITEM_TM09 - ITEM_TM01] = MOVE_BULLET_SEED, + [ITEM_TM10 - ITEM_TM01] = MOVE_HIDDEN_POWER, + [ITEM_TM11 - ITEM_TM01] = MOVE_SUNNY_DAY, + [ITEM_TM12 - ITEM_TM01] = MOVE_TAUNT, + [ITEM_TM13 - ITEM_TM01] = MOVE_ICE_BEAM, + [ITEM_TM14 - ITEM_TM01] = MOVE_BLIZZARD, + [ITEM_TM15 - ITEM_TM01] = MOVE_HYPER_BEAM, + [ITEM_TM16 - ITEM_TM01] = MOVE_LIGHT_SCREEN, + [ITEM_TM17 - ITEM_TM01] = MOVE_PROTECT, + [ITEM_TM18 - ITEM_TM01] = MOVE_RAIN_DANCE, + [ITEM_TM19 - ITEM_TM01] = MOVE_GIGA_DRAIN, + [ITEM_TM20 - ITEM_TM01] = MOVE_SAFEGUARD, + [ITEM_TM21 - ITEM_TM01] = MOVE_FRUSTRATION, + [ITEM_TM22 - ITEM_TM01] = MOVE_SOLAR_BEAM, + [ITEM_TM23 - ITEM_TM01] = MOVE_IRON_TAIL, + [ITEM_TM24 - ITEM_TM01] = MOVE_THUNDERBOLT, + [ITEM_TM25 - ITEM_TM01] = MOVE_THUNDER, + [ITEM_TM26 - ITEM_TM01] = MOVE_EARTHQUAKE, + [ITEM_TM27 - ITEM_TM01] = MOVE_RETURN, + [ITEM_TM28 - ITEM_TM01] = MOVE_DIG, + [ITEM_TM29 - ITEM_TM01] = MOVE_PSYCHIC, + [ITEM_TM30 - ITEM_TM01] = MOVE_SHADOW_BALL, + [ITEM_TM31 - ITEM_TM01] = MOVE_BRICK_BREAK, + [ITEM_TM32 - ITEM_TM01] = MOVE_DOUBLE_TEAM, + [ITEM_TM33 - ITEM_TM01] = MOVE_REFLECT, + [ITEM_TM34 - ITEM_TM01] = MOVE_SHOCK_WAVE, + [ITEM_TM35 - ITEM_TM01] = MOVE_FLAMETHROWER, + [ITEM_TM36 - ITEM_TM01] = MOVE_SLUDGE_BOMB, + [ITEM_TM37 - ITEM_TM01] = MOVE_SANDSTORM, + [ITEM_TM38 - ITEM_TM01] = MOVE_FIRE_BLAST, + [ITEM_TM39 - ITEM_TM01] = MOVE_ROCK_TOMB, + [ITEM_TM40 - ITEM_TM01] = MOVE_AERIAL_ACE, + [ITEM_TM41 - ITEM_TM01] = MOVE_TORMENT, + [ITEM_TM42 - ITEM_TM01] = MOVE_FACADE, + [ITEM_TM43 - ITEM_TM01] = MOVE_SECRET_POWER, + [ITEM_TM44 - ITEM_TM01] = MOVE_REST, + [ITEM_TM45 - ITEM_TM01] = MOVE_ATTRACT, + [ITEM_TM46 - ITEM_TM01] = MOVE_THIEF, + [ITEM_TM47 - ITEM_TM01] = MOVE_STEEL_WING, + [ITEM_TM48 - ITEM_TM01] = MOVE_SKILL_SWAP, + [ITEM_TM49 - ITEM_TM01] = MOVE_SNATCH, + [ITEM_TM50 - ITEM_TM01] = MOVE_OVERHEAT, + [ITEM_HM01 - ITEM_TM01] = MOVE_CUT, + [ITEM_HM02 - ITEM_TM01] = MOVE_FLY, + [ITEM_HM03 - ITEM_TM01] = MOVE_SURF, + [ITEM_HM04 - ITEM_TM01] = MOVE_STRENGTH, + [ITEM_HM05 - ITEM_TM01] = MOVE_FLASH, + [ITEM_HM06 - ITEM_TM01] = MOVE_ROCK_SMASH, + [ITEM_HM07 - ITEM_TM01] = MOVE_WATERFALL, + [ITEM_HM08 - ITEM_TM01] = MOVE_DIVE, }; diff --git a/src/data/pokemon/base_stats.h b/src/data/pokemon/base_stats.h index 67ddca5dc..db02c10a0 100644 --- a/src/data/pokemon/base_stats.h +++ b/src/data/pokemon/base_stats.h @@ -12408,7 +12408,7 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_MIMEJR] = + [SPECIES_MIME_JR] = { .baseHP = 20, .baseAttack = 25, @@ -32414,7 +32414,7 @@ const struct BaseStats gBaseStats[] = .noFlip = FALSE, }, - [SPECIES_ORICORIO_PA_U] = + [SPECIES_ORICORIO_PAU] = { .baseHP = 75, .baseAttack = 70, diff --git a/src/data/pokemon/egg_moves.h b/src/data/pokemon/egg_moves.h index c00e2fe0a..18853e0c8 100644 --- a/src/data/pokemon/egg_moves.h +++ b/src/data/pokemon/egg_moves.h @@ -2678,7 +2678,7 @@ const u16 gEggMoves[] = { MOVE_CURSE, MOVE_ENDURE), - egg_moves(MIMEJR, + egg_moves(MIME_JR, MOVE_FUTURE_SIGHT, MOVE_HYPNOSIS, MOVE_MIMIC, diff --git a/src/data/pokemon/evolution.h b/src/data/pokemon/evolution.h index baf58ed96..9d67f1f17 100644 --- a/src/data/pokemon/evolution.h +++ b/src/data/pokemon/evolution.h @@ -286,13 +286,13 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = [SPECIES_STUNKY] = {{EVO_LEVEL, 34, SPECIES_SKUNTANK}}, [SPECIES_BRONZOR] = {{EVO_LEVEL, 35, SPECIES_BRONZONG}}, [SPECIES_BONSLY] = {{EVO_MOVE, MOVE_MIMIC, SPECIES_SUDOWOODO}}, - [SPECIES_MIMEJR] = {{EVO_MOVE, MOVE_MIMIC, SPECIES_MR_MIME}}, + [SPECIES_MIME_JR] = {{EVO_MOVE, MOVE_MIMIC, SPECIES_MR_MIME}}, [SPECIES_HAPPINY] = {{EVO_ITEM_HOLD_DAY, ITEM_OVAL_STONE, SPECIES_CHANSEY}}, [SPECIES_GIBLE] = {{EVO_LEVEL, 24, SPECIES_GABITE}}, [SPECIES_GABITE] = {{EVO_LEVEL, 48, SPECIES_GARCHOMP}}, [SPECIES_GARCHOMP] = {{EVO_MEGA_EVOLUTION, ITEM_GARCHOMPITE, SPECIES_GARCHOMP_MEGA}}, [SPECIES_MUNCHLAX] = {{EVO_FRIENDSHIP, 0, SPECIES_SNORLAX}}, - [SPECIES_RIOLU] = {{EVO_FRIENDSHIP, 0, SPECIES_LUCARIO}}, + [SPECIES_RIOLU] = {{EVO_FRIENDSHIP_DAY, 0, SPECIES_LUCARIO}}, [SPECIES_LUCARIO] = {{EVO_MEGA_EVOLUTION, ITEM_LUCARIONITE, SPECIES_LUCARIO_MEGA}}, [SPECIES_HIPPOPOTAS] = {{EVO_LEVEL, 34, SPECIES_HIPPOWDON}}, [SPECIES_SKORUPI] = {{EVO_LEVEL, 40, SPECIES_DRAPION}}, diff --git a/src/data/pokemon/form_species_table_pointers.h b/src/data/pokemon/form_species_table_pointers.h index ac58f1bfb..7c7c56b0e 100644 --- a/src/data/pokemon/form_species_table_pointers.h +++ b/src/data/pokemon/form_species_table_pointers.h @@ -430,7 +430,7 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] = [SPECIES_HOOPA_UNBOUND] = sHoopaFormSpeciesIdTable, // Oricorio [SPECIES_ORICORIO_POM_POM] = sOricorioFormSpeciesIdTable, - [SPECIES_ORICORIO_PA_U] = sOricorioFormSpeciesIdTable, + [SPECIES_ORICORIO_PAU] = sOricorioFormSpeciesIdTable, [SPECIES_ORICORIO_SENSU] = sOricorioFormSpeciesIdTable, // Rockruff [SPECIES_ROCKRUFF_OWN_TEMPO] = sRockruffFormSpeciesIdTable, diff --git a/src/data/pokemon/form_species_tables.h b/src/data/pokemon/form_species_tables.h index f702530eb..89b3f4eec 100644 --- a/src/data/pokemon/form_species_tables.h +++ b/src/data/pokemon/form_species_tables.h @@ -846,7 +846,7 @@ static const u16 sHoopaFormSpeciesIdTable[] = { static const u16 sOricorioFormSpeciesIdTable[] = { SPECIES_ORICORIO, SPECIES_ORICORIO_POM_POM, - SPECIES_ORICORIO_PA_U, + SPECIES_ORICORIO_PAU, SPECIES_ORICORIO_SENSU, FORM_SPECIES_END, }; diff --git a/src/data/pokemon/level_up_learnset_pointers.h b/src/data/pokemon/level_up_learnset_pointers.h index 721ce3920..6cd308aa7 100644 --- a/src/data/pokemon/level_up_learnset_pointers.h +++ b/src/data/pokemon/level_up_learnset_pointers.h @@ -122,7 +122,7 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_SEAKING] = sSeakingLevelUpLearnset, [SPECIES_STARYU] = sStaryuLevelUpLearnset, [SPECIES_STARMIE] = sStarmieLevelUpLearnset, - [SPECIES_MR_MIME] = sMrmimeLevelUpLearnset, + [SPECIES_MR_MIME] = sMrMimeLevelUpLearnset, [SPECIES_SCYTHER] = sScytherLevelUpLearnset, [SPECIES_JYNX] = sJynxLevelUpLearnset, [SPECIES_ELECTABUZZ] = sElectabuzzLevelUpLearnset, @@ -439,7 +439,7 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_BRONZOR] = sBronzorLevelUpLearnset, [SPECIES_BRONZONG] = sBronzongLevelUpLearnset, [SPECIES_BONSLY] = sBonslyLevelUpLearnset, - [SPECIES_MIMEJR] = sMimejrLevelUpLearnset, + [SPECIES_MIME_JR] = sMimeJrLevelUpLearnset, [SPECIES_HAPPINY] = sHappinyLevelUpLearnset, [SPECIES_CHATOT] = sChatotLevelUpLearnset, [SPECIES_SPIRITOMB] = sSpiritombLevelUpLearnset, @@ -782,9 +782,9 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_BRUXISH] = sBruxishLevelUpLearnset, [SPECIES_DRAMPA] = sDrampaLevelUpLearnset, [SPECIES_DHELMISE] = sDhelmiseLevelUpLearnset, - [SPECIES_JANGMO_O] = sJangmoOLevelUpLearnset, - [SPECIES_HAKAMO_O] = sHakamoOLevelUpLearnset, - [SPECIES_KOMMO_O] = sKommoOLevelUpLearnset, + [SPECIES_JANGMO_O] = sJangmooLevelUpLearnset, + [SPECIES_HAKAMO_O] = sHakamooLevelUpLearnset, + [SPECIES_KOMMO_O] = sKommooLevelUpLearnset, [SPECIES_TAPU_KOKO] = sTapuKokoLevelUpLearnset, [SPECIES_TAPU_LELE] = sTapuLeleLevelUpLearnset, [SPECIES_TAPU_BULU] = sTapuBuluLevelUpLearnset, @@ -1186,7 +1186,7 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_HOOPA_UNBOUND] = sHoopaUnboundLevelUpLearnset, // Oricorio [SPECIES_ORICORIO_POM_POM] = sOricorioLevelUpLearnset, - [SPECIES_ORICORIO_PA_U] = sOricorioLevelUpLearnset, + [SPECIES_ORICORIO_PAU] = sOricorioLevelUpLearnset, [SPECIES_ORICORIO_SENSU] = sOricorioLevelUpLearnset, // Rockruff [SPECIES_ROCKRUFF_OWN_TEMPO] = sRockruffLevelUpLearnset, diff --git a/src/data/pokemon/level_up_learnsets.h b/src/data/pokemon/level_up_learnsets.h index 6004c9ef2..c774cc312 100644 --- a/src/data/pokemon/level_up_learnsets.h +++ b/src/data/pokemon/level_up_learnsets.h @@ -2388,7 +2388,7 @@ static const struct LevelUpMove sStarmieLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sMrmimeLevelUpLearnset[] = { +static const struct LevelUpMove sMrMimeLevelUpLearnset[] = { //LEVEL_UP_MOVE( 1, MOVE_MISTY_TERRAIN), LEVEL_UP_MOVE( 1, MOVE_MAGICAL_LEAF), //LEVEL_UP_MOVE( 1, MOVE_QUICK_GUARD), @@ -8862,7 +8862,7 @@ static const struct LevelUpMove sBonslyLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sMimejrLevelUpLearnset[] = { +static const struct LevelUpMove sMimeJrLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TICKLE), LEVEL_UP_MOVE( 1, MOVE_BARRIER), LEVEL_UP_MOVE( 1, MOVE_POUND), @@ -15954,7 +15954,7 @@ static const struct LevelUpMove sDhelmiseLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sJangmoOLevelUpLearnset[] = { +static const struct LevelUpMove sJangmooLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 5, MOVE_LEER), LEVEL_UP_MOVE( 9, MOVE_BIDE), @@ -15972,7 +15972,7 @@ static const struct LevelUpMove sJangmoOLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sHakamoOLevelUpLearnset[] = { +static const struct LevelUpMove sHakamooLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_SKY_UPPERCUT), LEVEL_UP_MOVE( 1, MOVE_SKY_UPPERCUT), //LEVEL_UP_MOVE( 1, MOVE_AUTOTOMIZE), @@ -15997,7 +15997,7 @@ static const struct LevelUpMove sHakamoOLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sKommoOLevelUpLearnset[] = { +static const struct LevelUpMove sKommooLevelUpLearnset[] = { //LEVEL_UP_MOVE( 0, MOVE_CLANGING_SCALES), //LEVEL_UP_MOVE( 1, MOVE_CLANGING_SCALES), LEVEL_UP_MOVE( 1, MOVE_SKY_UPPERCUT), @@ -18969,8 +18969,8 @@ static const struct LevelUpMove sKyuremWhiteLevelUpLearnset[] = { LEVEL_UP_MOVE(22, MOVE_ICE_BEAM), LEVEL_UP_MOVE(29, MOVE_DRAGON_BREATH), LEVEL_UP_MOVE(36, MOVE_SLASH), - //LEVEL_UP_MOVE(43, MOVE_FUSION_BOLT), - //LEVEL_UP_MOVE(50, MOVE_FREEZE_SHOCK), + //LEVEL_UP_MOVE(43, MOVE_FUSION_FLARE), + //LEVEL_UP_MOVE(50, MOVE_ICE_BURN), //LEVEL_UP_MOVE(57, MOVE_DRAGON_PULSE), //LEVEL_UP_MOVE(64, MOVE_NOBLE_ROAR), LEVEL_UP_MOVE(71, MOVE_ENDEAVOR), @@ -18988,8 +18988,8 @@ static const struct LevelUpMove sKyuremBlackLevelUpLearnset[] = { LEVEL_UP_MOVE(22, MOVE_ICE_BEAM), LEVEL_UP_MOVE(29, MOVE_DRAGON_BREATH), LEVEL_UP_MOVE(36, MOVE_SLASH), - //LEVEL_UP_MOVE(43, MOVE_FUSION_FLARE), - //LEVEL_UP_MOVE(50, MOVE_ICE_BURN), + //LEVEL_UP_MOVE(43, MOVE_FUSION_BOLT), + //LEVEL_UP_MOVE(50, MOVE_FREEZE_SHOCK), //LEVEL_UP_MOVE(57, MOVE_DRAGON_PULSE), //LEVEL_UP_MOVE(64, MOVE_NOBLE_ROAR), LEVEL_UP_MOVE(71, MOVE_ENDEAVOR), diff --git a/src/data/pokemon/pokedex_entries.h b/src/data/pokemon/pokedex_entries.h index 9cd0a73b2..6ceff22ee 100644 --- a/src/data/pokemon/pokedex_entries.h +++ b/src/data/pokemon/pokedex_entries.h @@ -2,7 +2,7 @@ const struct PokedexEntry gPokedexEntries[] = { [NATIONAL_DEX_NONE] = { - .categoryName = _("UNKNOWN"), + .categoryName = _("Unknown"), .height = 0, .weight = 0, .description = gDummyPokedexText, @@ -14,7 +14,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_BULBASAUR] = { - .categoryName = _("SEED"), + .categoryName = _("Seed"), .height = 7, .weight = 69, .description = gBulbasaurPokedexText, @@ -26,7 +26,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_IVYSAUR] = { - .categoryName = _("SEED"), + .categoryName = _("Seed"), .height = 10, .weight = 130, .description = gIvysaurPokedexText, @@ -38,7 +38,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_VENUSAUR] = { - .categoryName = _("SEED"), + .categoryName = _("Seed"), .height = 20, .weight = 1000, .description = gVenusaurPokedexText, @@ -50,7 +50,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_CHARMANDER] = { - .categoryName = _("LIZARD"), + .categoryName = _("Lizard"), .height = 6, .weight = 85, .description = gCharmanderPokedexText, @@ -62,7 +62,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_CHARMELEON] = { - .categoryName = _("FLAME"), + .categoryName = _("Flame"), .height = 11, .weight = 190, .description = gCharmeleonPokedexText, @@ -74,7 +74,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_CHARIZARD] = { - .categoryName = _("FLAME"), + .categoryName = _("Flame"), .height = 17, .weight = 905, .description = gCharizardPokedexText, @@ -86,7 +86,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_SQUIRTLE] = { - .categoryName = _("TINY TURTLE"), + .categoryName = _("Tiny Turtle"), .height = 5, .weight = 90, .description = gSquirtlePokedexText, @@ -98,7 +98,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_WARTORTLE] = { - .categoryName = _("TURTLE"), + .categoryName = _("Turtle"), .height = 10, .weight = 225, .description = gWartortlePokedexText, @@ -110,7 +110,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_BLASTOISE] = { - .categoryName = _("SHELLFISH"), + .categoryName = _("Shellfish"), .height = 16, .weight = 855, .description = gBlastoisePokedexText, @@ -122,7 +122,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_CATERPIE] = { - .categoryName = _("WORM"), + .categoryName = _("Worm"), .height = 3, .weight = 29, .description = gCaterpiePokedexText, @@ -134,7 +134,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_METAPOD] = { - .categoryName = _("COCOON"), + .categoryName = _("Cocoon"), .height = 7, .weight = 99, .description = gMetapodPokedexText, @@ -146,7 +146,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_BUTTERFREE] = { - .categoryName = _("BUTTERFLY"), + .categoryName = _("Butterfly"), .height = 11, .weight = 320, .description = gButterfreePokedexText, @@ -158,7 +158,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_WEEDLE] = { - .categoryName = _("HAIRY BUG"), + .categoryName = _("Hairy Bug"), .height = 3, .weight = 32, .description = gWeedlePokedexText, @@ -170,7 +170,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_KAKUNA] = { - .categoryName = _("COCOON"), + .categoryName = _("Cocoon"), .height = 6, .weight = 100, .description = gKakunaPokedexText, @@ -182,7 +182,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_BEEDRILL] = { - .categoryName = _("POISON BEE"), + .categoryName = _("Poison Bee"), .height = 10, .weight = 295, .description = gBeedrillPokedexText, @@ -194,7 +194,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_PIDGEY] = { - .categoryName = _("TINY BIRD"), + .categoryName = _("Tiny Bird"), .height = 3, .weight = 18, .description = gPidgeyPokedexText, @@ -206,7 +206,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_PIDGEOTTO] = { - .categoryName = _("BIRD"), + .categoryName = _("Bird"), .height = 11, .weight = 300, .description = gPidgeottoPokedexText, @@ -218,7 +218,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_PIDGEOT] = { - .categoryName = _("BIRD"), + .categoryName = _("Bird"), .height = 15, .weight = 395, .description = gPidgeotPokedexText, @@ -230,7 +230,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_RATTATA] = { - .categoryName = _("MOUSE"), + .categoryName = _("Mouse"), .height = 3, .weight = 35, .description = gRattataPokedexText, @@ -242,7 +242,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_RATICATE] = { - .categoryName = _("MOUSE"), + .categoryName = _("Mouse"), .height = 7, .weight = 185, .description = gRaticatePokedexText, @@ -254,7 +254,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_SPEAROW] = { - .categoryName = _("TINY BIRD"), + .categoryName = _("Tiny Bird"), .height = 3, .weight = 20, .description = gSpearowPokedexText, @@ -266,7 +266,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_FEAROW] = { - .categoryName = _("BEAK"), + .categoryName = _("Beak"), .height = 12, .weight = 380, .description = gFearowPokedexText, @@ -278,7 +278,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_EKANS] = { - .categoryName = _("SNAKE"), + .categoryName = _("Snake"), .height = 20, .weight = 69, .description = gEkansPokedexText, @@ -290,7 +290,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_ARBOK] = { - .categoryName = _("COBRA"), + .categoryName = _("Cobra"), .height = 35, .weight = 650, .description = gArbokPokedexText, @@ -302,7 +302,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_PIKACHU] = { - .categoryName = _("MOUSE"), + .categoryName = _("Mouse"), .height = 4, .weight = 60, .description = gPikachuPokedexText, @@ -314,7 +314,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_RAICHU] = { - .categoryName = _("MOUSE"), + .categoryName = _("Mouse"), .height = 8, .weight = 300, .description = gRaichuPokedexText, @@ -326,7 +326,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_SANDSHREW] = { - .categoryName = _("MOUSE"), + .categoryName = _("Mouse"), .height = 6, .weight = 120, .description = gSandshrewPokedexText, @@ -338,7 +338,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_SANDSLASH] = { - .categoryName = _("MOUSE"), + .categoryName = _("Mouse"), .height = 10, .weight = 295, .description = gSandslashPokedexText, @@ -350,7 +350,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_NIDORAN_F] = { - .categoryName = _("POISON PIN"), + .categoryName = _("Poison Pin"), .height = 4, .weight = 70, .description = gNidoranFPokedexText, @@ -362,7 +362,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_NIDORINA] = { - .categoryName = _("POISON PIN"), + .categoryName = _("Poison Pin"), .height = 8, .weight = 200, .description = gNidorinaPokedexText, @@ -374,7 +374,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_NIDOQUEEN] = { - .categoryName = _("DRILL"), + .categoryName = _("Drill"), .height = 13, .weight = 600, .description = gNidoqueenPokedexText, @@ -386,7 +386,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_NIDORAN_M] = { - .categoryName = _("POISON PIN"), + .categoryName = _("Poison Pin"), .height = 5, .weight = 90, .description = gNidoranMPokedexText, @@ -398,7 +398,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_NIDORINO] = { - .categoryName = _("POISON PIN"), + .categoryName = _("Poison Pin"), .height = 9, .weight = 195, .description = gNidorinoPokedexText, @@ -410,7 +410,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_NIDOKING] = { - .categoryName = _("DRILL"), + .categoryName = _("Drill"), .height = 14, .weight = 620, .description = gNidokingPokedexText, @@ -422,7 +422,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_CLEFAIRY] = { - .categoryName = _("FAIRY"), + .categoryName = _("Fairy"), .height = 6, .weight = 75, .description = gClefairyPokedexText, @@ -434,7 +434,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_CLEFABLE] = { - .categoryName = _("FAIRY"), + .categoryName = _("Fairy"), .height = 13, .weight = 400, .description = gClefablePokedexText, @@ -446,7 +446,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_VULPIX] = { - .categoryName = _("FOX"), + .categoryName = _("Fox"), .height = 6, .weight = 99, .description = gVulpixPokedexText, @@ -458,7 +458,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_NINETALES] = { - .categoryName = _("FOX"), + .categoryName = _("Fox"), .height = 11, .weight = 199, .description = gNinetalesPokedexText, @@ -470,7 +470,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_JIGGLYPUFF] = { - .categoryName = _("BALLOON"), + .categoryName = _("Balloon"), .height = 5, .weight = 55, .description = gJigglypuffPokedexText, @@ -482,7 +482,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_WIGGLYTUFF] = { - .categoryName = _("BALLOON"), + .categoryName = _("Balloon"), .height = 10, .weight = 120, .description = gWigglytuffPokedexText, @@ -494,7 +494,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_ZUBAT] = { - .categoryName = _("BAT"), + .categoryName = _("Bat"), .height = 8, .weight = 75, .description = gZubatPokedexText, @@ -506,7 +506,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_GOLBAT] = { - .categoryName = _("BAT"), + .categoryName = _("Bat"), .height = 16, .weight = 550, .description = gGolbatPokedexText, @@ -518,7 +518,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_ODDISH] = { - .categoryName = _("WEED"), + .categoryName = _("Weed"), .height = 5, .weight = 54, .description = gOddishPokedexText, @@ -530,7 +530,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_GLOOM] = { - .categoryName = _("WEED"), + .categoryName = _("Weed"), .height = 8, .weight = 86, .description = gGloomPokedexText, @@ -542,7 +542,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_VILEPLUME] = { - .categoryName = _("FLOWER"), + .categoryName = _("Flower"), .height = 12, .weight = 186, .description = gVileplumePokedexText, @@ -554,7 +554,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_PARAS] = { - .categoryName = _("MUSHROOM"), + .categoryName = _("Mushroom"), .height = 3, .weight = 54, .description = gParasPokedexText, @@ -566,7 +566,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_PARASECT] = { - .categoryName = _("MUSHROOM"), + .categoryName = _("Mushroom"), .height = 10, .weight = 295, .description = gParasectPokedexText, @@ -578,7 +578,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_VENONAT] = { - .categoryName = _("INSECT"), + .categoryName = _("Insect"), .height = 10, .weight = 300, .description = gVenonatPokedexText, @@ -590,7 +590,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_VENOMOTH] = { - .categoryName = _("POISON MOTH"), + .categoryName = _("Poison Moth"), .height = 15, .weight = 125, .description = gVenomothPokedexText, @@ -602,7 +602,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_DIGLETT] = { - .categoryName = _("MOLE"), + .categoryName = _("Mole"), .height = 2, .weight = 8, .description = gDiglettPokedexText, @@ -614,7 +614,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_DUGTRIO] = { - .categoryName = _("MOLE"), + .categoryName = _("Mole"), .height = 7, .weight = 333, .description = gDugtrioPokedexText, @@ -626,7 +626,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_MEOWTH] = { - .categoryName = _("SCRATCH CAT"), + .categoryName = _("Scratch Cat"), .height = 4, .weight = 42, .description = gMeowthPokedexText, @@ -638,7 +638,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_PERSIAN] = { - .categoryName = _("CLASSY CAT"), + .categoryName = _("Classy Cat"), .height = 10, .weight = 320, .description = gPersianPokedexText, @@ -650,7 +650,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_PSYDUCK] = { - .categoryName = _("DUCK"), + .categoryName = _("Duck"), .height = 8, .weight = 196, .description = gPsyduckPokedexText, @@ -662,7 +662,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_GOLDUCK] = { - .categoryName = _("DUCK"), + .categoryName = _("Duck"), .height = 17, .weight = 766, .description = gGolduckPokedexText, @@ -674,7 +674,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_MANKEY] = { - .categoryName = _("PIG MONKEY"), + .categoryName = _("Pig Monkey"), .height = 5, .weight = 280, .description = gMankeyPokedexText, @@ -686,7 +686,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_PRIMEAPE] = { - .categoryName = _("PIG MONKEY"), + .categoryName = _("Pig Monkey"), .height = 10, .weight = 320, .description = gPrimeapePokedexText, @@ -698,7 +698,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_GROWLITHE] = { - .categoryName = _("PUPPY"), + .categoryName = _("Puppy"), .height = 7, .weight = 190, .description = gGrowlithePokedexText, @@ -710,7 +710,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_ARCANINE] = { - .categoryName = _("LEGENDARY"), + .categoryName = _("Legendary"), .height = 19, .weight = 1550, .description = gArcaninePokedexText, @@ -722,7 +722,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_POLIWAG] = { - .categoryName = _("TADPOLE"), + .categoryName = _("Tadpole"), .height = 6, .weight = 124, .description = gPoliwagPokedexText, @@ -734,7 +734,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_POLIWHIRL] = { - .categoryName = _("TADPOLE"), + .categoryName = _("Tadpole"), .height = 10, .weight = 200, .description = gPoliwhirlPokedexText, @@ -746,7 +746,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_POLIWRATH] = { - .categoryName = _("TADPOLE"), + .categoryName = _("Tadpole"), .height = 13, .weight = 540, .description = gPoliwrathPokedexText, @@ -758,7 +758,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_ABRA] = { - .categoryName = _("PSI"), + .categoryName = _("Psi"), .height = 9, .weight = 195, .description = gAbraPokedexText, @@ -770,7 +770,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_KADABRA] = { - .categoryName = _("PSI"), + .categoryName = _("Psi"), .height = 13, .weight = 565, .description = gKadabraPokedexText, @@ -782,7 +782,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_ALAKAZAM] = { - .categoryName = _("PSI"), + .categoryName = _("Psi"), .height = 15, .weight = 480, .description = gAlakazamPokedexText, @@ -794,7 +794,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_MACHOP] = { - .categoryName = _("SUPERPOWER"), + .categoryName = _("Superpower"), .height = 8, .weight = 195, .description = gMachopPokedexText, @@ -806,7 +806,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_MACHOKE] = { - .categoryName = _("SUPERPOWER"), + .categoryName = _("Superpower"), .height = 15, .weight = 705, .description = gMachokePokedexText, @@ -818,7 +818,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_MACHAMP] = { - .categoryName = _("SUPERPOWER"), + .categoryName = _("Superpower"), .height = 16, .weight = 1300, .description = gMachampPokedexText, @@ -830,7 +830,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_BELLSPROUT] = { - .categoryName = _("FLOWER"), + .categoryName = _("Flower"), .height = 7, .weight = 40, .description = gBellsproutPokedexText, @@ -842,7 +842,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_WEEPINBELL] = { - .categoryName = _("FLYCATCHER"), + .categoryName = _("Flycatcher"), .height = 10, .weight = 64, .description = gWeepinbellPokedexText, @@ -854,7 +854,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_VICTREEBEL] = { - .categoryName = _("FLYCATCHER"), + .categoryName = _("Flycatcher"), .height = 17, .weight = 155, .description = gVictreebelPokedexText, @@ -866,7 +866,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_TENTACOOL] = { - .categoryName = _("JELLYFISH"), + .categoryName = _("Jellyfish"), .height = 9, .weight = 455, .description = gTentacoolPokedexText, @@ -878,7 +878,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_TENTACRUEL] = { - .categoryName = _("JELLYFISH"), + .categoryName = _("Jellyfish"), .height = 16, .weight = 550, .description = gTentacruelPokedexText, @@ -890,7 +890,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_GEODUDE] = { - .categoryName = _("ROCK"), + .categoryName = _("Rock"), .height = 4, .weight = 200, .description = gGeodudePokedexText, @@ -902,7 +902,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_GRAVELER] = { - .categoryName = _("ROCK"), + .categoryName = _("Rock"), .height = 10, .weight = 1050, .description = gGravelerPokedexText, @@ -914,7 +914,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_GOLEM] = { - .categoryName = _("MEGATON"), + .categoryName = _("Megaton"), .height = 14, .weight = 3000, .description = gGolemPokedexText, @@ -926,7 +926,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_PONYTA] = { - .categoryName = _("FIRE HORSE"), + .categoryName = _("Fire Horse"), .height = 10, .weight = 300, .description = gPonytaPokedexText, @@ -938,7 +938,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_RAPIDASH] = { - .categoryName = _("FIRE HORSE"), + .categoryName = _("Fire Horse"), .height = 17, .weight = 950, .description = gRapidashPokedexText, @@ -950,7 +950,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_SLOWPOKE] = { - .categoryName = _("DOPEY"), + .categoryName = _("Dopey"), .height = 12, .weight = 360, .description = gSlowpokePokedexText, @@ -962,7 +962,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_SLOWBRO] = { - .categoryName = _("HERMIT CRAB"), + .categoryName = _("Hermit Crab"), .height = 16, .weight = 785, .description = gSlowbroPokedexText, @@ -974,7 +974,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_MAGNEMITE] = { - .categoryName = _("MAGNET"), + .categoryName = _("Magnet"), .height = 3, .weight = 60, .description = gMagnemitePokedexText, @@ -986,7 +986,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_MAGNETON] = { - .categoryName = _("MAGNET"), + .categoryName = _("Magnet"), .height = 10, .weight = 600, .description = gMagnetonPokedexText, @@ -998,7 +998,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_FARFETCHD] = { - .categoryName = _("WILD DUCK"), + .categoryName = _("Wild Duck"), .height = 8, .weight = 150, .description = gFarfetchdPokedexText, @@ -1010,7 +1010,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_DODUO] = { - .categoryName = _("TWIN BIRD"), + .categoryName = _("Twin Bird"), .height = 14, .weight = 392, .description = gDoduoPokedexText, @@ -1022,7 +1022,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_DODRIO] = { - .categoryName = _("TRIPLE BIRD"), + .categoryName = _("Triple Bird"), .height = 18, .weight = 852, .description = gDodrioPokedexText, @@ -1034,7 +1034,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_SEEL] = { - .categoryName = _("SEA LION"), + .categoryName = _("Sea Lion"), .height = 11, .weight = 900, .description = gSeelPokedexText, @@ -1046,7 +1046,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_DEWGONG] = { - .categoryName = _("SEA LION"), + .categoryName = _("Sea Lion"), .height = 17, .weight = 1200, .description = gDewgongPokedexText, @@ -1058,7 +1058,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_GRIMER] = { - .categoryName = _("SLUDGE"), + .categoryName = _("Sludge"), .height = 9, .weight = 300, .description = gGrimerPokedexText, @@ -1070,7 +1070,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_MUK] = { - .categoryName = _("SLUDGE"), + .categoryName = _("Sludge"), .height = 12, .weight = 300, .description = gMukPokedexText, @@ -1082,7 +1082,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_SHELLDER] = { - .categoryName = _("BIVALVE"), + .categoryName = _("Bivalve"), .height = 3, .weight = 40, .description = gShellderPokedexText, @@ -1094,7 +1094,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_CLOYSTER] = { - .categoryName = _("BIVALVE"), + .categoryName = _("Bivalve"), .height = 15, .weight = 1325, .description = gCloysterPokedexText, @@ -1106,7 +1106,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_GASTLY] = { - .categoryName = _("GAS"), + .categoryName = _("Gas"), .height = 13, .weight = 1, .description = gGastlyPokedexText, @@ -1118,7 +1118,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_HAUNTER] = { - .categoryName = _("GAS"), + .categoryName = _("Gas"), .height = 16, .weight = 1, .description = gHaunterPokedexText, @@ -1130,7 +1130,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_GENGAR] = { - .categoryName = _("SHADOW"), + .categoryName = _("Shadow"), .height = 15, .weight = 405, .description = gGengarPokedexText, @@ -1142,7 +1142,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_ONIX] = { - .categoryName = _("ROCK SNAKE"), + .categoryName = _("Rock Snake"), .height = 88, .weight = 2100, .description = gOnixPokedexText, @@ -1154,7 +1154,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_DROWZEE] = { - .categoryName = _("HYPNOSIS"), + .categoryName = _("Hypnosis"), .height = 10, .weight = 324, .description = gDrowzeePokedexText, @@ -1166,7 +1166,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_HYPNO] = { - .categoryName = _("HYPNOSIS"), + .categoryName = _("Hypnosis"), .height = 16, .weight = 756, .description = gHypnoPokedexText, @@ -1178,7 +1178,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_KRABBY] = { - .categoryName = _("RIVER CRAB"), + .categoryName = _("River Crab"), .height = 4, .weight = 65, .description = gKrabbyPokedexText, @@ -1190,7 +1190,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_KINGLER] = { - .categoryName = _("PINCER"), + .categoryName = _("Pincer"), .height = 13, .weight = 600, .description = gKinglerPokedexText, @@ -1202,7 +1202,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_VOLTORB] = { - .categoryName = _("BALL"), + .categoryName = _("Ball"), .height = 5, .weight = 104, .description = gVoltorbPokedexText, @@ -1214,7 +1214,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_ELECTRODE] = { - .categoryName = _("BALL"), + .categoryName = _("Ball"), .height = 12, .weight = 666, .description = gElectrodePokedexText, @@ -1226,7 +1226,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_EXEGGCUTE] = { - .categoryName = _("EGG"), + .categoryName = _("Egg"), .height = 4, .weight = 25, .description = gExeggcutePokedexText, @@ -1238,7 +1238,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_EXEGGUTOR] = { - .categoryName = _("COCONUT"), + .categoryName = _("Coconut"), .height = 20, .weight = 1200, .description = gExeggutorPokedexText, @@ -1250,7 +1250,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_CUBONE] = { - .categoryName = _("LONELY"), + .categoryName = _("Lonely"), .height = 4, .weight = 65, .description = gCubonePokedexText, @@ -1262,7 +1262,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_MAROWAK] = { - .categoryName = _("BONE KEEPER"), + .categoryName = _("Bone Keeper"), .height = 10, .weight = 450, .description = gMarowakPokedexText, @@ -1274,7 +1274,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_HITMONLEE] = { - .categoryName = _("KICKING"), + .categoryName = _("Kicking"), .height = 15, .weight = 498, .description = gHitmonleePokedexText, @@ -1286,7 +1286,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_HITMONCHAN] = { - .categoryName = _("PUNCHING"), + .categoryName = _("Punching"), .height = 14, .weight = 502, .description = gHitmonchanPokedexText, @@ -1298,7 +1298,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_LICKITUNG] = { - .categoryName = _("LICKING"), + .categoryName = _("Licking"), .height = 12, .weight = 655, .description = gLickitungPokedexText, @@ -1310,7 +1310,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_KOFFING] = { - .categoryName = _("POISON GAS"), + .categoryName = _("Poison Gas"), .height = 6, .weight = 10, .description = gKoffingPokedexText, @@ -1322,7 +1322,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_WEEZING] = { - .categoryName = _("POISON GAS"), + .categoryName = _("Poison Gas"), .height = 12, .weight = 95, .description = gWeezingPokedexText, @@ -1334,7 +1334,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_RHYHORN] = { - .categoryName = _("SPIKES"), + .categoryName = _("Spikes"), .height = 10, .weight = 1150, .description = gRhyhornPokedexText, @@ -1346,7 +1346,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_RHYDON] = { - .categoryName = _("DRILL"), + .categoryName = _("Drill"), .height = 19, .weight = 1200, .description = gRhydonPokedexText, @@ -1358,7 +1358,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_CHANSEY] = { - .categoryName = _("EGG"), + .categoryName = _("Egg"), .height = 11, .weight = 346, .description = gChanseyPokedexText, @@ -1370,7 +1370,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_TANGELA] = { - .categoryName = _("VINE"), + .categoryName = _("Vine"), .height = 10, .weight = 350, .description = gTangelaPokedexText, @@ -1382,7 +1382,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_KANGASKHAN] = { - .categoryName = _("PARENT"), + .categoryName = _("Parent"), .height = 22, .weight = 800, .description = gKangaskhanPokedexText, @@ -1394,7 +1394,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_HORSEA] = { - .categoryName = _("DRAGON"), + .categoryName = _("Dragon"), .height = 4, .weight = 80, .description = gHorseaPokedexText, @@ -1406,7 +1406,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_SEADRA] = { - .categoryName = _("DRAGON"), + .categoryName = _("Dragon"), .height = 12, .weight = 250, .description = gSeadraPokedexText, @@ -1418,7 +1418,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_GOLDEEN] = { - .categoryName = _("GOLDFISH"), + .categoryName = _("Goldfish"), .height = 6, .weight = 150, .description = gGoldeenPokedexText, @@ -1430,7 +1430,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_SEAKING] = { - .categoryName = _("GOLDFISH"), + .categoryName = _("Goldfish"), .height = 13, .weight = 390, .description = gSeakingPokedexText, @@ -1442,7 +1442,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_STARYU] = { - .categoryName = _("STAR SHAPE"), + .categoryName = _("Star Shape"), .height = 8, .weight = 345, .description = gStaryuPokedexText, @@ -1454,7 +1454,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_STARMIE] = { - .categoryName = _("MYSTERIOUS"), + .categoryName = _("Mysterious"), .height = 11, .weight = 800, .description = gStarmiePokedexText, @@ -1466,10 +1466,10 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_MR_MIME] = { - .categoryName = _("BARRIER"), + .categoryName = _("Barrier"), .height = 13, .weight = 545, - .description = gMrmimePokedexText, + .description = gMrMimePokedexText, .pokemonScale = 258, .pokemonOffset = 6, .trainerScale = 256, @@ -1478,7 +1478,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_SCYTHER] = { - .categoryName = _("MANTIS"), + .categoryName = _("Mantis"), .height = 15, .weight = 560, .description = gScytherPokedexText, @@ -1490,7 +1490,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_JYNX] = { - .categoryName = _("HUMAN SHAPE"), + .categoryName = _("Human Shape"), .height = 14, .weight = 406, .description = gJynxPokedexText, @@ -1502,7 +1502,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_ELECTABUZZ] = { - .categoryName = _("ELECTRIC"), + .categoryName = _("Electric"), .height = 11, .weight = 300, .description = gElectabuzzPokedexText, @@ -1514,7 +1514,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_MAGMAR] = { - .categoryName = _("SPITFIRE"), + .categoryName = _("Spitfire"), .height = 13, .weight = 445, .description = gMagmarPokedexText, @@ -1526,7 +1526,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_PINSIR] = { - .categoryName = _("STAG BEETLE"), + .categoryName = _("Stag Beetle"), .height = 15, .weight = 550, .description = gPinsirPokedexText, @@ -1538,7 +1538,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_TAUROS] = { - .categoryName = _("WILD BULL"), + .categoryName = _("Wild Bull"), .height = 14, .weight = 884, .description = gTaurosPokedexText, @@ -1550,7 +1550,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_MAGIKARP] = { - .categoryName = _("FISH"), + .categoryName = _("Fish"), .height = 9, .weight = 100, .description = gMagikarpPokedexText, @@ -1562,7 +1562,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_GYARADOS] = { - .categoryName = _("ATROCIOUS"), + .categoryName = _("Atrocious"), .height = 65, .weight = 2350, .description = gGyaradosPokedexText, @@ -1574,7 +1574,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_LAPRAS] = { - .categoryName = _("TRANSPORT"), + .categoryName = _("Transport"), .height = 25, .weight = 2200, .description = gLaprasPokedexText, @@ -1586,7 +1586,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_DITTO] = { - .categoryName = _("TRANSFORM"), + .categoryName = _("Transform"), .height = 3, .weight = 40, .description = gDittoPokedexText, @@ -1598,7 +1598,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_EEVEE] = { - .categoryName = _("EVOLUTION"), + .categoryName = _("Evolution"), .height = 3, .weight = 65, .description = gEeveePokedexText, @@ -1610,7 +1610,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_VAPOREON] = { - .categoryName = _("BUBBLE JET"), + .categoryName = _("Bubble Jet"), .height = 10, .weight = 290, .description = gVaporeonPokedexText, @@ -1622,7 +1622,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_JOLTEON] = { - .categoryName = _("LIGHTNING"), + .categoryName = _("Lightning"), .height = 8, .weight = 245, .description = gJolteonPokedexText, @@ -1634,7 +1634,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_FLAREON] = { - .categoryName = _("FLAME"), + .categoryName = _("Flame"), .height = 9, .weight = 250, .description = gFlareonPokedexText, @@ -1646,7 +1646,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_PORYGON] = { - .categoryName = _("VIRTUAL"), + .categoryName = _("Virtual"), .height = 8, .weight = 365, .description = gPorygonPokedexText, @@ -1658,7 +1658,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_OMANYTE] = { - .categoryName = _("SPIRAL"), + .categoryName = _("Spiral"), .height = 4, .weight = 75, .description = gOmanytePokedexText, @@ -1670,7 +1670,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_OMASTAR] = { - .categoryName = _("SPIRAL"), + .categoryName = _("Spiral"), .height = 10, .weight = 350, .description = gOmastarPokedexText, @@ -1682,7 +1682,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_KABUTO] = { - .categoryName = _("SHELLFISH"), + .categoryName = _("Shellfish"), .height = 5, .weight = 115, .description = gKabutoPokedexText, @@ -1694,7 +1694,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_KABUTOPS] = { - .categoryName = _("SHELLFISH"), + .categoryName = _("Shellfish"), .height = 13, .weight = 405, .description = gKabutopsPokedexText, @@ -1706,7 +1706,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_AERODACTYL] = { - .categoryName = _("FOSSIL"), + .categoryName = _("Fossil"), .height = 18, .weight = 590, .description = gAerodactylPokedexText, @@ -1718,7 +1718,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_SNORLAX] = { - .categoryName = _("SLEEPING"), + .categoryName = _("Sleeping"), .height = 21, .weight = 4600, .description = gSnorlaxPokedexText, @@ -1730,7 +1730,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_ARTICUNO] = { - .categoryName = _("FREEZE"), + .categoryName = _("Freeze"), .height = 17, .weight = 554, .description = gArticunoPokedexText, @@ -1742,7 +1742,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_ZAPDOS] = { - .categoryName = _("ELECTRIC"), + .categoryName = _("Electric"), .height = 16, .weight = 526, .description = gZapdosPokedexText, @@ -1754,7 +1754,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_MOLTRES] = { - .categoryName = _("FLAME"), + .categoryName = _("Flame"), .height = 20, .weight = 600, .description = gMoltresPokedexText, @@ -1766,7 +1766,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_DRATINI] = { - .categoryName = _("DRAGON"), + .categoryName = _("Dragon"), .height = 18, .weight = 33, .description = gDratiniPokedexText, @@ -1778,7 +1778,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_DRAGONAIR] = { - .categoryName = _("DRAGON"), + .categoryName = _("Dragon"), .height = 40, .weight = 165, .description = gDragonairPokedexText, @@ -1790,7 +1790,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_DRAGONITE] = { - .categoryName = _("DRAGON"), + .categoryName = _("Dragon"), .height = 22, .weight = 2100, .description = gDragonitePokedexText, @@ -1802,7 +1802,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_MEWTWO] = { - .categoryName = _("GENETIC"), + .categoryName = _("Genetic"), .height = 20, .weight = 1220, .description = gMewtwoPokedexText, @@ -1814,7 +1814,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_MEW] = { - .categoryName = _("NEW SPECIES"), + .categoryName = _("New Species"), .height = 4, .weight = 40, .description = gMewPokedexText, @@ -1826,7 +1826,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_CHIKORITA] = { - .categoryName = _("LEAF"), + .categoryName = _("Leaf"), .height = 9, .weight = 64, .description = gChikoritaPokedexText, @@ -1838,7 +1838,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_BAYLEEF] = { - .categoryName = _("LEAF"), + .categoryName = _("Leaf"), .height = 12, .weight = 158, .description = gBayleefPokedexText, @@ -1850,7 +1850,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_MEGANIUM] = { - .categoryName = _("HERB"), + .categoryName = _("Herb"), .height = 18, .weight = 1005, .description = gMeganiumPokedexText, @@ -1862,7 +1862,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_CYNDAQUIL] = { - .categoryName = _("FIRE MOUSE"), + .categoryName = _("Fire Mouse"), .height = 5, .weight = 79, .description = gCyndaquilPokedexText, @@ -1874,7 +1874,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_QUILAVA] = { - .categoryName = _("VOLCANO"), + .categoryName = _("Volcano"), .height = 9, .weight = 190, .description = gQuilavaPokedexText, @@ -1886,7 +1886,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_TYPHLOSION] = { - .categoryName = _("VOLCANO"), + .categoryName = _("Volcano"), .height = 17, .weight = 795, .description = gTyphlosionPokedexText, @@ -1898,7 +1898,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_TOTODILE] = { - .categoryName = _("BIG JAW"), + .categoryName = _("Big Jaw"), .height = 6, .weight = 95, .description = gTotodilePokedexText, @@ -1910,7 +1910,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_CROCONAW] = { - .categoryName = _("BIG JAW"), + .categoryName = _("Big Jaw"), .height = 11, .weight = 250, .description = gCroconawPokedexText, @@ -1922,7 +1922,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_FERALIGATR] = { - .categoryName = _("BIG JAW"), + .categoryName = _("Big Jaw"), .height = 23, .weight = 888, .description = gFeraligatrPokedexText, @@ -1934,7 +1934,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_SENTRET] = { - .categoryName = _("SCOUT"), + .categoryName = _("Scout"), .height = 8, .weight = 60, .description = gSentretPokedexText, @@ -1946,7 +1946,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_FURRET] = { - .categoryName = _("LONG BODY"), + .categoryName = _("Long Body"), .height = 18, .weight = 325, .description = gFurretPokedexText, @@ -1958,7 +1958,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_HOOTHOOT] = { - .categoryName = _("OWL"), + .categoryName = _("Owl"), .height = 7, .weight = 212, .description = gHoothootPokedexText, @@ -1970,7 +1970,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_NOCTOWL] = { - .categoryName = _("OWL"), + .categoryName = _("Owl"), .height = 16, .weight = 408, .description = gNoctowlPokedexText, @@ -1982,7 +1982,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_LEDYBA] = { - .categoryName = _("FIVE STAR"), + .categoryName = _("Five Star"), .height = 10, .weight = 108, .description = gLedybaPokedexText, @@ -1994,7 +1994,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_LEDIAN] = { - .categoryName = _("FIVE STAR"), + .categoryName = _("Five Star"), .height = 14, .weight = 356, .description = gLedianPokedexText, @@ -2006,7 +2006,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_SPINARAK] = { - .categoryName = _("STRING SPIT"), + .categoryName = _("String Spit"), .height = 5, .weight = 85, .description = gSpinarakPokedexText, @@ -2018,7 +2018,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_ARIADOS] = { - .categoryName = _("LONG LEG"), + .categoryName = _("Long Leg"), .height = 11, .weight = 335, .description = gAriadosPokedexText, @@ -2030,7 +2030,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_CROBAT] = { - .categoryName = _("BAT"), + .categoryName = _("Bat"), .height = 18, .weight = 750, .description = gCrobatPokedexText, @@ -2042,7 +2042,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_CHINCHOU] = { - .categoryName = _("ANGLER"), + .categoryName = _("Angler"), .height = 5, .weight = 120, .description = gChinchouPokedexText, @@ -2054,7 +2054,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_LANTURN] = { - .categoryName = _("LIGHT"), + .categoryName = _("Light"), .height = 12, .weight = 225, .description = gLanturnPokedexText, @@ -2066,7 +2066,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_PICHU] = { - .categoryName = _("TINY MOUSE"), + .categoryName = _("Tiny Mouse"), .height = 3, .weight = 20, .description = gPichuPokedexText, @@ -2078,7 +2078,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_CLEFFA] = { - .categoryName = _("STAR SHAPE"), + .categoryName = _("Star Shape"), .height = 3, .weight = 30, .description = gCleffaPokedexText, @@ -2090,7 +2090,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_IGGLYBUFF] = { - .categoryName = _("BALLOON"), + .categoryName = _("Balloon"), .height = 3, .weight = 10, .description = gIgglybuffPokedexText, @@ -2102,7 +2102,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_TOGEPI] = { - .categoryName = _("SPIKE BALL"), + .categoryName = _("Spike Ball"), .height = 3, .weight = 15, .description = gTogepiPokedexText, @@ -2114,7 +2114,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_TOGETIC] = { - .categoryName = _("HAPPINESS"), + .categoryName = _("Happiness"), .height = 6, .weight = 32, .description = gTogeticPokedexText, @@ -2126,7 +2126,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_NATU] = { - .categoryName = _("TINY BIRD"), + .categoryName = _("Tiny Bird"), .height = 2, .weight = 20, .description = gNatuPokedexText, @@ -2138,7 +2138,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_XATU] = { - .categoryName = _("MYSTIC"), + .categoryName = _("Mystic"), .height = 15, .weight = 150, .description = gXatuPokedexText, @@ -2150,7 +2150,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_MAREEP] = { - .categoryName = _("WOOL"), + .categoryName = _("Wool"), .height = 6, .weight = 78, .description = gMareepPokedexText, @@ -2162,7 +2162,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_FLAAFFY] = { - .categoryName = _("WOOL"), + .categoryName = _("Wool"), .height = 8, .weight = 133, .description = gFlaaffyPokedexText, @@ -2174,7 +2174,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_AMPHAROS] = { - .categoryName = _("LIGHT"), + .categoryName = _("Light"), .height = 14, .weight = 615, .description = gAmpharosPokedexText, @@ -2186,7 +2186,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_BELLOSSOM] = { - .categoryName = _("FLOWER"), + .categoryName = _("Flower"), .height = 4, .weight = 58, .description = gBellossomPokedexText, @@ -2198,7 +2198,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_MARILL] = { - .categoryName = _("AQUA MOUSE"), + .categoryName = _("Aqua Mouse"), .height = 4, .weight = 85, .description = gMarillPokedexText, @@ -2210,7 +2210,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_AZUMARILL] = { - .categoryName = _("AQUA RABBIT"), + .categoryName = _("Aqua Rabbit"), .height = 8, .weight = 285, .description = gAzumarillPokedexText, @@ -2222,7 +2222,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_SUDOWOODO] = { - .categoryName = _("IMITATION"), + .categoryName = _("Imitation"), .height = 12, .weight = 380, .description = gSudowoodoPokedexText, @@ -2234,7 +2234,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_POLITOED] = { - .categoryName = _("FROG"), + .categoryName = _("Frog"), .height = 11, .weight = 339, .description = gPolitoedPokedexText, @@ -2246,7 +2246,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_HOPPIP] = { - .categoryName = _("COTTONWEED"), + .categoryName = _("Cottonweed"), .height = 4, .weight = 5, .description = gHoppipPokedexText, @@ -2258,7 +2258,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_SKIPLOOM] = { - .categoryName = _("COTTONWEED"), + .categoryName = _("Cottonweed"), .height = 6, .weight = 10, .description = gSkiploomPokedexText, @@ -2270,7 +2270,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_JUMPLUFF] = { - .categoryName = _("COTTONWEED"), + .categoryName = _("Cottonweed"), .height = 8, .weight = 30, .description = gJumpluffPokedexText, @@ -2282,7 +2282,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_AIPOM] = { - .categoryName = _("LONG TAIL"), + .categoryName = _("Long Tail"), .height = 8, .weight = 115, .description = gAipomPokedexText, @@ -2294,7 +2294,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_SUNKERN] = { - .categoryName = _("SEED"), + .categoryName = _("Seed"), .height = 3, .weight = 18, .description = gSunkernPokedexText, @@ -2306,7 +2306,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_SUNFLORA] = { - .categoryName = _("SUN"), + .categoryName = _("Sun"), .height = 8, .weight = 85, .description = gSunfloraPokedexText, @@ -2318,7 +2318,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_YANMA] = { - .categoryName = _("CLEAR WING"), + .categoryName = _("Clear Wing"), .height = 12, .weight = 380, .description = gYanmaPokedexText, @@ -2330,7 +2330,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_WOOPER] = { - .categoryName = _("WATER FISH"), + .categoryName = _("Water Fish"), .height = 4, .weight = 85, .description = gWooperPokedexText, @@ -2342,7 +2342,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_QUAGSIRE] = { - .categoryName = _("WATER FISH"), + .categoryName = _("Water Fish"), .height = 14, .weight = 750, .description = gQuagsirePokedexText, @@ -2354,7 +2354,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_ESPEON] = { - .categoryName = _("SUN"), + .categoryName = _("Sun"), .height = 9, .weight = 265, .description = gEspeonPokedexText, @@ -2366,7 +2366,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_UMBREON] = { - .categoryName = _("MOONLIGHT"), + .categoryName = _("Moonlight"), .height = 10, .weight = 270, .description = gUmbreonPokedexText, @@ -2378,7 +2378,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_MURKROW] = { - .categoryName = _("DARKNESS"), + .categoryName = _("Darkness"), .height = 5, .weight = 21, .description = gMurkrowPokedexText, @@ -2390,7 +2390,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_SLOWKING] = { - .categoryName = _("ROYAL"), + .categoryName = _("Royal"), .height = 20, .weight = 795, .description = gSlowkingPokedexText, @@ -2402,7 +2402,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_MISDREAVUS] = { - .categoryName = _("SCREECH"), + .categoryName = _("Screech"), .height = 7, .weight = 10, .description = gMisdreavusPokedexText, @@ -2414,7 +2414,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_UNOWN] = { - .categoryName = _("SYMBOL"), + .categoryName = _("Symbol"), .height = 5, .weight = 50, .description = gUnownPokedexText, @@ -2426,7 +2426,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_WOBBUFFET] = { - .categoryName = _("PATIENT"), + .categoryName = _("Patient"), .height = 13, .weight = 285, .description = gWobbuffetPokedexText, @@ -2438,7 +2438,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_GIRAFARIG] = { - .categoryName = _("LONG NECK"), + .categoryName = _("Long Neck"), .height = 15, .weight = 415, .description = gGirafarigPokedexText, @@ -2450,7 +2450,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_PINECO] = { - .categoryName = _("BAGWORM"), + .categoryName = _("Bagworm"), .height = 6, .weight = 72, .description = gPinecoPokedexText, @@ -2462,7 +2462,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_FORRETRESS] = { - .categoryName = _("BAGWORM"), + .categoryName = _("Bagworm"), .height = 12, .weight = 1258, .description = gForretressPokedexText, @@ -2474,7 +2474,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_DUNSPARCE] = { - .categoryName = _("LAND SNAKE"), + .categoryName = _("Land Snake"), .height = 15, .weight = 140, .description = gDunsparcePokedexText, @@ -2486,7 +2486,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_GLIGAR] = { - .categoryName = _("FLYSCORPION"), + .categoryName = _("Fly Scorpion"), .height = 11, .weight = 648, .description = gGligarPokedexText, @@ -2498,7 +2498,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_STEELIX] = { - .categoryName = _("IRON SNAKE"), + .categoryName = _("Iron Snake"), .height = 92, .weight = 4000, .description = gSteelixPokedexText, @@ -2510,7 +2510,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_SNUBBULL] = { - .categoryName = _("FAIRY"), + .categoryName = _("Fairy"), .height = 6, .weight = 78, .description = gSnubbullPokedexText, @@ -2522,7 +2522,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_GRANBULL] = { - .categoryName = _("FAIRY"), + .categoryName = _("Fairy"), .height = 14, .weight = 487, .description = gGranbullPokedexText, @@ -2534,7 +2534,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_QWILFISH] = { - .categoryName = _("BALLOON"), + .categoryName = _("Balloon"), .height = 5, .weight = 39, .description = gQwilfishPokedexText, @@ -2546,7 +2546,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_SCIZOR] = { - .categoryName = _("PINCER"), + .categoryName = _("Pincer"), .height = 18, .weight = 1180, .description = gScizorPokedexText, @@ -2558,7 +2558,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_SHUCKLE] = { - .categoryName = _("MOLD"), + .categoryName = _("Mold"), .height = 6, .weight = 205, .description = gShucklePokedexText, @@ -2570,7 +2570,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_HERACROSS] = { - .categoryName = _("SINGLE HORN"), + .categoryName = _("Single Horn"), .height = 15, .weight = 540, .description = gHeracrossPokedexText, @@ -2582,7 +2582,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_SNEASEL] = { - .categoryName = _("SHARP CLAW"), + .categoryName = _("Sharp Claw"), .height = 9, .weight = 280, .description = gSneaselPokedexText, @@ -2594,7 +2594,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_TEDDIURSA] = { - .categoryName = _("LITTLE BEAR"), + .categoryName = _("Little Bear"), .height = 6, .weight = 88, .description = gTeddiursaPokedexText, @@ -2606,7 +2606,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_URSARING] = { - .categoryName = _("HIBERNATOR"), + .categoryName = _("Hibernator"), .height = 18, .weight = 1258, .description = gUrsaringPokedexText, @@ -2618,7 +2618,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_SLUGMA] = { - .categoryName = _("LAVA"), + .categoryName = _("Lava"), .height = 7, .weight = 350, .description = gSlugmaPokedexText, @@ -2630,7 +2630,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_MAGCARGO] = { - .categoryName = _("LAVA"), + .categoryName = _("Lava"), .height = 8, .weight = 550, .description = gMagcargoPokedexText, @@ -2642,7 +2642,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_SWINUB] = { - .categoryName = _("PIG"), + .categoryName = _("Pig"), .height = 4, .weight = 65, .description = gSwinubPokedexText, @@ -2654,7 +2654,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_PILOSWINE] = { - .categoryName = _("SWINE"), + .categoryName = _("Swine"), .height = 11, .weight = 558, .description = gPiloswinePokedexText, @@ -2666,7 +2666,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_CORSOLA] = { - .categoryName = _("CORAL"), + .categoryName = _("Coral"), .height = 6, .weight = 50, .description = gCorsolaPokedexText, @@ -2678,7 +2678,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_REMORAID] = { - .categoryName = _("JET"), + .categoryName = _("Jet"), .height = 6, .weight = 120, .description = gRemoraidPokedexText, @@ -2690,7 +2690,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_OCTILLERY] = { - .categoryName = _("JET"), + .categoryName = _("Jet"), .height = 9, .weight = 285, .description = gOctilleryPokedexText, @@ -2702,7 +2702,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_DELIBIRD] = { - .categoryName = _("DELIVERY"), + .categoryName = _("Delivery"), .height = 9, .weight = 160, .description = gDelibirdPokedexText, @@ -2714,7 +2714,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_MANTINE] = { - .categoryName = _("KITE"), + .categoryName = _("Kite"), .height = 21, .weight = 2200, .description = gMantinePokedexText, @@ -2726,7 +2726,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_SKARMORY] = { - .categoryName = _("ARMOR BIRD"), + .categoryName = _("Armor Bird"), .height = 17, .weight = 505, .description = gSkarmoryPokedexText, @@ -2738,7 +2738,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_HOUNDOUR] = { - .categoryName = _("DARK"), + .categoryName = _("Dark"), .height = 6, .weight = 108, .description = gHoundourPokedexText, @@ -2750,7 +2750,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_HOUNDOOM] = { - .categoryName = _("DARK"), + .categoryName = _("Dark"), .height = 14, .weight = 350, .description = gHoundoomPokedexText, @@ -2762,7 +2762,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_KINGDRA] = { - .categoryName = _("DRAGON"), + .categoryName = _("Dragon"), .height = 18, .weight = 1520, .description = gKingdraPokedexText, @@ -2774,7 +2774,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_PHANPY] = { - .categoryName = _("LONG NOSE"), + .categoryName = _("Long Nose"), .height = 5, .weight = 335, .description = gPhanpyPokedexText, @@ -2786,7 +2786,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_DONPHAN] = { - .categoryName = _("ARMOR"), + .categoryName = _("Armor"), .height = 11, .weight = 1200, .description = gDonphanPokedexText, @@ -2798,7 +2798,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_PORYGON2] = { - .categoryName = _("VIRTUAL"), + .categoryName = _("Virtual"), .height = 6, .weight = 325, .description = gPorygon2PokedexText, @@ -2810,7 +2810,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_STANTLER] = { - .categoryName = _("BIG HORN"), + .categoryName = _("Big Horn"), .height = 14, .weight = 712, .description = gStantlerPokedexText, @@ -2822,7 +2822,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_SMEARGLE] = { - .categoryName = _("PAINTER"), + .categoryName = _("Painter"), .height = 12, .weight = 580, .description = gSmearglePokedexText, @@ -2834,7 +2834,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_TYROGUE] = { - .categoryName = _("SCUFFLE"), + .categoryName = _("Scuffle"), .height = 7, .weight = 210, .description = gTyroguePokedexText, @@ -2846,7 +2846,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_HITMONTOP] = { - .categoryName = _("HANDSTAND"), + .categoryName = _("Handstand"), .height = 14, .weight = 480, .description = gHitmontopPokedexText, @@ -2858,7 +2858,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_SMOOCHUM] = { - .categoryName = _("KISS"), + .categoryName = _("Kiss"), .height = 4, .weight = 60, .description = gSmoochumPokedexText, @@ -2870,7 +2870,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_ELEKID] = { - .categoryName = _("ELECTRIC"), + .categoryName = _("Electric"), .height = 6, .weight = 235, .description = gElekidPokedexText, @@ -2882,7 +2882,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_MAGBY] = { - .categoryName = _("LIVE COAL"), + .categoryName = _("Live Coal"), .height = 7, .weight = 214, .description = gMagbyPokedexText, @@ -2894,7 +2894,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_MILTANK] = { - .categoryName = _("MILK COW"), + .categoryName = _("Milk Cow"), .height = 12, .weight = 755, .description = gMiltankPokedexText, @@ -2906,7 +2906,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_BLISSEY] = { - .categoryName = _("HAPPINESS"), + .categoryName = _("Happiness"), .height = 15, .weight = 468, .description = gBlisseyPokedexText, @@ -2918,7 +2918,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_RAIKOU] = { - .categoryName = _("THUNDER"), + .categoryName = _("Thunder"), .height = 19, .weight = 1780, .description = gRaikouPokedexText, @@ -2930,7 +2930,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_ENTEI] = { - .categoryName = _("VOLCANO"), + .categoryName = _("Volcano"), .height = 21, .weight = 1980, .description = gEnteiPokedexText, @@ -2942,7 +2942,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_SUICUNE] = { - .categoryName = _("AURORA"), + .categoryName = _("Aurora"), .height = 20, .weight = 1870, .description = gSuicunePokedexText, @@ -2954,7 +2954,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_LARVITAR] = { - .categoryName = _("ROCK SKIN"), + .categoryName = _("Rock Skin"), .height = 6, .weight = 720, .description = gLarvitarPokedexText, @@ -2966,7 +2966,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_PUPITAR] = { - .categoryName = _("HARD SHELL"), + .categoryName = _("Hard Shell"), .height = 12, .weight = 1520, .description = gPupitarPokedexText, @@ -2978,7 +2978,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_TYRANITAR] = { - .categoryName = _("ARMOR"), + .categoryName = _("Armor"), .height = 20, .weight = 2020, .description = gTyranitarPokedexText, @@ -2990,7 +2990,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_LUGIA] = { - .categoryName = _("DIVING"), + .categoryName = _("Diving"), .height = 52, .weight = 2160, .description = gLugiaPokedexText, @@ -3002,7 +3002,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_HO_OH] = { - .categoryName = _("RAINBOW"), + .categoryName = _("Rainbow"), .height = 38, .weight = 1990, .description = gHoOhPokedexText, @@ -3014,7 +3014,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_CELEBI] = { - .categoryName = _("TIME TRAVEL"), + .categoryName = _("Time Travel"), .height = 6, .weight = 50, .description = gCelebiPokedexText, @@ -3026,7 +3026,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_TREECKO] = { - .categoryName = _("WOOD GECKO"), + .categoryName = _("Wood Gecko"), .height = 5, .weight = 50, .description = gTreeckoPokedexText, @@ -3038,7 +3038,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_GROVYLE] = { - .categoryName = _("WOOD GECKO"), + .categoryName = _("Wood Gecko"), .height = 9, .weight = 216, .description = gGrovylePokedexText, @@ -3050,7 +3050,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_SCEPTILE] = { - .categoryName = _("FOREST"), + .categoryName = _("Forest"), .height = 17, .weight = 522, .description = gSceptilePokedexText, @@ -3062,7 +3062,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_TORCHIC] = { - .categoryName = _("CHICK"), + .categoryName = _("Chick"), .height = 4, .weight = 25, .description = gTorchicPokedexText, @@ -3074,7 +3074,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_COMBUSKEN] = { - .categoryName = _("YOUNG FOWL"), + .categoryName = _("Young Fowl"), .height = 9, .weight = 195, .description = gCombuskenPokedexText, @@ -3086,7 +3086,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_BLAZIKEN] = { - .categoryName = _("BLAZE"), + .categoryName = _("Blaze"), .height = 19, .weight = 520, .description = gBlazikenPokedexText, @@ -3098,7 +3098,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_MUDKIP] = { - .categoryName = _("MUD FISH"), + .categoryName = _("Mud Fish"), .height = 4, .weight = 76, .description = gMudkipPokedexText, @@ -3110,7 +3110,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_MARSHTOMP] = { - .categoryName = _("MUD FISH"), + .categoryName = _("Mud Fish"), .height = 7, .weight = 280, .description = gMarshtompPokedexText, @@ -3122,7 +3122,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_SWAMPERT] = { - .categoryName = _("MUD FISH"), + .categoryName = _("Mud Fish"), .height = 15, .weight = 819, .description = gSwampertPokedexText, @@ -3134,7 +3134,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_POOCHYENA] = { - .categoryName = _("BITE"), + .categoryName = _("Bite"), .height = 5, .weight = 136, .description = gPoochyenaPokedexText, @@ -3146,7 +3146,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_MIGHTYENA] = { - .categoryName = _("BITE"), + .categoryName = _("Bite"), .height = 10, .weight = 370, .description = gMightyenaPokedexText, @@ -3158,7 +3158,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_ZIGZAGOON] = { - .categoryName = _("TINYRACCOON"), + .categoryName = _("Tiny Raccoon"), .height = 4, .weight = 175, .description = gZigzagoonPokedexText, @@ -3170,7 +3170,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_LINOONE] = { - .categoryName = _("RUSHING"), + .categoryName = _("Rushing"), .height = 5, .weight = 325, .description = gLinoonePokedexText, @@ -3182,7 +3182,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_WURMPLE] = { - .categoryName = _("WORM"), + .categoryName = _("Worm"), .height = 3, .weight = 36, .description = gWurmplePokedexText, @@ -3194,7 +3194,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_SILCOON] = { - .categoryName = _("COCOON"), + .categoryName = _("Cocoon"), .height = 6, .weight = 100, .description = gSilcoonPokedexText, @@ -3206,7 +3206,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_BEAUTIFLY] = { - .categoryName = _("BUTTERFLY"), + .categoryName = _("Butterfly"), .height = 10, .weight = 284, .description = gBeautiflyPokedexText, @@ -3218,7 +3218,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_CASCOON] = { - .categoryName = _("COCOON"), + .categoryName = _("Cocoon"), .height = 7, .weight = 115, .description = gCascoonPokedexText, @@ -3230,7 +3230,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_DUSTOX] = { - .categoryName = _("POISON MOTH"), + .categoryName = _("Poison Moth"), .height = 12, .weight = 316, .description = gDustoxPokedexText, @@ -3242,7 +3242,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_LOTAD] = { - .categoryName = _("WATER WEED"), + .categoryName = _("Water Weed"), .height = 5, .weight = 26, .description = gLotadPokedexText, @@ -3254,7 +3254,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_LOMBRE] = { - .categoryName = _("JOLLY"), + .categoryName = _("Jolly"), .height = 12, .weight = 325, .description = gLombrePokedexText, @@ -3266,7 +3266,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_LUDICOLO] = { - .categoryName = _("CAREFREE"), + .categoryName = _("Carefree"), .height = 15, .weight = 550, .description = gLudicoloPokedexText, @@ -3278,7 +3278,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_SEEDOT] = { - .categoryName = _("ACORN"), + .categoryName = _("Acorn"), .height = 5, .weight = 40, .description = gSeedotPokedexText, @@ -3290,7 +3290,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_NUZLEAF] = { - .categoryName = _("WILY"), + .categoryName = _("Wily"), .height = 10, .weight = 280, .description = gNuzleafPokedexText, @@ -3302,7 +3302,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_SHIFTRY] = { - .categoryName = _("WICKED"), + .categoryName = _("Wicked"), .height = 13, .weight = 596, .description = gShiftryPokedexText, @@ -3314,7 +3314,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_TAILLOW] = { - .categoryName = _("TINYSWALLOW"), + .categoryName = _("Tiny Swallow"), .height = 3, .weight = 23, .description = gTaillowPokedexText, @@ -3326,7 +3326,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_SWELLOW] = { - .categoryName = _("SWALLOW"), + .categoryName = _("Swallow"), .height = 7, .weight = 198, .description = gSwellowPokedexText, @@ -3338,7 +3338,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_WINGULL] = { - .categoryName = _("SEAGULL"), + .categoryName = _("Seagull"), .height = 6, .weight = 95, .description = gWingullPokedexText, @@ -3350,7 +3350,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_PELIPPER] = { - .categoryName = _("WATER BIRD"), + .categoryName = _("Water Bird"), .height = 12, .weight = 280, .description = gPelipperPokedexText, @@ -3362,7 +3362,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_RALTS] = { - .categoryName = _("FEELING"), + .categoryName = _("Feeling"), .height = 4, .weight = 66, .description = gRaltsPokedexText, @@ -3374,7 +3374,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_KIRLIA] = { - .categoryName = _("EMOTION"), + .categoryName = _("Emotion"), .height = 8, .weight = 202, .description = gKirliaPokedexText, @@ -3386,7 +3386,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_GARDEVOIR] = { - .categoryName = _("EMBRACE"), + .categoryName = _("Embrace"), .height = 16, .weight = 484, .description = gGardevoirPokedexText, @@ -3398,7 +3398,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_SURSKIT] = { - .categoryName = _("POND SKATER"), + .categoryName = _("Pond Skater"), .height = 5, .weight = 17, .description = gSurskitPokedexText, @@ -3410,7 +3410,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_MASQUERAIN] = { - .categoryName = _("EYEBALL"), + .categoryName = _("Eyeball"), .height = 8, .weight = 36, .description = gMasquerainPokedexText, @@ -3422,7 +3422,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_SHROOMISH] = { - .categoryName = _("MUSHROOM"), + .categoryName = _("Mushroom"), .height = 4, .weight = 45, .description = gShroomishPokedexText, @@ -3434,7 +3434,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_BRELOOM] = { - .categoryName = _("MUSHROOM"), + .categoryName = _("Mushroom"), .height = 12, .weight = 392, .description = gBreloomPokedexText, @@ -3446,7 +3446,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_SLAKOTH] = { - .categoryName = _("SLACKER"), + .categoryName = _("Slacker"), .height = 8, .weight = 240, .description = gSlakothPokedexText, @@ -3458,7 +3458,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_VIGOROTH] = { - .categoryName = _("WILD MONKEY"), + .categoryName = _("Wild Monkey"), .height = 14, .weight = 465, .description = gVigorothPokedexText, @@ -3470,7 +3470,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_SLAKING] = { - .categoryName = _("LAZY"), + .categoryName = _("Lazy"), .height = 20, .weight = 1305, .description = gSlakingPokedexText, @@ -3482,7 +3482,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_NINCADA] = { - .categoryName = _("TRAINEE"), + .categoryName = _("Trainee"), .height = 5, .weight = 55, .description = gNincadaPokedexText, @@ -3494,7 +3494,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_NINJASK] = { - .categoryName = _("NINJA"), + .categoryName = _("Ninja"), .height = 8, .weight = 120, .description = gNinjaskPokedexText, @@ -3506,7 +3506,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_SHEDINJA] = { - .categoryName = _("SHED"), + .categoryName = _("Shed"), .height = 8, .weight = 12, .description = gShedinjaPokedexText, @@ -3518,7 +3518,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_WHISMUR] = { - .categoryName = _("WHISPER"), + .categoryName = _("Whisper"), .height = 6, .weight = 163, .description = gWhismurPokedexText, @@ -3530,7 +3530,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_LOUDRED] = { - .categoryName = _("BIG VOICE"), + .categoryName = _("Big Voice"), .height = 10, .weight = 405, .description = gLoudredPokedexText, @@ -3542,7 +3542,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_EXPLOUD] = { - .categoryName = _("LOUD NOISE"), + .categoryName = _("Loud Noise"), .height = 15, .weight = 840, .description = gExploudPokedexText, @@ -3554,7 +3554,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_MAKUHITA] = { - .categoryName = _("GUTS"), + .categoryName = _("Guts"), .height = 10, .weight = 864, .description = gMakuhitaPokedexText, @@ -3566,7 +3566,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_HARIYAMA] = { - .categoryName = _("ARM THRUST"), + .categoryName = _("Arm Thrust"), .height = 23, .weight = 2538, .description = gHariyamaPokedexText, @@ -3578,7 +3578,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_AZURILL] = { - .categoryName = _("POLKA DOT"), + .categoryName = _("Polka Dot"), .height = 2, .weight = 20, .description = gAzurillPokedexText, @@ -3590,7 +3590,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_NOSEPASS] = { - .categoryName = _("COMPASS"), + .categoryName = _("Compass"), .height = 10, .weight = 970, .description = gNosepassPokedexText, @@ -3602,7 +3602,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_SKITTY] = { - .categoryName = _("KITTEN"), + .categoryName = _("Kitten"), .height = 6, .weight = 110, .description = gSkittyPokedexText, @@ -3614,7 +3614,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_DELCATTY] = { - .categoryName = _("PRIM"), + .categoryName = _("Prim"), .height = 11, .weight = 326, .description = gDelcattyPokedexText, @@ -3626,7 +3626,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_SABLEYE] = { - .categoryName = _("DARKNESS"), + .categoryName = _("Darkness"), .height = 5, .weight = 110, .description = gSableyePokedexText, @@ -3638,7 +3638,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_MAWILE] = { - .categoryName = _("DECEIVER"), + .categoryName = _("Deceiver"), .height = 6, .weight = 115, .description = gMawilePokedexText, @@ -3650,7 +3650,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_ARON] = { - .categoryName = _("IRON ARMOR"), + .categoryName = _("Iron Armor"), .height = 4, .weight = 600, .description = gAronPokedexText, @@ -3662,7 +3662,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_LAIRON] = { - .categoryName = _("IRON ARMOR"), + .categoryName = _("Iron Armor"), .height = 9, .weight = 1200, .description = gLaironPokedexText, @@ -3674,7 +3674,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_AGGRON] = { - .categoryName = _("IRON ARMOR"), + .categoryName = _("Iron Armor"), .height = 21, .weight = 3600, .description = gAggronPokedexText, @@ -3686,7 +3686,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_MEDITITE] = { - .categoryName = _("MEDITATE"), + .categoryName = _("Meditate"), .height = 6, .weight = 112, .description = gMedititePokedexText, @@ -3698,7 +3698,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_MEDICHAM] = { - .categoryName = _("MEDITATE"), + .categoryName = _("Meditate"), .height = 13, .weight = 315, .description = gMedichamPokedexText, @@ -3710,7 +3710,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_ELECTRIKE] = { - .categoryName = _("LIGHTNING"), + .categoryName = _("Lightning"), .height = 6, .weight = 152, .description = gElectrikePokedexText, @@ -3722,7 +3722,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_MANECTRIC] = { - .categoryName = _("DISCHARGE"), + .categoryName = _("Discharge"), .height = 15, .weight = 402, .description = gManectricPokedexText, @@ -3734,7 +3734,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_PLUSLE] = { - .categoryName = _("CHEERING"), + .categoryName = _("Cheering"), .height = 4, .weight = 42, .description = gPluslePokedexText, @@ -3746,7 +3746,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_MINUN] = { - .categoryName = _("CHEERING"), + .categoryName = _("Cheering"), .height = 4, .weight = 42, .description = gMinunPokedexText, @@ -3758,7 +3758,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_VOLBEAT] = { - .categoryName = _("FIREFLY"), + .categoryName = _("Firefly"), .height = 7, .weight = 177, .description = gVolbeatPokedexText, @@ -3770,7 +3770,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_ILLUMISE] = { - .categoryName = _("FIREFLY"), + .categoryName = _("Firefly"), .height = 6, .weight = 177, .description = gIllumisePokedexText, @@ -3782,7 +3782,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_ROSELIA] = { - .categoryName = _("THORN"), + .categoryName = _("Thorn"), .height = 3, .weight = 20, .description = gRoseliaPokedexText, @@ -3794,7 +3794,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_GULPIN] = { - .categoryName = _("STOMACH"), + .categoryName = _("Stomach"), .height = 4, .weight = 103, .description = gGulpinPokedexText, @@ -3806,7 +3806,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_SWALOT] = { - .categoryName = _("POISON BAG"), + .categoryName = _("Poison Bag"), .height = 17, .weight = 800, .description = gSwalotPokedexText, @@ -3818,7 +3818,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_CARVANHA] = { - .categoryName = _("SAVAGE"), + .categoryName = _("Savage"), .height = 8, .weight = 208, .description = gCarvanhaPokedexText, @@ -3830,7 +3830,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_SHARPEDO] = { - .categoryName = _("BRUTAL"), + .categoryName = _("Brutal"), .height = 18, .weight = 888, .description = gSharpedoPokedexText, @@ -3842,7 +3842,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_WAILMER] = { - .categoryName = _("BALL WHALE"), + .categoryName = _("Ball Whale"), .height = 20, .weight = 1300, .description = gWailmerPokedexText, @@ -3854,7 +3854,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_WAILORD] = { - .categoryName = _("FLOAT WHALE"), + .categoryName = _("Float Whale"), .height = 145, .weight = 3980, .description = gWailordPokedexText, @@ -3866,7 +3866,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_NUMEL] = { - .categoryName = _("NUMB"), + .categoryName = _("Numb"), .height = 7, .weight = 240, .description = gNumelPokedexText, @@ -3878,7 +3878,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_CAMERUPT] = { - .categoryName = _("ERUPTION"), + .categoryName = _("Eruption"), .height = 19, .weight = 2200, .description = gCameruptPokedexText, @@ -3890,7 +3890,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_TORKOAL] = { - .categoryName = _("COAL"), + .categoryName = _("Coal"), .height = 5, .weight = 804, .description = gTorkoalPokedexText, @@ -3902,7 +3902,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_SPOINK] = { - .categoryName = _("BOUNCE"), + .categoryName = _("Bounce"), .height = 7, .weight = 306, .description = gSpoinkPokedexText, @@ -3914,7 +3914,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_GRUMPIG] = { - .categoryName = _("MANIPULATE"), + .categoryName = _("Manipulate"), .height = 9, .weight = 715, .description = gGrumpigPokedexText, @@ -3926,7 +3926,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_SPINDA] = { - .categoryName = _("SPOT PANDA"), + .categoryName = _("Spot Panda"), .height = 11, .weight = 50, .description = gSpindaPokedexText, @@ -3938,7 +3938,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_TRAPINCH] = { - .categoryName = _("ANT PIT"), + .categoryName = _("Ant Pit"), .height = 7, .weight = 150, .description = gTrapinchPokedexText, @@ -3950,7 +3950,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_VIBRAVA] = { - .categoryName = _("VIBRATION"), + .categoryName = _("Vibration"), .height = 11, .weight = 153, .description = gVibravaPokedexText, @@ -3962,7 +3962,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_FLYGON] = { - .categoryName = _("MYSTIC"), + .categoryName = _("Mystic"), .height = 20, .weight = 820, .description = gFlygonPokedexText, @@ -3974,7 +3974,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_CACNEA] = { - .categoryName = _("CACTUS"), + .categoryName = _("Cactus"), .height = 4, .weight = 513, .description = gCacneaPokedexText, @@ -3986,7 +3986,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_CACTURNE] = { - .categoryName = _("SCARECROW"), + .categoryName = _("Scarecrow"), .height = 13, .weight = 774, .description = gCacturnePokedexText, @@ -3998,7 +3998,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_SWABLU] = { - .categoryName = _("COTTON BIRD"), + .categoryName = _("Cotton Bird"), .height = 4, .weight = 12, .description = gSwabluPokedexText, @@ -4010,7 +4010,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_ALTARIA] = { - .categoryName = _("HUMMING"), + .categoryName = _("Humming"), .height = 11, .weight = 206, .description = gAltariaPokedexText, @@ -4022,7 +4022,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_ZANGOOSE] = { - .categoryName = _("CAT FERRET"), + .categoryName = _("Cat Ferret"), .height = 13, .weight = 403, .description = gZangoosePokedexText, @@ -4034,7 +4034,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_SEVIPER] = { - .categoryName = _("FANG SNAKE"), + .categoryName = _("Fang Snake"), .height = 27, .weight = 525, .description = gSeviperPokedexText, @@ -4046,7 +4046,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_LUNATONE] = { - .categoryName = _("METEORITE"), + .categoryName = _("Meteorite"), .height = 10, .weight = 1680, .description = gLunatonePokedexText, @@ -4058,7 +4058,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_SOLROCK] = { - .categoryName = _("METEORITE"), + .categoryName = _("Meteorite"), .height = 12, .weight = 1540, .description = gSolrockPokedexText, @@ -4070,7 +4070,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_BARBOACH] = { - .categoryName = _("WHISKERS"), + .categoryName = _("Whiskers"), .height = 4, .weight = 19, .description = gBarboachPokedexText, @@ -4082,7 +4082,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_WHISCASH] = { - .categoryName = _("WHISKERS"), + .categoryName = _("Whiskers"), .height = 9, .weight = 236, .description = gWhiscashPokedexText, @@ -4094,7 +4094,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_CORPHISH] = { - .categoryName = _("RUFFIAN"), + .categoryName = _("Ruffian"), .height = 6, .weight = 115, .description = gCorphishPokedexText, @@ -4106,7 +4106,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_CRAWDAUNT] = { - .categoryName = _("ROGUE"), + .categoryName = _("Rogue"), .height = 11, .weight = 328, .description = gCrawdauntPokedexText, @@ -4118,7 +4118,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_BALTOY] = { - .categoryName = _("CLAY DOLL"), + .categoryName = _("Clay Doll"), .height = 5, .weight = 215, .description = gBaltoyPokedexText, @@ -4130,7 +4130,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_CLAYDOL] = { - .categoryName = _("CLAY DOLL"), + .categoryName = _("Clay Doll"), .height = 15, .weight = 1080, .description = gClaydolPokedexText, @@ -4142,7 +4142,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_LILEEP] = { - .categoryName = _("SEA LILY"), + .categoryName = _("Sea Lily"), .height = 10, .weight = 238, .description = gLileepPokedexText, @@ -4154,7 +4154,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_CRADILY] = { - .categoryName = _("BARNACLE"), + .categoryName = _("Barnacle"), .height = 15, .weight = 604, .description = gCradilyPokedexText, @@ -4166,7 +4166,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_ANORITH] = { - .categoryName = _("OLD SHRIMP"), + .categoryName = _("Old Shrimp"), .height = 7, .weight = 125, .description = gAnorithPokedexText, @@ -4178,7 +4178,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_ARMALDO] = { - .categoryName = _("PLATE"), + .categoryName = _("Plate"), .height = 15, .weight = 682, .description = gArmaldoPokedexText, @@ -4190,7 +4190,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_FEEBAS] = { - .categoryName = _("FISH"), + .categoryName = _("Fish"), .height = 6, .weight = 74, .description = gFeebasPokedexText, @@ -4202,7 +4202,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_MILOTIC] = { - .categoryName = _("TENDER"), + .categoryName = _("Tender"), .height = 62, .weight = 1620, .description = gMiloticPokedexText, @@ -4214,7 +4214,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_CASTFORM] = { - .categoryName = _("WEATHER"), + .categoryName = _("Weather"), .height = 3, .weight = 8, .description = gCastformPokedexText, @@ -4226,7 +4226,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_KECLEON] = { - .categoryName = _("COLOR SWAP"), + .categoryName = _("Color Swap"), .height = 10, .weight = 220, .description = gKecleonPokedexText, @@ -4238,7 +4238,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_SHUPPET] = { - .categoryName = _("PUPPET"), + .categoryName = _("Puppet"), .height = 6, .weight = 23, .description = gShuppetPokedexText, @@ -4250,7 +4250,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_BANETTE] = { - .categoryName = _("MARIONETTE"), + .categoryName = _("Marionette"), .height = 11, .weight = 125, .description = gBanettePokedexText, @@ -4262,7 +4262,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_DUSKULL] = { - .categoryName = _("REQUIEM"), + .categoryName = _("Requiem"), .height = 8, .weight = 150, .description = gDuskullPokedexText, @@ -4274,7 +4274,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_DUSCLOPS] = { - .categoryName = _("BECKON"), + .categoryName = _("Beckon"), .height = 16, .weight = 306, .description = gDusclopsPokedexText, @@ -4286,7 +4286,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_TROPIUS] = { - .categoryName = _("FRUIT"), + .categoryName = _("Fruit"), .height = 20, .weight = 1000, .description = gTropiusPokedexText, @@ -4298,7 +4298,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_CHIMECHO] = { - .categoryName = _("WIND CHIME"), + .categoryName = _("Wind Chime"), .height = 6, .weight = 10, .description = gChimechoPokedexText, @@ -4310,7 +4310,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_ABSOL] = { - .categoryName = _("DISASTER"), + .categoryName = _("Disaster"), .height = 12, .weight = 470, .description = gAbsolPokedexText, @@ -4322,7 +4322,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_WYNAUT] = { - .categoryName = _("BRIGHT"), + .categoryName = _("Bright"), .height = 6, .weight = 140, .description = gWynautPokedexText, @@ -4334,7 +4334,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_SNORUNT] = { - .categoryName = _("SNOW HAT"), + .categoryName = _("Snow Hat"), .height = 7, .weight = 168, .description = gSnoruntPokedexText, @@ -4346,7 +4346,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_GLALIE] = { - .categoryName = _("FACE"), + .categoryName = _("Face"), .height = 15, .weight = 2565, .description = gGlaliePokedexText, @@ -4358,7 +4358,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_SPHEAL] = { - .categoryName = _("CLAP"), + .categoryName = _("Clap"), .height = 8, .weight = 395, .description = gSphealPokedexText, @@ -4370,7 +4370,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_SEALEO] = { - .categoryName = _("BALL ROLL"), + .categoryName = _("Ball Roll"), .height = 11, .weight = 876, .description = gSealeoPokedexText, @@ -4382,7 +4382,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_WALREIN] = { - .categoryName = _("ICE BREAK"), + .categoryName = _("Ice Break"), .height = 14, .weight = 1506, .description = gWalreinPokedexText, @@ -4394,7 +4394,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_CLAMPERL] = { - .categoryName = _("BIVALVE"), + .categoryName = _("Bivalve"), .height = 4, .weight = 525, .description = gClamperlPokedexText, @@ -4406,7 +4406,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_HUNTAIL] = { - .categoryName = _("DEEP SEA"), + .categoryName = _("Deep Sea"), .height = 17, .weight = 270, .description = gHuntailPokedexText, @@ -4418,7 +4418,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_GOREBYSS] = { - .categoryName = _("SOUTH SEA"), + .categoryName = _("South Sea"), .height = 18, .weight = 226, .description = gGorebyssPokedexText, @@ -4430,7 +4430,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_RELICANTH] = { - .categoryName = _("LONGEVITY"), + .categoryName = _("Longevity"), .height = 10, .weight = 234, .description = gRelicanthPokedexText, @@ -4442,7 +4442,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_LUVDISC] = { - .categoryName = _("RENDEZVOUS"), + .categoryName = _("Rendezvous"), .height = 6, .weight = 87, .description = gLuvdiscPokedexText, @@ -4454,7 +4454,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_BAGON] = { - .categoryName = _("ROCK HEAD"), + .categoryName = _("Rock Head"), .height = 6, .weight = 421, .description = gBagonPokedexText, @@ -4466,7 +4466,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_SHELGON] = { - .categoryName = _("ENDURANCE"), + .categoryName = _("Endurance"), .height = 11, .weight = 1105, .description = gShelgonPokedexText, @@ -4478,7 +4478,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_SALAMENCE] = { - .categoryName = _("DRAGON"), + .categoryName = _("Dragon"), .height = 15, .weight = 1026, .description = gSalamencePokedexText, @@ -4490,7 +4490,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_BELDUM] = { - .categoryName = _("IRON BALL"), + .categoryName = _("Iron Ball"), .height = 6, .weight = 952, .description = gBeldumPokedexText, @@ -4502,7 +4502,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_METANG] = { - .categoryName = _("IRON CLAW"), + .categoryName = _("Iron Claw"), .height = 12, .weight = 2025, .description = gMetangPokedexText, @@ -4514,7 +4514,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_METAGROSS] = { - .categoryName = _("IRON LEG"), + .categoryName = _("Iron Leg"), .height = 16, .weight = 5500, .description = gMetagrossPokedexText, @@ -4526,7 +4526,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_REGIROCK] = { - .categoryName = _("ROCK PEAK"), + .categoryName = _("Rock Peak"), .height = 17, .weight = 2300, .description = gRegirockPokedexText, @@ -4538,7 +4538,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_REGICE] = { - .categoryName = _("ICEBERG"), + .categoryName = _("Iceberg"), .height = 18, .weight = 1750, .description = gRegicePokedexText, @@ -4550,7 +4550,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_REGISTEEL] = { - .categoryName = _("IRON"), + .categoryName = _("Iron"), .height = 19, .weight = 2050, .description = gRegisteelPokedexText, @@ -4562,7 +4562,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_LATIAS] = { - .categoryName = _("EON"), + .categoryName = _("Eon"), .height = 14, .weight = 400, .description = gLatiasPokedexText, @@ -4574,7 +4574,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_LATIOS] = { - .categoryName = _("EON"), + .categoryName = _("Eon"), .height = 20, .weight = 600, .description = gLatiosPokedexText, @@ -4586,7 +4586,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_KYOGRE] = { - .categoryName = _("SEA BASIN"), + .categoryName = _("Sea Basin"), .height = 45, .weight = 3520, .description = gKyogrePokedexText, @@ -4598,7 +4598,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_GROUDON] = { - .categoryName = _("CONTINENT"), + .categoryName = _("Continent"), .height = 35, .weight = 9500, .description = gGroudonPokedexText, @@ -4610,7 +4610,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_RAYQUAZA] = { - .categoryName = _("SKY HIGH"), + .categoryName = _("Sky High"), .height = 70, .weight = 2065, .description = gRayquazaPokedexText, @@ -4622,7 +4622,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_JIRACHI] = { - .categoryName = _("WISH"), + .categoryName = _("Wish"), .height = 3, .weight = 11, .description = gJirachiPokedexText, @@ -4646,7 +4646,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_TURTWIG] = { - .categoryName = _("TinyLeaf"), + .categoryName = _("Tiny Leaf"), .height = 4, .weight = 102, .description = gTurtwigPokedexText, @@ -4790,7 +4790,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_BIDOOF] = { - .categoryName = _("PlumpMouse"), + .categoryName = _("Plump Mouse"), .height = 5, .weight = 200, .description = gBidoofPokedexText, @@ -4898,7 +4898,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_CRANIDOS] = { - .categoryName = _("Headbutt"), + .categoryName = _("Head Butt"), .height = 9, .weight = 315, .description = gCranidosPokedexText, @@ -4910,7 +4910,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_RAMPARDOS] = { - .categoryName = _("Headbutt"), + .categoryName = _("Head Butt"), .height = 16, .weight = 1025, .description = gRampardosPokedexText, @@ -5066,7 +5066,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_SHELLOS] = { - .categoryName = _("SeaSlug"), + .categoryName = _("Sea Slug"), .height = 3, .weight = 63, .description = gShellosPokedexText, @@ -5078,7 +5078,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_GASTRODON] = { - .categoryName = _("SeaSlug"), + .categoryName = _("Sea Slug"), .height = 9, .weight = 299, .description = gGastrodonPokedexText, @@ -5268,7 +5268,7 @@ const struct PokedexEntry gPokedexEntries[] = .trainerOffset = 0, }, - [NATIONAL_DEX_MIMEJR] = + [NATIONAL_DEX_MIME_JR] = { .categoryName = _("Mime"), .height = 6, @@ -5426,7 +5426,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_DRAPION] = { - .categoryName = _("Scorpion"), + .categoryName = _("Ogre Scorp"), .height = 13, .weight = 615, .description = gDrapionPokedexText, @@ -5666,7 +5666,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_GLISCOR] = { - .categoryName = _("Scorpion"), + .categoryName = _("Fang Scorp"), .height = 20, .weight = 425, .description = gGliscorPokedexText, @@ -6494,7 +6494,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_SWADLOON] = { - .categoryName = _("Leaf Wrapped"), + .categoryName = _("Leaf-Wrapped"), .height = 5, .weight = 73, .description = gSwadloonPokedexText, @@ -6554,7 +6554,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_COTTONEE] = { - .categoryName = _("CottonPuff"), + .categoryName = _("Cotton Puff"), .height = 3, .weight = 6, .description = gCottoneePokedexText, @@ -7406,7 +7406,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_ACCELGOR] = { - .categoryName = _("ShellOut"), + .categoryName = _("Shell Out"), .height = 8, .weight = 253, .description = gAccelgorPokedexText, @@ -9626,7 +9626,7 @@ const struct PokedexEntry gPokedexEntries[] = [NATIONAL_DEX_MARSHADOW] = { - .categoryName = _("Gloomdwelle"), + .categoryName = _("Gloomdwellr"), .height = 7, .weight = 222, .description = gMarshadowPokedexText, diff --git a/src/data/pokemon/pokedex_orders.h b/src/data/pokemon/pokedex_orders.h index 402e11b53..68b09bf9e 100644 --- a/src/data/pokemon/pokedex_orders.h +++ b/src/data/pokemon/pokedex_orders.h @@ -507,7 +507,7 @@ const u16 gPokedexOrder_Alphabetical[] = NATIONAL_DEX_MILCERY, NATIONAL_DEX_MILOTIC, NATIONAL_DEX_MILTANK, - NATIONAL_DEX_MIMEJR, + NATIONAL_DEX_MIME_JR, NATIONAL_DEX_MIMIKYU, NATIONAL_DEX_MINCCINO, NATIONAL_DEX_MINIOR, @@ -1248,7 +1248,7 @@ const u16 gPokedexOrder_Weight[] = NATIONAL_DEX_MORGREM, NATIONAL_DEX_IVYSAUR, //NATIONAL_DEX_BANETTE, // Mega - NATIONAL_DEX_MIMEJR, + NATIONAL_DEX_MIME_JR, NATIONAL_DEX_LAMPENT, //NATIONAL_DEX_TOGEDEMARU, // Totem-sized NATIONAL_DEX_BLACEPHALON, @@ -2260,7 +2260,7 @@ const u16 gPokedexOrder_Height[] = NATIONAL_DEX_BAGON, NATIONAL_DEX_BELDUM, NATIONAL_DEX_STARAVIA, - NATIONAL_DEX_MIMEJR, + NATIONAL_DEX_MIME_JR, NATIONAL_DEX_HAPPINY, NATIONAL_DEX_MUNCHLAX, NATIONAL_DEX_SNIVY, diff --git a/src/data/pokemon/pokedex_text.h b/src/data/pokemon/pokedex_text.h index 120c5abca..4403a6292 100644 --- a/src/data/pokemon/pokedex_text.h +++ b/src/data/pokemon/pokedex_text.h @@ -1,5 +1,5 @@ const u8 gDummyPokedexText[] = _( - "This is a newly discovered POKéMON.\n" + "This is a newly discovered Pokémon.\n" "It is currently under investigation.\n" "No detailed information is available\n" "at this time."); @@ -379,7 +379,7 @@ const u8 gPoliwrathPokedexText[] = _( const u8 gAbraPokedexText[] = _( "A Pokémon that sleeps 18 hours a day.\n" "Observation revealed that it uses\n" - "TELEPORT to change its location once\n" + "Teleport to change its location once\n" "every hour."); const u8 gKadabraPokedexText[] = _( @@ -491,7 +491,7 @@ const u8 gMagnemitePokedexText[] = _( "over 300 feet away."); const u8 gMagnetonPokedexText[] = _( - "It is actually three MAGNEMITE linked\n" + "It is actually three Magnemite linked\n" "by magnetism. It generates powerful radio\n" "waves that raise temperatures by 3.6\n" "degrees F within a 3,300-foot radius."); @@ -499,7 +499,7 @@ const u8 gMagnetonPokedexText[] = _( const u8 gFarfetchdPokedexText[] = _( "It is always seen with a stick from a plant.\n" "Apparently, there are good sticks and bad\n" - "sticks. This POKéMON occasionally fights\n" + "sticks. This Pokémon occasionally fights\n" "with others over choice sticks."); const u8 gDoduoPokedexText[] = _( @@ -509,33 +509,33 @@ const u8 gDoduoPokedexText[] = _( "over 60 miles per hour."); const u8 gDodrioPokedexText[] = _( - "A peculiar POKéMON species with three\n" + "A peculiar Pokémon species with three\n" "heads. It vigorously races across grassy\n" "plains even in arid seasons with little\n" "rainfall."); const u8 gSeelPokedexText[] = _( - "SEEL hunt for prey in frigid, ice-covered\n" + "Seel hunt for prey in frigid, ice-covered\n" "seas. When it needs to breathe, it punches\n" "a hole through the ice with the sharply\n" "protruding section of its head."); const u8 gDewgongPokedexText[] = _( "It loves to snooze on bitterly cold ice.\n" - "The sight of this POKéMON sleeping on\n" + "The sight of this Pokémon sleeping on\n" "a glacier was mistakenly thought to be\n" "a mermaid by a mariner long ago."); const u8 gGrimerPokedexText[] = _( "Born from polluted sludge in the sea,\n" - "GRIMER's favorite food is anything filthy.\n" + "Grimer's favorite food is anything filthy.\n" "They feed on wastewater pumped out from\n" "factories."); const u8 gMukPokedexText[] = _( "It prefers warm and humid habitats.\n" "In the summertime, the toxic substances\n" - "in its body intensify, making MUK reek like\n" + "in its body intensify, making Muk reek like\n" "putrid kitchen garbage."); const u8 gShellderPokedexText[] = _( @@ -547,47 +547,47 @@ const u8 gShellderPokedexText[] = _( const u8 gCloysterPokedexText[] = _( "It swims in the sea by swallowing water,\n" "then jetting it out toward the rear.\n" - "The CLOYSTER shoots spikes from its\n" + "The Cloyster shoots spikes from its\n" "shell using the same system."); const u8 gGastlyPokedexText[] = _( - "When exposed to a strong wind, a GASTLY's\n" + "When exposed to a strong wind, a Gastly's\n" "gaseous body quickly dwindles away.\n" "They cluster under the eaves of houses\n" "to escape the ravages of wind."); const u8 gHaunterPokedexText[] = _( - "If a HAUNTER beckons you while it is\n" + "If a Haunter beckons you while it is\n" "floating in darkness, don't approach it.\n" - "This POKéMON will try to lick you with its\n" + "This Pokémon will try to lick you with its\n" "tongue and steal your life away."); const u8 gGengarPokedexText[] = _( "Deep in the night, your shadow cast by\n" "a streetlight may suddenly overtake you.\n" - "It is actually a GENGAR running past\n" + "It is actually a Gengar running past\n" "you, pretending to be your shadow."); const u8 gOnixPokedexText[] = _( "There is a magnet in its brain that\n" - "prevents an ONIX from losing direction\n" + "prevents an Onix from losing direction\n" "while tunneling. As it grows older, its body\n" "becomes steadily rounder and smoother."); const u8 gDrowzeePokedexText[] = _( "If your nose becomes itchy while you are\n" - "sleeping, it's a sure sign that a DROWZEE is\n" + "sleeping, it's a sure sign that a Drowzee is\n" "standing above your pillow and trying to\n" "eat your dream through your nostrils."); const u8 gHypnoPokedexText[] = _( "The arcing movement and glitter of the\n" - "pendulum in a HYPNO's hand lull the foe\n" + "pendulum in a Hypno's hand lull the foe\n" "into deep hypnosis. While searching for\n" "prey, it polishes the pendulum."); const u8 gKrabbyPokedexText[] = _( - "KRABBY live in holes dug into beaches.\n" + "Krabby live in holes dug into beaches.\n" "On sandy shores with little in the way\n" "of food, they can be seen squabbling with\n" "each other over territory."); @@ -596,7 +596,7 @@ const u8 gKinglerPokedexText[] = _( "It waves its huge, oversized claw in the\n" "air to communicate with others.\n" "But since the claw is so heavy, this\n" - "POKéMON quickly tires."); + "Pokémon quickly tires."); const u8 gVoltorbPokedexText[] = _( "It bears an uncanny and unexplained\n" @@ -730,7 +730,7 @@ const u8 gStarmiePokedexText[] = _( "reflections of stars that twinkled on\n" "gentle waves at night."); -const u8 gMrmimePokedexText[] = _( +const u8 gMrMimePokedexText[] = _( "A Mr. Mime is a master of pantomime. It can\n" "convince others that something unseeable\n" "actually exists. Once believed, the\n" @@ -743,7 +743,7 @@ const u8 gScytherPokedexText[] = _( "in one wicked stroke."); const u8 gJynxPokedexText[] = _( - "A JYNX sashays rhythmically as if it were\n" + "A Jynx sashays rhythmically as if it were\n" "dancing. Its motions are so bouncingly\n" "alluring, people seeing it are compelled to\n" "shake their hips without noticing."); @@ -1069,7 +1069,7 @@ const u8 gNatuPokedexText[] = _( const u8 gXatuPokedexText[] = _( "It has the enigmatic power of foreseeing\n" "the future. Some people in different lands\n" - "have long believed that XATU are\n" + "have long believed that Xatu are\n" "emissaries from another world."); const u8 gMareepPokedexText[] = _( diff --git a/src/data/pokemon/tmhm_learnsets.h b/src/data/pokemon/tmhm_learnsets.h index 6013a93f0..30d46d59c 100644 --- a/src/data/pokemon/tmhm_learnsets.h +++ b/src/data/pokemon/tmhm_learnsets.h @@ -10829,7 +10829,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM46_THIEF) | TMHM(TM06_TOXIC)), - [SPECIES_MIMEJR] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_MIME_JR] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM31_BRICK_BREAK) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) @@ -17921,7 +17921,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM46_THIEF) | TMHM(TM06_TOXIC)), - [SPECIES_CRABOMINABLE]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_CRABOMINABLE] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM14_BLIZZARD) | TMHM(TM31_BRICK_BREAK) | TMHM(TM08_BULK_UP) @@ -19183,9 +19183,9 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM24_THUNDERBOLT) | TMHM(TM06_TOXIC)), //TMs of LGPE don't match with USUM - [SPECIES_MELTAN] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), + [SPECIES_MELTAN] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), - [SPECIES_MELMETAL] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), + [SPECIES_MELMETAL] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), [SPECIES_GROOKEY] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM42_FACADE) @@ -20193,7 +20193,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM22_SOLARBEAM) | TMHM(TM11_SUNNY_DAY)), - [SPECIES_RATTATA_ALOLAN] = TMHM_LEARNSET(TMHM(TM14_BLIZZARD) + [SPECIES_RATTATA_ALOLAN] = TMHM_LEARNSET(TMHM(TM14_BLIZZARD) | TMHM(HM01_CUT) | TMHM(TM28_DIG) | TMHM(TM42_FACADE) @@ -20206,7 +20206,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM12_TAUNT) | TMHM(TM06_TOXIC)), - [SPECIES_RATICATE_ALOLAN] = TMHM_LEARNSET(TMHM(TM14_BLIZZARD) + [SPECIES_RATICATE_ALOLAN] = TMHM_LEARNSET(TMHM(TM14_BLIZZARD) | TMHM(TM08_BULK_UP) | TMHM(HM01_CUT) | TMHM(TM28_DIG) @@ -20221,7 +20221,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM12_TAUNT) | TMHM(TM06_TOXIC)), - [SPECIES_RAICHU_ALOLAN] = TMHM_LEARNSET(TMHM(TM31_BRICK_BREAK) + [SPECIES_RAICHU_ALOLAN] = TMHM_LEARNSET(TMHM(TM31_BRICK_BREAK) | TMHM(TM04_CALM_MIND) | TMHM(TM28_DIG) | TMHM(TM42_FACADE) @@ -20239,7 +20239,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM25_THUNDER) | TMHM(TM06_TOXIC)), - [SPECIES_SANDSHREW_ALOLAN] = TMHM_LEARNSET(TMHM(TM14_BLIZZARD) + [SPECIES_SANDSHREW_ALOLAN] = TMHM_LEARNSET(TMHM(TM14_BLIZZARD) | TMHM(TM31_BRICK_BREAK) | TMHM(HM01_CUT) | TMHM(TM28_DIG) @@ -20253,7 +20253,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(HM04_STRENGTH) | TMHM(TM06_TOXIC)), - [SPECIES_SANDSLASH_ALOLAN] = TMHM_LEARNSET(TMHM(TM14_BLIZZARD) + [SPECIES_SANDSLASH_ALOLAN] = TMHM_LEARNSET(TMHM(TM14_BLIZZARD) | TMHM(TM31_BRICK_BREAK) | TMHM(HM01_CUT) | TMHM(TM28_DIG) @@ -20268,7 +20268,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(HM04_STRENGTH) | TMHM(TM06_TOXIC)), - [SPECIES_VULPIX_ALOLAN] = TMHM_LEARNSET(TMHM(TM14_BLIZZARD) + [SPECIES_VULPIX_ALOLAN] = TMHM_LEARNSET(TMHM(TM14_BLIZZARD) | TMHM(TM28_DIG) | TMHM(TM42_FACADE) | TMHM(TM13_ICE_BEAM) @@ -20278,7 +20278,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM44_REST) | TMHM(TM06_TOXIC)), - [SPECIES_NINETALES_ALOLAN] = TMHM_LEARNSET(TMHM(TM14_BLIZZARD) + [SPECIES_NINETALES_ALOLAN] = TMHM_LEARNSET(TMHM(TM14_BLIZZARD) | TMHM(TM04_CALM_MIND) | TMHM(TM28_DIG) | TMHM(TM42_FACADE) @@ -20290,7 +20290,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM44_REST) | TMHM(TM06_TOXIC)), - [SPECIES_DIGLETT_ALOLAN] = TMHM_LEARNSET(TMHM(HM01_CUT) + [SPECIES_DIGLETT_ALOLAN] = TMHM_LEARNSET(TMHM(HM01_CUT) | TMHM(TM28_DIG) | TMHM(TM26_EARTHQUAKE) | TMHM(TM42_FACADE) @@ -20300,7 +20300,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM36_SLUDGE_BOMB) | TMHM(TM06_TOXIC)), - [SPECIES_DUGTRIO_ALOLAN] = TMHM_LEARNSET(TMHM(HM01_CUT) + [SPECIES_DUGTRIO_ALOLAN] = TMHM_LEARNSET(TMHM(HM01_CUT) | TMHM(TM28_DIG) | TMHM(TM26_EARTHQUAKE) | TMHM(TM42_FACADE) @@ -20311,7 +20311,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM36_SLUDGE_BOMB) | TMHM(TM06_TOXIC)), - [SPECIES_MEOWTH_ALOLAN] = TMHM_LEARNSET(TMHM(HM01_CUT) + [SPECIES_MEOWTH_ALOLAN] = TMHM_LEARNSET(TMHM(HM01_CUT) | TMHM(TM42_FACADE) | TMHM(HM05_FLASH) | TMHM(TM23_IRON_TAIL) @@ -20323,7 +20323,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM25_THUNDER) | TMHM(TM06_TOXIC)), - [SPECIES_PERSIAN_ALOLAN] = TMHM_LEARNSET(TMHM(HM01_CUT) + [SPECIES_PERSIAN_ALOLAN] = TMHM_LEARNSET(TMHM(HM01_CUT) | TMHM(TM42_FACADE) | TMHM(HM05_FLASH) | TMHM(TM15_HYPER_BEAM) @@ -20336,7 +20336,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM25_THUNDER) | TMHM(TM06_TOXIC)), - [SPECIES_GEODUDE_ALOLAN] = TMHM_LEARNSET(TMHM(TM31_BRICK_BREAK) + [SPECIES_GEODUDE_ALOLAN] = TMHM_LEARNSET(TMHM(TM31_BRICK_BREAK) | TMHM(TM28_DIG) | TMHM(TM42_FACADE) | TMHM(TM38_FIRE_BLAST) @@ -20350,7 +20350,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM25_THUNDER) | TMHM(TM06_TOXIC)), - [SPECIES_GRAVELER_ALOLAN] = TMHM_LEARNSET(TMHM(TM31_BRICK_BREAK) + [SPECIES_GRAVELER_ALOLAN] = TMHM_LEARNSET(TMHM(TM31_BRICK_BREAK) | TMHM(TM28_DIG) | TMHM(TM26_EARTHQUAKE) | TMHM(TM42_FACADE) @@ -20364,7 +20364,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM25_THUNDER) | TMHM(TM06_TOXIC)), - [SPECIES_GOLEM_ALOLAN] = TMHM_LEARNSET(TMHM(TM31_BRICK_BREAK) + [SPECIES_GOLEM_ALOLAN] = TMHM_LEARNSET(TMHM(TM31_BRICK_BREAK) | TMHM(TM28_DIG) | TMHM(TM26_EARTHQUAKE) | TMHM(TM42_FACADE) @@ -20379,7 +20379,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM25_THUNDER) | TMHM(TM06_TOXIC)), - [SPECIES_GRIMER_ALOLAN] = TMHM_LEARNSET(TMHM(TM28_DIG) + [SPECIES_GRIMER_ALOLAN] = TMHM_LEARNSET(TMHM(TM28_DIG) | TMHM(TM42_FACADE) | TMHM(TM38_FIRE_BLAST) | TMHM(TM35_FLAMETHROWER) @@ -20391,7 +20391,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM12_TAUNT) | TMHM(TM06_TOXIC)), - [SPECIES_MUK_ALOLAN] = TMHM_LEARNSET(TMHM(TM31_BRICK_BREAK) + [SPECIES_MUK_ALOLAN] = TMHM_LEARNSET(TMHM(TM31_BRICK_BREAK) | TMHM(TM28_DIG) | TMHM(TM42_FACADE) | TMHM(TM38_FIRE_BLAST) @@ -20406,7 +20406,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM12_TAUNT) | TMHM(TM06_TOXIC)), - [SPECIES_EXEGGUTOR_ALOLAN] = TMHM_LEARNSET(TMHM(TM31_BRICK_BREAK) + [SPECIES_EXEGGUTOR_ALOLAN] = TMHM_LEARNSET(TMHM(TM31_BRICK_BREAK) | TMHM(TM26_EARTHQUAKE) | TMHM(TM42_FACADE) | TMHM(TM35_FLAMETHROWER) @@ -20423,7 +20423,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(HM04_STRENGTH) | TMHM(TM06_TOXIC)), - [SPECIES_MAROWAK_ALOLAN] = TMHM_LEARNSET(TMHM(TM14_BLIZZARD) + [SPECIES_MAROWAK_ALOLAN] = TMHM_LEARNSET(TMHM(TM14_BLIZZARD) | TMHM(TM31_BRICK_BREAK) | TMHM(TM28_DIG) | TMHM(TM26_EARTHQUAKE) @@ -20442,7 +20442,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM25_THUNDER) | TMHM(TM06_TOXIC)), - [SPECIES_MEOWTH_GALARIAN]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_MEOWTH_GALARIAN] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM28_DIG) | TMHM(TM42_FACADE) | TMHM(TM23_IRON_TAIL) @@ -20456,7 +20456,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM25_THUNDER) | TMHM(TM24_THUNDERBOLT)), - [SPECIES_PONYTA_GALARIAN]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_PONYTA_GALARIAN] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM42_FACADE) | TMHM(TM23_IRON_TAIL) @@ -20464,7 +20464,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM29_PSYCHIC) | TMHM(TM44_REST)), - [SPECIES_RAPIDASH_GALARIAN]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_RAPIDASH_GALARIAN] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM42_FACADE) | TMHM(TM15_HYPER_BEAM) @@ -20473,7 +20473,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM29_PSYCHIC) | TMHM(TM44_REST)), - [SPECIES_SLOWPOKE_GALARIAN]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_SLOWPOKE_GALARIAN] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM14_BLIZZARD) | TMHM(TM04_CALM_MIND) | TMHM(TM28_DIG) @@ -20497,7 +20497,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(HM03_SURF) | TMHM(TM03_WATER_PULSE)), - [SPECIES_SLOWBRO_GALARIAN]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_SLOWBRO_GALARIAN] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM14_BLIZZARD) | TMHM(TM31_BRICK_BREAK) | TMHM(TM04_CALM_MIND) @@ -20524,7 +20524,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(HM03_SURF) | TMHM(TM03_WATER_PULSE)), - [SPECIES_FARFETCHD_GALARIAN]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_FARFETCHD_GALARIAN] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM31_BRICK_BREAK) | TMHM(TM42_FACADE) | TMHM(TM17_PROTECT) @@ -20533,7 +20533,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM47_STEEL_WING) | TMHM(TM11_SUNNY_DAY)), - [SPECIES_WEEZING_GALARIAN]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_WEEZING_GALARIAN] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM42_FACADE) | TMHM(TM38_FIRE_BLAST) | TMHM(TM35_FLAMETHROWER) @@ -20551,7 +20551,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM24_THUNDERBOLT) | TMHM(TM06_TOXIC)), - [SPECIES_MR_MIME_GALARIAN]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_MR_MIME_GALARIAN] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM14_BLIZZARD) | TMHM(TM31_BRICK_BREAK) | TMHM(TM04_CALM_MIND) @@ -20575,7 +20575,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM25_THUNDER) | TMHM(TM24_THUNDERBOLT)), - [SPECIES_ARTICUNO_GALARIAN]= TMHM_LEARNSET(TMHM(TM04_CALM_MIND) + [SPECIES_ARTICUNO_GALARIAN] = TMHM_LEARNSET(TMHM(TM04_CALM_MIND) | TMHM(TM42_FACADE) | TMHM(HM02_FLY) | TMHM(TM15_HYPER_BEAM) @@ -20588,7 +20588,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM48_SKILL_SWAP) | TMHM(TM47_STEEL_WING)), - [SPECIES_ZAPDOS_GALARIAN]= TMHM_LEARNSET(TMHM(TM31_BRICK_BREAK) + [SPECIES_ZAPDOS_GALARIAN] = TMHM_LEARNSET(TMHM(TM31_BRICK_BREAK) | TMHM(TM08_BULK_UP) | TMHM(TM42_FACADE) | TMHM(HM02_FLY) @@ -20600,7 +20600,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM47_STEEL_WING) | TMHM(TM12_TAUNT)), - [SPECIES_MOLTRES_GALARIAN]= TMHM_LEARNSET(TMHM(TM42_FACADE) + [SPECIES_MOLTRES_GALARIAN] = TMHM_LEARNSET(TMHM(TM42_FACADE) | TMHM(HM02_FLY) | TMHM(TM15_HYPER_BEAM) | TMHM(TM17_PROTECT) @@ -20610,7 +20610,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM47_STEEL_WING) | TMHM(TM12_TAUNT)), - [SPECIES_SLOWKING_GALARIAN]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_SLOWKING_GALARIAN] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM14_BLIZZARD) | TMHM(TM31_BRICK_BREAK) | TMHM(TM04_CALM_MIND) @@ -20637,7 +20637,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(HM03_SURF) | TMHM(TM03_WATER_PULSE)), - [SPECIES_CORSOLA_GALARIAN]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_CORSOLA_GALARIAN] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM14_BLIZZARD) | TMHM(TM04_CALM_MIND) | TMHM(TM28_DIG) @@ -20660,7 +20660,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(HM03_SURF) | TMHM(TM03_WATER_PULSE)), - [SPECIES_ZIGZAGOON_GALARIAN]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_ZIGZAGOON_GALARIAN] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM14_BLIZZARD) | TMHM(TM28_DIG) | TMHM(TM42_FACADE) @@ -20677,7 +20677,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM25_THUNDER) | TMHM(TM24_THUNDERBOLT)), - [SPECIES_LINOONE_GALARIAN]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_LINOONE_GALARIAN] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM14_BLIZZARD) | TMHM(TM28_DIG) | TMHM(TM42_FACADE) @@ -20695,7 +20695,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM25_THUNDER) | TMHM(TM24_THUNDERBOLT)), - [SPECIES_DARUMAKA_GALARIAN]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_DARUMAKA_GALARIAN] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM14_BLIZZARD) | TMHM(TM31_BRICK_BREAK) | TMHM(TM28_DIG) @@ -20713,7 +20713,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM12_TAUNT) | TMHM(TM46_THIEF)), - [SPECIES_DARMANITAN_GALARIAN]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_DARMANITAN_GALARIAN] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM14_BLIZZARD) | TMHM(TM31_BRICK_BREAK) | TMHM(TM08_BULK_UP) @@ -20734,7 +20734,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM12_TAUNT) | TMHM(TM46_THIEF)), - [SPECIES_YAMASK_GALARIAN]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_YAMASK_GALARIAN] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM26_EARTHQUAKE) | TMHM(TM42_FACADE) @@ -20749,7 +20749,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM48_SKILL_SWAP) | TMHM(TM46_THIEF)), - [SPECIES_STUNFISK_GALARIAN]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_STUNFISK_GALARIAN] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM28_DIG) | TMHM(TM26_EARTHQUAKE) | TMHM(TM42_FACADE) @@ -20761,7 +20761,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM36_SLUDGE_BOMB) | TMHM(HM03_SURF)), - [SPECIES_PIKACHU_COSPLAY] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_PIKACHU_COSPLAY] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM31_BRICK_BREAK) | TMHM(TM28_DIG) | TMHM(TM32_DOUBLE_TEAM) @@ -20787,7 +20787,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM24_THUNDERBOLT) | TMHM(TM06_TOXIC)), - [SPECIES_PIKACHU_ROCK_STAR] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_PIKACHU_ROCK_STAR] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM31_BRICK_BREAK) | TMHM(TM28_DIG) | TMHM(TM32_DOUBLE_TEAM) @@ -20813,7 +20813,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM24_THUNDERBOLT) | TMHM(TM06_TOXIC)), - [SPECIES_PIKACHU_BELLE] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_PIKACHU_BELLE] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM31_BRICK_BREAK) | TMHM(TM28_DIG) | TMHM(TM32_DOUBLE_TEAM) @@ -20839,7 +20839,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM24_THUNDERBOLT) | TMHM(TM06_TOXIC)), - [SPECIES_PIKACHU_POP_STAR] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_PIKACHU_POP_STAR] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM31_BRICK_BREAK) | TMHM(TM28_DIG) | TMHM(TM32_DOUBLE_TEAM) @@ -20865,7 +20865,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM24_THUNDERBOLT) | TMHM(TM06_TOXIC)), - [SPECIES_PIKACHU_PH_D] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_PIKACHU_PH_D] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM31_BRICK_BREAK) | TMHM(TM28_DIG) | TMHM(TM32_DOUBLE_TEAM) @@ -20891,7 +20891,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM24_THUNDERBOLT) | TMHM(TM06_TOXIC)), - [SPECIES_PIKACHU_LIBRE] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_PIKACHU_LIBRE] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM31_BRICK_BREAK) | TMHM(TM28_DIG) | TMHM(TM32_DOUBLE_TEAM) @@ -20917,7 +20917,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM24_THUNDERBOLT) | TMHM(TM06_TOXIC)), - [SPECIES_PIKACHU_ORIGINAL_CAP] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_PIKACHU_ORIGINAL_CAP] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM31_BRICK_BREAK) | TMHM(TM28_DIG) | TMHM(TM32_DOUBLE_TEAM) @@ -20943,7 +20943,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM24_THUNDERBOLT) | TMHM(TM06_TOXIC)), - [SPECIES_PIKACHU_HOENN_CAP] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_PIKACHU_HOENN_CAP] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM31_BRICK_BREAK) | TMHM(TM28_DIG) | TMHM(TM32_DOUBLE_TEAM) @@ -20969,7 +20969,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM24_THUNDERBOLT) | TMHM(TM06_TOXIC)), - [SPECIES_PIKACHU_SINNOH_CAP] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_PIKACHU_SINNOH_CAP] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM31_BRICK_BREAK) | TMHM(TM28_DIG) | TMHM(TM32_DOUBLE_TEAM) @@ -20995,7 +20995,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM24_THUNDERBOLT) | TMHM(TM06_TOXIC)), - [SPECIES_PIKACHU_UNOVA_CAP] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_PIKACHU_UNOVA_CAP] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM31_BRICK_BREAK) | TMHM(TM28_DIG) | TMHM(TM32_DOUBLE_TEAM) @@ -21021,7 +21021,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM24_THUNDERBOLT) | TMHM(TM06_TOXIC)), - [SPECIES_PIKACHU_KALOS_CAP] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_PIKACHU_KALOS_CAP] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM31_BRICK_BREAK) | TMHM(TM28_DIG) | TMHM(TM32_DOUBLE_TEAM) @@ -21047,7 +21047,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM24_THUNDERBOLT) | TMHM(TM06_TOXIC)), - [SPECIES_PIKACHU_ALOLA_CAP] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_PIKACHU_ALOLA_CAP] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM31_BRICK_BREAK) | TMHM(TM28_DIG) | TMHM(TM32_DOUBLE_TEAM) @@ -21073,7 +21073,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM24_THUNDERBOLT) | TMHM(TM06_TOXIC)), - [SPECIES_PIKACHU_PARTNER_CAP] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_PIKACHU_PARTNER_CAP] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM31_BRICK_BREAK) | TMHM(TM28_DIG) | TMHM(TM32_DOUBLE_TEAM) @@ -21099,7 +21099,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM24_THUNDERBOLT) | TMHM(TM06_TOXIC)), - [SPECIES_PICHU_SPIKY_EARED] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_PICHU_SPIKY_EARED] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) | TMHM(HM05_FLASH) @@ -21118,61 +21118,61 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM24_THUNDERBOLT) | TMHM(TM06_TOXIC)), - [SPECIES_UNOWN_B] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), + [SPECIES_UNOWN_B] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), - [SPECIES_UNOWN_C] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), + [SPECIES_UNOWN_C] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), - [SPECIES_UNOWN_D] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), + [SPECIES_UNOWN_D] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), - [SPECIES_UNOWN_E] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), + [SPECIES_UNOWN_E] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), - [SPECIES_UNOWN_F] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), + [SPECIES_UNOWN_F] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), - [SPECIES_UNOWN_G] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), + [SPECIES_UNOWN_G] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), - [SPECIES_UNOWN_H] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), + [SPECIES_UNOWN_H] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), - [SPECIES_UNOWN_I] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), + [SPECIES_UNOWN_I] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), - [SPECIES_UNOWN_J] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), + [SPECIES_UNOWN_J] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), - [SPECIES_UNOWN_K] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), + [SPECIES_UNOWN_K] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), - [SPECIES_UNOWN_L] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), + [SPECIES_UNOWN_L] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), - [SPECIES_UNOWN_M] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), + [SPECIES_UNOWN_M] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), - [SPECIES_UNOWN_N] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), + [SPECIES_UNOWN_N] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), - [SPECIES_UNOWN_O] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), + [SPECIES_UNOWN_O] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), - [SPECIES_UNOWN_P] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), + [SPECIES_UNOWN_P] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), - [SPECIES_UNOWN_Q] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), + [SPECIES_UNOWN_Q] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), - [SPECIES_UNOWN_R] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), + [SPECIES_UNOWN_R] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), - [SPECIES_UNOWN_S] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), + [SPECIES_UNOWN_S] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), - [SPECIES_UNOWN_T] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), + [SPECIES_UNOWN_T] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), - [SPECIES_UNOWN_U] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), + [SPECIES_UNOWN_U] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), - [SPECIES_UNOWN_V] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), + [SPECIES_UNOWN_V] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), - [SPECIES_UNOWN_W] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), + [SPECIES_UNOWN_W] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), - [SPECIES_UNOWN_X] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), + [SPECIES_UNOWN_X] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), - [SPECIES_UNOWN_Y] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), + [SPECIES_UNOWN_Y] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), - [SPECIES_UNOWN_Z] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), + [SPECIES_UNOWN_Z] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), - [SPECIES_UNOWN_EMARK] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), + [SPECIES_UNOWN_EMARK] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), - [SPECIES_UNOWN_QMARK] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), + [SPECIES_UNOWN_QMARK] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER)), - [SPECIES_DEOXYS_ATTACK] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_DEOXYS_ATTACK] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM31_BRICK_BREAK) | TMHM(TM04_CALM_MIND) | TMHM(HM01_CUT) @@ -21209,7 +21209,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM06_TOXIC) | TMHM(TM03_WATER_PULSE)), - [SPECIES_DEOXYS_DEFENSE] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_DEOXYS_DEFENSE] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM31_BRICK_BREAK) | TMHM(TM04_CALM_MIND) | TMHM(HM01_CUT) @@ -21246,7 +21246,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM06_TOXIC) | TMHM(TM03_WATER_PULSE)), - [SPECIES_DEOXYS_SPEED] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_DEOXYS_SPEED] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM31_BRICK_BREAK) | TMHM(TM04_CALM_MIND) | TMHM(HM01_CUT) @@ -21283,13 +21283,13 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM06_TOXIC) | TMHM(TM03_WATER_PULSE)), - [SPECIES_BURMY_SANDY_CLOAK] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER) + [SPECIES_BURMY_SANDY_CLOAK] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER) | TMHM(TM17_PROTECT)), - [SPECIES_BURMY_TRASH_CLOAK] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER) + [SPECIES_BURMY_TRASH_CLOAK] = TMHM_LEARNSET(TMHM(TM10_HIDDEN_POWER) | TMHM(TM17_PROTECT)), - [SPECIES_WORMADAM_SANDY_CLOAK] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_WORMADAM_SANDY_CLOAK] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM28_DIG) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM26_EARTHQUAKE) @@ -21313,7 +21313,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM46_THIEF) | TMHM(TM06_TOXIC)), - [SPECIES_WORMADAM_TRASH_CLOAK] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_WORMADAM_TRASH_CLOAK] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) | TMHM(HM05_FLASH) @@ -21333,7 +21333,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM46_THIEF) | TMHM(TM06_TOXIC)), - [SPECIES_SHELLOS_EAST_SEA] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_SHELLOS_EAST_SEA] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM14_BLIZZARD) | TMHM(HM08_DIVE) | TMHM(TM32_DOUBLE_TEAM) @@ -21351,7 +21351,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM06_TOXIC) | TMHM(TM03_WATER_PULSE)), - [SPECIES_GASTRODON_EAST_SEA] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_GASTRODON_EAST_SEA] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM14_BLIZZARD) | TMHM(TM28_DIG) | TMHM(HM08_DIVE) @@ -21389,7 +21389,7 @@ const u32 gTMHMLearnsets[][2] = [SPECIES_ROTOM_MOW] = TMHM_LEARNSET(0), - [SPECIES_GIRATINA_ORIGIN] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_GIRATINA_ORIGIN] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM04_CALM_MIND) | TMHM(HM01_CUT) | TMHM(TM32_DOUBLE_TEAM) @@ -21419,7 +21419,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM24_THUNDERBOLT) | TMHM(TM06_TOXIC)), - [SPECIES_SHAYMIN_SKY] = TMHM_LEARNSET(TMHM(TM09_BULLET_SEED) + [SPECIES_SHAYMIN_SKY] = TMHM_LEARNSET(TMHM(TM09_BULLET_SEED) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) | TMHM(HM05_FLASH) @@ -21437,7 +21437,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM11_SUNNY_DAY) | TMHM(TM06_TOXIC)), - [SPECIES_ARCEUS_FIGHTING] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_ARCEUS_FIGHTING] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM14_BLIZZARD) | TMHM(TM31_BRICK_BREAK) | TMHM(TM09_BULLET_SEED) @@ -21486,7 +21486,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(HM07_WATERFALL) | TMHM(TM03_WATER_PULSE)), - [SPECIES_ARCEUS_FLYING] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_ARCEUS_FLYING] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM14_BLIZZARD) | TMHM(TM31_BRICK_BREAK) | TMHM(TM09_BULLET_SEED) @@ -21535,7 +21535,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(HM07_WATERFALL) | TMHM(TM03_WATER_PULSE)), - [SPECIES_ARCEUS_POISON] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_ARCEUS_POISON] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM14_BLIZZARD) | TMHM(TM31_BRICK_BREAK) | TMHM(TM09_BULLET_SEED) @@ -21584,7 +21584,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(HM07_WATERFALL) | TMHM(TM03_WATER_PULSE)), - [SPECIES_ARCEUS_GROUND] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_ARCEUS_GROUND] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM14_BLIZZARD) | TMHM(TM31_BRICK_BREAK) | TMHM(TM09_BULLET_SEED) @@ -21633,7 +21633,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(HM07_WATERFALL) | TMHM(TM03_WATER_PULSE)), - [SPECIES_ARCEUS_ROCK] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_ARCEUS_ROCK] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM14_BLIZZARD) | TMHM(TM31_BRICK_BREAK) | TMHM(TM09_BULLET_SEED) @@ -21682,7 +21682,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(HM07_WATERFALL) | TMHM(TM03_WATER_PULSE)), - [SPECIES_ARCEUS_BUG] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_ARCEUS_BUG] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM14_BLIZZARD) | TMHM(TM31_BRICK_BREAK) | TMHM(TM09_BULLET_SEED) @@ -21731,7 +21731,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(HM07_WATERFALL) | TMHM(TM03_WATER_PULSE)), - [SPECIES_ARCEUS_GHOST] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_ARCEUS_GHOST] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM14_BLIZZARD) | TMHM(TM31_BRICK_BREAK) | TMHM(TM09_BULLET_SEED) @@ -21780,7 +21780,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(HM07_WATERFALL) | TMHM(TM03_WATER_PULSE)), - [SPECIES_ARCEUS_STEEL] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_ARCEUS_STEEL] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM14_BLIZZARD) | TMHM(TM31_BRICK_BREAK) | TMHM(TM09_BULLET_SEED) @@ -21829,7 +21829,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(HM07_WATERFALL) | TMHM(TM03_WATER_PULSE)), - [SPECIES_ARCEUS_FIRE] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_ARCEUS_FIRE] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM14_BLIZZARD) | TMHM(TM31_BRICK_BREAK) | TMHM(TM09_BULLET_SEED) @@ -21878,7 +21878,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(HM07_WATERFALL) | TMHM(TM03_WATER_PULSE)), - [SPECIES_ARCEUS_WATER] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_ARCEUS_WATER] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM14_BLIZZARD) | TMHM(TM31_BRICK_BREAK) | TMHM(TM09_BULLET_SEED) @@ -21927,7 +21927,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(HM07_WATERFALL) | TMHM(TM03_WATER_PULSE)), - [SPECIES_ARCEUS_GRASS] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_ARCEUS_GRASS] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM14_BLIZZARD) | TMHM(TM31_BRICK_BREAK) | TMHM(TM09_BULLET_SEED) @@ -21976,7 +21976,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(HM07_WATERFALL) | TMHM(TM03_WATER_PULSE)), - [SPECIES_ARCEUS_ELECTRIC] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_ARCEUS_ELECTRIC] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM14_BLIZZARD) | TMHM(TM31_BRICK_BREAK) | TMHM(TM09_BULLET_SEED) @@ -22025,7 +22025,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(HM07_WATERFALL) | TMHM(TM03_WATER_PULSE)), - [SPECIES_ARCEUS_PSYCHIC] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_ARCEUS_PSYCHIC] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM14_BLIZZARD) | TMHM(TM31_BRICK_BREAK) | TMHM(TM09_BULLET_SEED) @@ -22074,7 +22074,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(HM07_WATERFALL) | TMHM(TM03_WATER_PULSE)), - [SPECIES_ARCEUS_ICE] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_ARCEUS_ICE] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM14_BLIZZARD) | TMHM(TM31_BRICK_BREAK) | TMHM(TM09_BULLET_SEED) @@ -22123,7 +22123,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(HM07_WATERFALL) | TMHM(TM03_WATER_PULSE)), - [SPECIES_ARCEUS_DRAGON] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_ARCEUS_DRAGON] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM14_BLIZZARD) | TMHM(TM31_BRICK_BREAK) | TMHM(TM09_BULLET_SEED) @@ -22172,7 +22172,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(HM07_WATERFALL) | TMHM(TM03_WATER_PULSE)), - [SPECIES_ARCEUS_DARK] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_ARCEUS_DARK] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM14_BLIZZARD) | TMHM(TM31_BRICK_BREAK) | TMHM(TM09_BULLET_SEED) @@ -22221,7 +22221,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(HM07_WATERFALL) | TMHM(TM03_WATER_PULSE)), - [SPECIES_ARCEUS_FAIRY] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_ARCEUS_FAIRY] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM14_BLIZZARD) | TMHM(TM31_BRICK_BREAK) | TMHM(TM09_BULLET_SEED) @@ -22270,7 +22270,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(HM07_WATERFALL) | TMHM(TM03_WATER_PULSE)), - [SPECIES_BASCULIN_BLUE_STRIPED] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_BASCULIN_BLUE_STRIPED] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(HM01_CUT) | TMHM(HM08_DIVE) | TMHM(TM32_DOUBLE_TEAM) @@ -22289,7 +22289,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM06_TOXIC) | TMHM(HM07_WATERFALL)), - [SPECIES_DEERLING_SUMMER] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_DEERLING_SUMMER] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) | TMHM(HM05_FLASH) @@ -22308,7 +22308,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM11_SUNNY_DAY) | TMHM(TM06_TOXIC)), - [SPECIES_DEERLING_AUTUMN] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_DEERLING_AUTUMN] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) | TMHM(HM05_FLASH) @@ -22327,7 +22327,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM11_SUNNY_DAY) | TMHM(TM06_TOXIC)), - [SPECIES_DEERLING_WINTER] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_DEERLING_WINTER] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) | TMHM(HM05_FLASH) @@ -22346,7 +22346,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM11_SUNNY_DAY) | TMHM(TM06_TOXIC)), - [SPECIES_SAWSBUCK_SUMMER] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_SAWSBUCK_SUMMER] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(HM01_CUT) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) @@ -22368,7 +22368,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM11_SUNNY_DAY) | TMHM(TM06_TOXIC)), - [SPECIES_SAWSBUCK_AUTUMN] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_SAWSBUCK_AUTUMN] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(HM01_CUT) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) @@ -22390,7 +22390,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM11_SUNNY_DAY) | TMHM(TM06_TOXIC)), - [SPECIES_SAWSBUCK_WINTER] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_SAWSBUCK_WINTER] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(HM01_CUT) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) @@ -22412,7 +22412,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM11_SUNNY_DAY) | TMHM(TM06_TOXIC)), - [SPECIES_TORNADUS_THERIAN] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_TORNADUS_THERIAN] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM45_ATTRACT) | TMHM(TM31_BRICK_BREAK) | TMHM(TM08_BULK_UP) @@ -22437,7 +22437,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM41_TORMENT) | TMHM(TM06_TOXIC)), - [SPECIES_THUNDURUS_THERIAN] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_THUNDURUS_THERIAN] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM31_BRICK_BREAK) | TMHM(TM08_BULK_UP) | TMHM(TM32_DOUBLE_TEAM) @@ -22464,7 +22464,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM41_TORMENT) | TMHM(TM06_TOXIC)), - [SPECIES_LANDORUS_THERIAN] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_LANDORUS_THERIAN] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM31_BRICK_BREAK) | TMHM(TM08_BULK_UP) | TMHM(TM04_CALM_MIND) @@ -22489,7 +22489,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(HM04_STRENGTH) | TMHM(TM06_TOXIC)), - [SPECIES_KYUREM_WHITE] = TMHM_LEARNSET(TMHM(TM14_BLIZZARD) + [SPECIES_KYUREM_WHITE] = TMHM_LEARNSET(TMHM(TM14_BLIZZARD) | TMHM(HM01_CUT) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM02_DRAGON_CLAW) @@ -22517,7 +22517,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM11_SUNNY_DAY) | TMHM(TM06_TOXIC)), - [SPECIES_KYUREM_BLACK] = TMHM_LEARNSET(TMHM(TM14_BLIZZARD) + [SPECIES_KYUREM_BLACK] = TMHM_LEARNSET(TMHM(TM14_BLIZZARD) | TMHM(HM01_CUT) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM02_DRAGON_CLAW) @@ -22545,7 +22545,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM11_SUNNY_DAY) | TMHM(TM06_TOXIC)), - [SPECIES_KELDEO_RESOLUTE] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_KELDEO_RESOLUTE] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM04_CALM_MIND) | TMHM(HM01_CUT) | TMHM(TM32_DOUBLE_TEAM) @@ -22569,7 +22569,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM06_TOXIC) | TMHM(TM03_WATER_PULSE)), - [SPECIES_GENESECT_DOUSE_DRIVE] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_GENESECT_DOUSE_DRIVE] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM14_BLIZZARD) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) @@ -22594,7 +22594,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM24_THUNDERBOLT) | TMHM(TM06_TOXIC)), - [SPECIES_GENESECT_SHOCK_DRIVE] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_GENESECT_SHOCK_DRIVE] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM14_BLIZZARD) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) @@ -22619,7 +22619,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM24_THUNDERBOLT) | TMHM(TM06_TOXIC)), - [SPECIES_GENESECT_BURN_DRIVE] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_GENESECT_BURN_DRIVE] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM14_BLIZZARD) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) @@ -22644,7 +22644,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM24_THUNDERBOLT) | TMHM(TM06_TOXIC)), - [SPECIES_GENESECT_CHILL_DRIVE] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_GENESECT_CHILL_DRIVE] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM14_BLIZZARD) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) @@ -22669,7 +22669,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM24_THUNDERBOLT) | TMHM(TM06_TOXIC)), - [SPECIES_GRENINJA_BATTLE_BOND] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_GRENINJA_BATTLE_BOND] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM45_ATTRACT) | TMHM(TM14_BLIZZARD) | TMHM(HM01_CUT) @@ -22697,7 +22697,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(HM07_WATERFALL) | TMHM(TM03_WATER_PULSE)), - [SPECIES_VIVILLON_POLAR] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_VIVILLON_POLAR] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) @@ -22720,7 +22720,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM46_THIEF) | TMHM(TM06_TOXIC)), - [SPECIES_VIVILLON_TUNDRA] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_VIVILLON_TUNDRA] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) @@ -22743,7 +22743,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM46_THIEF) | TMHM(TM06_TOXIC)), - [SPECIES_VIVILLON_CONTINENTAL] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_VIVILLON_CONTINENTAL] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) @@ -22766,7 +22766,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM46_THIEF) | TMHM(TM06_TOXIC)), - [SPECIES_VIVILLON_GARDEN] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_VIVILLON_GARDEN] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) @@ -22789,7 +22789,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM46_THIEF) | TMHM(TM06_TOXIC)), - [SPECIES_VIVILLON_ELEGANT] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_VIVILLON_ELEGANT] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) @@ -22812,7 +22812,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM46_THIEF) | TMHM(TM06_TOXIC)), - [SPECIES_VIVILLON_MEADOW] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_VIVILLON_MEADOW] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) @@ -22835,7 +22835,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM46_THIEF) | TMHM(TM06_TOXIC)), - [SPECIES_VIVILLON_MODERN] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_VIVILLON_MODERN] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) @@ -22858,7 +22858,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM46_THIEF) | TMHM(TM06_TOXIC)), - [SPECIES_VIVILLON_MARINE] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_VIVILLON_MARINE] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) @@ -22881,7 +22881,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM46_THIEF) | TMHM(TM06_TOXIC)), - [SPECIES_VIVILLON_ARCHIPELAGO] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_VIVILLON_ARCHIPELAGO] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) @@ -22904,7 +22904,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM46_THIEF) | TMHM(TM06_TOXIC)), - [SPECIES_VIVILLON_HIGH_PLAINS] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_VIVILLON_HIGH_PLAINS] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) @@ -22927,7 +22927,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM46_THIEF) | TMHM(TM06_TOXIC)), - [SPECIES_VIVILLON_SANDSTORM] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_VIVILLON_SANDSTORM] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) @@ -22950,7 +22950,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM46_THIEF) | TMHM(TM06_TOXIC)), - [SPECIES_VIVILLON_RIVER] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_VIVILLON_RIVER] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) @@ -22973,7 +22973,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM46_THIEF) | TMHM(TM06_TOXIC)), - [SPECIES_VIVILLON_MONSOON] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_VIVILLON_MONSOON] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) @@ -22996,7 +22996,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM46_THIEF) | TMHM(TM06_TOXIC)), - [SPECIES_VIVILLON_SAVANNA] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_VIVILLON_SAVANNA] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) @@ -23019,7 +23019,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM46_THIEF) | TMHM(TM06_TOXIC)), - [SPECIES_VIVILLON_SUN] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_VIVILLON_SUN] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) @@ -23042,7 +23042,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM46_THIEF) | TMHM(TM06_TOXIC)), - [SPECIES_VIVILLON_OCEAN] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_VIVILLON_OCEAN] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) @@ -23065,7 +23065,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM46_THIEF) | TMHM(TM06_TOXIC)), - [SPECIES_VIVILLON_JUNGLE] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_VIVILLON_JUNGLE] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) @@ -23088,7 +23088,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM46_THIEF) | TMHM(TM06_TOXIC)), - [SPECIES_VIVILLON_FANCY] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_VIVILLON_FANCY] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) @@ -23111,7 +23111,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM46_THIEF) | TMHM(TM06_TOXIC)), - [SPECIES_VIVILLON_POKE_BALL] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_VIVILLON_POKE_BALL] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) @@ -23134,7 +23134,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM46_THIEF) | TMHM(TM06_TOXIC)), - [SPECIES_FLABEBE_YELLOW_FLOWER] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_FLABEBE_YELLOW_FLOWER] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) @@ -23153,7 +23153,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM11_SUNNY_DAY) | TMHM(TM06_TOXIC)), - [SPECIES_FLABEBE_ORANGE_FLOWER] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_FLABEBE_ORANGE_FLOWER] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) @@ -23172,7 +23172,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM11_SUNNY_DAY) | TMHM(TM06_TOXIC)), - [SPECIES_FLABEBE_BLUE_FLOWER] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_FLABEBE_BLUE_FLOWER] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) @@ -23191,7 +23191,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM11_SUNNY_DAY) | TMHM(TM06_TOXIC)), - [SPECIES_FLABEBE_WHITE_FLOWER] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_FLABEBE_WHITE_FLOWER] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) @@ -23210,7 +23210,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM11_SUNNY_DAY) | TMHM(TM06_TOXIC)), - [SPECIES_FLOETTE_YELLOW_FLOWER] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_FLOETTE_YELLOW_FLOWER] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) @@ -23229,7 +23229,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM11_SUNNY_DAY) | TMHM(TM06_TOXIC)), - [SPECIES_FLOETTE_ORANGE_FLOWER] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_FLOETTE_ORANGE_FLOWER] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) @@ -23248,7 +23248,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM11_SUNNY_DAY) | TMHM(TM06_TOXIC)), - [SPECIES_FLOETTE_BLUE_FLOWER] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_FLOETTE_BLUE_FLOWER] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) @@ -23267,7 +23267,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM11_SUNNY_DAY) | TMHM(TM06_TOXIC)), - [SPECIES_FLOETTE_WHITE_FLOWER] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_FLOETTE_WHITE_FLOWER] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) @@ -23286,7 +23286,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM11_SUNNY_DAY) | TMHM(TM06_TOXIC)), - [SPECIES_FLOETTE_ETERNAL_FLOWER] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_FLOETTE_ETERNAL_FLOWER] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) @@ -23305,7 +23305,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM11_SUNNY_DAY) | TMHM(TM06_TOXIC)), - [SPECIES_FLORGES_YELLOW_FLOWER] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_FLORGES_YELLOW_FLOWER] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) @@ -23326,7 +23326,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM11_SUNNY_DAY) | TMHM(TM06_TOXIC)), - [SPECIES_FLORGES_ORANGE_FLOWER] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_FLORGES_ORANGE_FLOWER] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) @@ -23347,7 +23347,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM11_SUNNY_DAY) | TMHM(TM06_TOXIC)), - [SPECIES_FLORGES_BLUE_FLOWER] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_FLORGES_BLUE_FLOWER] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) @@ -23368,7 +23368,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM11_SUNNY_DAY) | TMHM(TM06_TOXIC)), - [SPECIES_FLORGES_WHITE_FLOWER] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_FLORGES_WHITE_FLOWER] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) @@ -23389,7 +23389,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM11_SUNNY_DAY) | TMHM(TM06_TOXIC)), - [SPECIES_FURFROU_HEART_TRIM] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_FURFROU_HEART_TRIM] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM28_DIG) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) @@ -23408,7 +23408,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(HM03_SURF) | TMHM(TM06_TOXIC)), - [SPECIES_FURFROU_STAR_TRIM] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_FURFROU_STAR_TRIM] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM28_DIG) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) @@ -23427,7 +23427,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(HM03_SURF) | TMHM(TM06_TOXIC)), - [SPECIES_FURFROU_DIAMOND_TRIM] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_FURFROU_DIAMOND_TRIM] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM28_DIG) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) @@ -23446,7 +23446,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(HM03_SURF) | TMHM(TM06_TOXIC)), - [SPECIES_FURFROU_DEBUTANTE_TRIM] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_FURFROU_DEBUTANTE_TRIM] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM28_DIG) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) @@ -23465,7 +23465,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(HM03_SURF) | TMHM(TM06_TOXIC)), - [SPECIES_FURFROU_MATRON_TRIM] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_FURFROU_MATRON_TRIM] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM28_DIG) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) @@ -23484,7 +23484,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(HM03_SURF) | TMHM(TM06_TOXIC)), - [SPECIES_FURFROU_DANDY_TRIM] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_FURFROU_DANDY_TRIM] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM28_DIG) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) @@ -23503,7 +23503,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(HM03_SURF) | TMHM(TM06_TOXIC)), - [SPECIES_FURFROU_LA_REINE_TRIM] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_FURFROU_LA_REINE_TRIM] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM28_DIG) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) @@ -23522,7 +23522,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(HM03_SURF) | TMHM(TM06_TOXIC)), - [SPECIES_FURFROU_KABUKI_TRIM] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_FURFROU_KABUKI_TRIM] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM28_DIG) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) @@ -23541,7 +23541,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(HM03_SURF) | TMHM(TM06_TOXIC)), - [SPECIES_FURFROU_PHARAOH_TRIM] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_FURFROU_PHARAOH_TRIM] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM28_DIG) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) @@ -23560,7 +23560,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(HM03_SURF) | TMHM(TM06_TOXIC)), - [SPECIES_MEOWSTIC_FEMALE] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_MEOWSTIC_FEMALE] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(HM01_CUT) | TMHM(TM28_DIG) @@ -23589,7 +23589,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM41_TORMENT) | TMHM(TM06_TOXIC)), - [SPECIES_PUMPKABOO_SMALL] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_PUMPKABOO_SMALL] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM09_BULLET_SEED) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) @@ -23615,7 +23615,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM46_THIEF) | TMHM(TM06_TOXIC)), - [SPECIES_PUMPKABOO_LARGE] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_PUMPKABOO_LARGE] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM09_BULLET_SEED) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) @@ -23641,7 +23641,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM46_THIEF) | TMHM(TM06_TOXIC)), - [SPECIES_PUMPKABOO_SUPER] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_PUMPKABOO_SUPER] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM09_BULLET_SEED) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) @@ -23667,7 +23667,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM46_THIEF) | TMHM(TM06_TOXIC)), - [SPECIES_GOURGEIST_SMALL] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_GOURGEIST_SMALL] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM09_BULLET_SEED) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) @@ -23694,7 +23694,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM46_THIEF) | TMHM(TM06_TOXIC)), - [SPECIES_GOURGEIST_LARGE] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_GOURGEIST_LARGE] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM09_BULLET_SEED) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) @@ -23721,7 +23721,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM46_THIEF) | TMHM(TM06_TOXIC)), - [SPECIES_GOURGEIST_SUPER] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_GOURGEIST_SUPER] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM09_BULLET_SEED) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) @@ -23748,7 +23748,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM46_THIEF) | TMHM(TM06_TOXIC)), - [SPECIES_ZYGARDE_10] = TMHM_LEARNSET(TMHM(TM31_BRICK_BREAK) + [SPECIES_ZYGARDE_10] = TMHM_LEARNSET(TMHM(TM31_BRICK_BREAK) | TMHM(TM28_DIG) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM26_EARTHQUAKE) @@ -23769,7 +23769,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM11_SUNNY_DAY) | TMHM(TM06_TOXIC)), - [SPECIES_ZYGARDE_10_POWER_CONSTRUCT] = TMHM_LEARNSET(TMHM(TM31_BRICK_BREAK) + [SPECIES_ZYGARDE_10_POWER_CONSTRUCT] = TMHM_LEARNSET(TMHM(TM31_BRICK_BREAK) | TMHM(TM28_DIG) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM26_EARTHQUAKE) @@ -23790,7 +23790,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM11_SUNNY_DAY) | TMHM(TM06_TOXIC)), - [SPECIES_ZYGARDE_50_POWER_CONSTRUCT] = TMHM_LEARNSET(TMHM(TM31_BRICK_BREAK) + [SPECIES_ZYGARDE_50_POWER_CONSTRUCT] = TMHM_LEARNSET(TMHM(TM31_BRICK_BREAK) | TMHM(TM28_DIG) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM26_EARTHQUAKE) @@ -23811,7 +23811,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM11_SUNNY_DAY) | TMHM(TM06_TOXIC)), - [SPECIES_ZYGARDE_COMPLETE] = TMHM_LEARNSET(TMHM(TM31_BRICK_BREAK) + [SPECIES_ZYGARDE_COMPLETE] = TMHM_LEARNSET(TMHM(TM31_BRICK_BREAK) | TMHM(TM28_DIG) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM26_EARTHQUAKE) @@ -23832,7 +23832,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM11_SUNNY_DAY) | TMHM(TM06_TOXIC)), - [SPECIES_HOOPA_UNBOUND] = TMHM_LEARNSET(TMHM(TM31_BRICK_BREAK) + [SPECIES_HOOPA_UNBOUND] = TMHM_LEARNSET(TMHM(TM31_BRICK_BREAK) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) @@ -23861,7 +23861,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM41_TORMENT) | TMHM(TM06_TOXIC)), - [SPECIES_ORICORIO_POM_POM] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_ORICORIO_POM_POM] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) @@ -23878,7 +23878,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM12_TAUNT) | TMHM(TM06_TOXIC)), - [SPECIES_ORICORIO_PA_U] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_ORICORIO_PAU] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) @@ -23895,7 +23895,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM12_TAUNT) | TMHM(TM06_TOXIC)), - [SPECIES_ORICORIO_SENSU] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_ORICORIO_SENSU] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) @@ -23912,7 +23912,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM12_TAUNT) | TMHM(TM06_TOXIC)), - [SPECIES_ROCKRUFF_OWN_TEMPO] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_ROCKRUFF_OWN_TEMPO] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM42_FACADE) | TMHM(TM21_FRUSTRATION) @@ -23926,7 +23926,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM12_TAUNT) | TMHM(TM06_TOXIC)), - [SPECIES_LYCANROC_MIDNIGHT] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_LYCANROC_MIDNIGHT] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM31_BRICK_BREAK) | TMHM(TM08_BULK_UP) | TMHM(TM32_DOUBLE_TEAM) @@ -23942,7 +23942,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM12_TAUNT) | TMHM(TM06_TOXIC)), - [SPECIES_LYCANROC_DUSK] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_LYCANROC_DUSK] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM31_BRICK_BREAK) | TMHM(TM08_BULK_UP) | TMHM(TM32_DOUBLE_TEAM) @@ -23958,7 +23958,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM12_TAUNT) | TMHM(TM06_TOXIC)), - [SPECIES_SILVALLY_FIGHTING] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_SILVALLY_FIGHTING] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM02_DRAGON_CLAW) | TMHM(TM42_FACADE) @@ -23981,7 +23981,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM24_THUNDERBOLT) | TMHM(TM06_TOXIC)), - [SPECIES_SILVALLY_FLYING] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_SILVALLY_FLYING] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM02_DRAGON_CLAW) | TMHM(TM42_FACADE) @@ -24004,7 +24004,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM24_THUNDERBOLT) | TMHM(TM06_TOXIC)), - [SPECIES_SILVALLY_POISON] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_SILVALLY_POISON] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM02_DRAGON_CLAW) | TMHM(TM42_FACADE) @@ -24027,7 +24027,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM24_THUNDERBOLT) | TMHM(TM06_TOXIC)), - [SPECIES_SILVALLY_GROUND] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_SILVALLY_GROUND] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM02_DRAGON_CLAW) | TMHM(TM42_FACADE) @@ -24050,7 +24050,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM24_THUNDERBOLT) | TMHM(TM06_TOXIC)), - [SPECIES_SILVALLY_ROCK] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_SILVALLY_ROCK] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM02_DRAGON_CLAW) | TMHM(TM42_FACADE) @@ -24073,7 +24073,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM24_THUNDERBOLT) | TMHM(TM06_TOXIC)), - [SPECIES_SILVALLY_BUG] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_SILVALLY_BUG] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM02_DRAGON_CLAW) | TMHM(TM42_FACADE) @@ -24096,7 +24096,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM24_THUNDERBOLT) | TMHM(TM06_TOXIC)), - [SPECIES_SILVALLY_GHOST] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_SILVALLY_GHOST] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM02_DRAGON_CLAW) | TMHM(TM42_FACADE) @@ -24119,7 +24119,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM24_THUNDERBOLT) | TMHM(TM06_TOXIC)), - [SPECIES_SILVALLY_STEEL] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_SILVALLY_STEEL] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM02_DRAGON_CLAW) | TMHM(TM42_FACADE) @@ -24142,7 +24142,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM24_THUNDERBOLT) | TMHM(TM06_TOXIC)), - [SPECIES_SILVALLY_FIRE] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_SILVALLY_FIRE] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM02_DRAGON_CLAW) | TMHM(TM42_FACADE) @@ -24165,7 +24165,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM24_THUNDERBOLT) | TMHM(TM06_TOXIC)), - [SPECIES_SILVALLY_WATER] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_SILVALLY_WATER] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM02_DRAGON_CLAW) | TMHM(TM42_FACADE) @@ -24188,7 +24188,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM24_THUNDERBOLT) | TMHM(TM06_TOXIC)), - [SPECIES_SILVALLY_GRASS] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_SILVALLY_GRASS] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM02_DRAGON_CLAW) | TMHM(TM42_FACADE) @@ -24211,7 +24211,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM24_THUNDERBOLT) | TMHM(TM06_TOXIC)), - [SPECIES_SILVALLY_ELECTRIC] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_SILVALLY_ELECTRIC] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM02_DRAGON_CLAW) | TMHM(TM42_FACADE) @@ -24234,7 +24234,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM24_THUNDERBOLT) | TMHM(TM06_TOXIC)), - [SPECIES_SILVALLY_PSYCHIC] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_SILVALLY_PSYCHIC] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM02_DRAGON_CLAW) | TMHM(TM42_FACADE) @@ -24257,7 +24257,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM24_THUNDERBOLT) | TMHM(TM06_TOXIC)), - [SPECIES_SILVALLY_ICE] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_SILVALLY_ICE] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM02_DRAGON_CLAW) | TMHM(TM42_FACADE) @@ -24280,7 +24280,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM24_THUNDERBOLT) | TMHM(TM06_TOXIC)), - [SPECIES_SILVALLY_DRAGON] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_SILVALLY_DRAGON] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM02_DRAGON_CLAW) | TMHM(TM42_FACADE) @@ -24303,7 +24303,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM24_THUNDERBOLT) | TMHM(TM06_TOXIC)), - [SPECIES_SILVALLY_DARK] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_SILVALLY_DARK] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM02_DRAGON_CLAW) | TMHM(TM42_FACADE) @@ -24326,7 +24326,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM24_THUNDERBOLT) | TMHM(TM06_TOXIC)), - [SPECIES_SILVALLY_FAIRY] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_SILVALLY_FAIRY] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM02_DRAGON_CLAW) | TMHM(TM42_FACADE) @@ -24349,7 +24349,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM24_THUNDERBOLT) | TMHM(TM06_TOXIC)), - [SPECIES_MINIOR_CORE_RED] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_MINIOR_CORE_RED] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM26_EARTHQUAKE) @@ -24369,7 +24369,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM22_SOLARBEAM) | TMHM(TM06_TOXIC)), - [SPECIES_MINIOR_CORE_ORANGE] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_MINIOR_CORE_ORANGE] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM26_EARTHQUAKE) @@ -24389,7 +24389,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM22_SOLARBEAM) | TMHM(TM06_TOXIC)), - [SPECIES_MINIOR_CORE_YELLOW] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_MINIOR_CORE_YELLOW] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM26_EARTHQUAKE) @@ -24409,7 +24409,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM22_SOLARBEAM) | TMHM(TM06_TOXIC)), - [SPECIES_MINIOR_CORE_GREEN] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_MINIOR_CORE_GREEN] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM26_EARTHQUAKE) @@ -24429,7 +24429,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM22_SOLARBEAM) | TMHM(TM06_TOXIC)), - [SPECIES_MINIOR_CORE_BLUE] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_MINIOR_CORE_BLUE] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM26_EARTHQUAKE) @@ -24449,7 +24449,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM22_SOLARBEAM) | TMHM(TM06_TOXIC)), - [SPECIES_MINIOR_CORE_INDIGO] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_MINIOR_CORE_INDIGO] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM26_EARTHQUAKE) @@ -24469,7 +24469,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM22_SOLARBEAM) | TMHM(TM06_TOXIC)), - [SPECIES_MINIOR_CORE_VIOLET] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_MINIOR_CORE_VIOLET] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM26_EARTHQUAKE) @@ -24489,7 +24489,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM22_SOLARBEAM) | TMHM(TM06_TOXIC)), - [SPECIES_NECROZMA_DUSK_MANE] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_NECROZMA_DUSK_MANE] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM31_BRICK_BREAK) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) @@ -24510,7 +24510,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM46_THIEF) | TMHM(TM06_TOXIC)), - [SPECIES_NECROZMA_DAWN_WINGS] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_NECROZMA_DAWN_WINGS] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM31_BRICK_BREAK) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) @@ -24531,7 +24531,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM46_THIEF) | TMHM(TM06_TOXIC)), - [SPECIES_MAGEARNA_ORIGINAL_COLOR] = TMHM_LEARNSET(TMHM(TM31_BRICK_BREAK) + [SPECIES_MAGEARNA_ORIGINAL_COLOR] = TMHM_LEARNSET(TMHM(TM31_BRICK_BREAK) | TMHM(TM04_CALM_MIND) | TMHM(TM32_DOUBLE_TEAM) | TMHM(TM21_FRUSTRATION) @@ -24547,7 +24547,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM22_SOLARBEAM) | TMHM(TM24_THUNDERBOLT)), - [SPECIES_TOXTRICITY_LOW_KEY]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_TOXTRICITY_LOW_KEY] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM42_FACADE) | TMHM(TM15_HYPER_BEAM) | TMHM(TM17_PROTECT) @@ -24559,14 +24559,14 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM24_THUNDERBOLT) | TMHM(TM06_TOXIC)), - [SPECIES_SINISTEA_ANTIQUE]= TMHM_LEARNSET(TMHM(TM42_FACADE) + [SPECIES_SINISTEA_ANTIQUE] = TMHM_LEARNSET(TMHM(TM42_FACADE) | TMHM(TM19_GIGA_DRAIN) | TMHM(TM17_PROTECT) | TMHM(TM29_PSYCHIC) | TMHM(TM44_REST) | TMHM(TM30_SHADOW_BALL)), - [SPECIES_POLTEAGEIST_ANTIQUE]= TMHM_LEARNSET(TMHM(TM42_FACADE) + [SPECIES_POLTEAGEIST_ANTIQUE] = TMHM_LEARNSET(TMHM(TM42_FACADE) | TMHM(TM19_GIGA_DRAIN) | TMHM(TM15_HYPER_BEAM) | TMHM(TM16_LIGHT_SCREEN) @@ -24576,7 +24576,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM44_REST) | TMHM(TM30_SHADOW_BALL)), - [SPECIES_ALCREMIE_RUBY_CREAM]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_ALCREMIE_RUBY_CREAM] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM42_FACADE) | TMHM(TM19_GIGA_DRAIN) @@ -24588,7 +24588,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM20_SAFEGUARD) | TMHM(TM22_SOLARBEAM)), - [SPECIES_ALCREMIE_MATCHA_CREAM]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_ALCREMIE_MATCHA_CREAM] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM42_FACADE) | TMHM(TM19_GIGA_DRAIN) @@ -24600,7 +24600,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM20_SAFEGUARD) | TMHM(TM22_SOLARBEAM)), - [SPECIES_ALCREMIE_MINT_CREAM]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_ALCREMIE_MINT_CREAM] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM42_FACADE) | TMHM(TM19_GIGA_DRAIN) @@ -24612,7 +24612,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM20_SAFEGUARD) | TMHM(TM22_SOLARBEAM)), - [SPECIES_ALCREMIE_LEMON_CREAM]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_ALCREMIE_LEMON_CREAM] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM42_FACADE) | TMHM(TM19_GIGA_DRAIN) @@ -24624,7 +24624,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM20_SAFEGUARD) | TMHM(TM22_SOLARBEAM)), - [SPECIES_ALCREMIE_SALTED_CREAM]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_ALCREMIE_SALTED_CREAM] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM42_FACADE) | TMHM(TM19_GIGA_DRAIN) @@ -24636,7 +24636,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM20_SAFEGUARD) | TMHM(TM22_SOLARBEAM)), - [SPECIES_ALCREMIE_RUBY_SWIRL]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_ALCREMIE_RUBY_SWIRL] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM42_FACADE) | TMHM(TM19_GIGA_DRAIN) @@ -24648,7 +24648,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM20_SAFEGUARD) | TMHM(TM22_SOLARBEAM)), - [SPECIES_ALCREMIE_CARAMEL_SWIRL]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_ALCREMIE_CARAMEL_SWIRL] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM42_FACADE) | TMHM(TM19_GIGA_DRAIN) @@ -24660,7 +24660,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM20_SAFEGUARD) | TMHM(TM22_SOLARBEAM)), - [SPECIES_ALCREMIE_RAINBOW_SWIRL]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_ALCREMIE_RAINBOW_SWIRL] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM42_FACADE) | TMHM(TM19_GIGA_DRAIN) @@ -24672,7 +24672,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM20_SAFEGUARD) | TMHM(TM22_SOLARBEAM)), - [SPECIES_INDEEDEE_FEMALE]= TMHM_LEARNSET(TMHM(TM45_ATTRACT) + [SPECIES_INDEEDEE_FEMALE] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) | TMHM(TM04_CALM_MIND) | TMHM(TM42_FACADE) | TMHM(TM16_LIGHT_SCREEN) @@ -24683,7 +24683,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM20_SAFEGUARD) | TMHM(TM30_SHADOW_BALL)), - [SPECIES_URSHIFU_RAPID_STRIKE_STYLE]= TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) + [SPECIES_URSHIFU_RAPID_STRIKE_STYLE] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE) | TMHM(TM45_ATTRACT) | TMHM(TM31_BRICK_BREAK) | TMHM(TM08_BULK_UP) @@ -24715,7 +24715,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM12_TAUNT) | TMHM(TM46_THIEF)), - [SPECIES_CALYREX_ICE_RIDER]= TMHM_LEARNSET(TMHM(TM14_BLIZZARD) + [SPECIES_CALYREX_ICE_RIDER] = TMHM_LEARNSET(TMHM(TM14_BLIZZARD) | TMHM(TM09_BULLET_SEED) | TMHM(TM04_CALM_MIND) | TMHM(TM42_FACADE) @@ -24735,7 +24735,7 @@ const u32 gTMHMLearnsets[][2] = | TMHM(TM12_TAUNT) | TMHM(TM41_TORMENT)), - [SPECIES_CALYREX_SHADOW_RIDER]= TMHM_LEARNSET(TMHM(TM09_BULLET_SEED) + [SPECIES_CALYREX_SHADOW_RIDER] = TMHM_LEARNSET(TMHM(TM09_BULLET_SEED) | TMHM(TM04_CALM_MIND) | TMHM(TM42_FACADE) | TMHM(TM19_GIGA_DRAIN) diff --git a/src/data/pokemon/tutor_learnsets.h b/src/data/pokemon/tutor_learnsets.h index 712932b7e..0e63c8d58 100644 --- a/src/data/pokemon/tutor_learnsets.h +++ b/src/data/pokemon/tutor_learnsets.h @@ -6438,7 +6438,7 @@ static const u32 sTutorLearnsets[] = | TUTOR(MOVE_SUBSTITUTE) | TUTOR(MOVE_SWAGGER)), - [SPECIES_MIMEJR] = TUTOR_LEARNSET(TUTOR(MOVE_DREAM_EATER) + [SPECIES_MIME_JR] = TUTOR_LEARNSET(TUTOR(MOVE_DREAM_EATER) | TUTOR(MOVE_ENDURE) | TUTOR(MOVE_ICY_WIND) | TUTOR(MOVE_MIMIC) @@ -10193,7 +10193,7 @@ static const u32 sTutorLearnsets[] = | TUTOR(MOVE_SUBSTITUTE) | TUTOR(MOVE_SWIFT)), - [SPECIES_MEOWTH_GALARIAN]= TUTOR_LEARNSET(TUTOR(MOVE_BODY_SLAM) + [SPECIES_MEOWTH_GALARIAN] = TUTOR_LEARNSET(TUTOR(MOVE_BODY_SLAM) | TUTOR(MOVE_DOUBLE_EDGE) | TUTOR(MOVE_ENDURE) | TUTOR(MOVE_SLEEP_TALK) @@ -10202,7 +10202,7 @@ static const u32 sTutorLearnsets[] = | TUTOR(MOVE_SWAGGER) | TUTOR(MOVE_SWORDS_DANCE)), - [SPECIES_PONYTA_GALARIAN]= TUTOR_LEARNSET(TUTOR(MOVE_BODY_SLAM) + [SPECIES_PONYTA_GALARIAN] = TUTOR_LEARNSET(TUTOR(MOVE_BODY_SLAM) | TUTOR(MOVE_DOUBLE_EDGE) | TUTOR(MOVE_ENDURE) | TUTOR(MOVE_SLEEP_TALK) @@ -10210,7 +10210,7 @@ static const u32 sTutorLearnsets[] = | TUTOR(MOVE_SUBSTITUTE) | TUTOR(MOVE_SWIFT)), - [SPECIES_RAPIDASH_GALARIAN]= TUTOR_LEARNSET(TUTOR(MOVE_BODY_SLAM) + [SPECIES_RAPIDASH_GALARIAN] = TUTOR_LEARNSET(TUTOR(MOVE_BODY_SLAM) | TUTOR(MOVE_ENDURE) | TUTOR(MOVE_SLEEP_TALK) | TUTOR(MOVE_SNORE) @@ -10218,7 +10218,7 @@ static const u32 sTutorLearnsets[] = | TUTOR(MOVE_SWIFT) | TUTOR(MOVE_SWORDS_DANCE)), - [SPECIES_SLOWPOKE_GALARIAN]= TUTOR_LEARNSET(TUTOR(MOVE_BODY_SLAM) + [SPECIES_SLOWPOKE_GALARIAN] = TUTOR_LEARNSET(TUTOR(MOVE_BODY_SLAM) | TUTOR(MOVE_ENDURE) | TUTOR(MOVE_ICY_WIND) | TUTOR(MOVE_PSYCH_UP) @@ -10228,7 +10228,7 @@ static const u32 sTutorLearnsets[] = | TUTOR(MOVE_SWIFT) | TUTOR(MOVE_THUNDER_WAVE)), - [SPECIES_SLOWBRO_GALARIAN]= TUTOR_LEARNSET(TUTOR(MOVE_BODY_SLAM) + [SPECIES_SLOWBRO_GALARIAN] = TUTOR_LEARNSET(TUTOR(MOVE_BODY_SLAM) | TUTOR(MOVE_ENDURE) | TUTOR(MOVE_ICE_PUNCH) | TUTOR(MOVE_ICY_WIND) @@ -10241,7 +10241,7 @@ static const u32 sTutorLearnsets[] = | TUTOR(MOVE_SWIFT) | TUTOR(MOVE_THUNDER_WAVE)), - [SPECIES_FARFETCHD_GALARIAN]= TUTOR_LEARNSET(TUTOR(MOVE_BODY_SLAM) + [SPECIES_FARFETCHD_GALARIAN] = TUTOR_LEARNSET(TUTOR(MOVE_BODY_SLAM) | TUTOR(MOVE_COUNTER) | TUTOR(MOVE_DOUBLE_EDGE) | TUTOR(MOVE_ENDURE) @@ -10251,13 +10251,13 @@ static const u32 sTutorLearnsets[] = | TUTOR(MOVE_SUBSTITUTE) | TUTOR(MOVE_SWORDS_DANCE)), - [SPECIES_WEEZING_GALARIAN]= TUTOR_LEARNSET(TUTOR(MOVE_ENDURE) + [SPECIES_WEEZING_GALARIAN] = TUTOR_LEARNSET(TUTOR(MOVE_ENDURE) | TUTOR(MOVE_EXPLOSION) | TUTOR(MOVE_SLEEP_TALK) | TUTOR(MOVE_SNORE) | TUTOR(MOVE_SUBSTITUTE)), - [SPECIES_MR_MIME_GALARIAN]= TUTOR_LEARNSET(TUTOR(MOVE_BODY_SLAM) + [SPECIES_MR_MIME_GALARIAN] = TUTOR_LEARNSET(TUTOR(MOVE_BODY_SLAM) | TUTOR(MOVE_ENDURE) | TUTOR(MOVE_ICE_PUNCH) | TUTOR(MOVE_ICY_WIND) @@ -10270,14 +10270,14 @@ static const u32 sTutorLearnsets[] = | TUTOR(MOVE_SUBSTITUTE) | TUTOR(MOVE_THUNDER_WAVE)), - [SPECIES_ARTICUNO_GALARIAN]= TUTOR_LEARNSET(TUTOR(MOVE_DREAM_EATER) + [SPECIES_ARTICUNO_GALARIAN] = TUTOR_LEARNSET(TUTOR(MOVE_DREAM_EATER) | TUTOR(MOVE_ENDURE) | TUTOR(MOVE_SLEEP_TALK) | TUTOR(MOVE_SNORE) | TUTOR(MOVE_SUBSTITUTE) | TUTOR(MOVE_SWIFT)), - [SPECIES_ZAPDOS_GALARIAN]= TUTOR_LEARNSET(TUTOR(MOVE_COUNTER) + [SPECIES_ZAPDOS_GALARIAN] = TUTOR_LEARNSET(TUTOR(MOVE_COUNTER) | TUTOR(MOVE_ENDURE) | TUTOR(MOVE_MEGA_KICK) | TUTOR(MOVE_SLEEP_TALK) @@ -10285,13 +10285,13 @@ static const u32 sTutorLearnsets[] = | TUTOR(MOVE_SUBSTITUTE) | TUTOR(MOVE_SWIFT)), - [SPECIES_MOLTRES_GALARIAN]= TUTOR_LEARNSET(TUTOR(MOVE_ENDURE) + [SPECIES_MOLTRES_GALARIAN] = TUTOR_LEARNSET(TUTOR(MOVE_ENDURE) | TUTOR(MOVE_SLEEP_TALK) | TUTOR(MOVE_SNORE) | TUTOR(MOVE_SUBSTITUTE) | TUTOR(MOVE_SWIFT)), - [SPECIES_SLOWKING_GALARIAN]= TUTOR_LEARNSET(TUTOR(MOVE_BODY_SLAM) + [SPECIES_SLOWKING_GALARIAN] = TUTOR_LEARNSET(TUTOR(MOVE_BODY_SLAM) | TUTOR(MOVE_ENDURE) | TUTOR(MOVE_ICE_PUNCH) | TUTOR(MOVE_ICY_WIND) @@ -10305,7 +10305,7 @@ static const u32 sTutorLearnsets[] = | TUTOR(MOVE_SWIFT) | TUTOR(MOVE_THUNDER_WAVE)), - [SPECIES_CORSOLA_GALARIAN]= TUTOR_LEARNSET(TUTOR(MOVE_BODY_SLAM) + [SPECIES_CORSOLA_GALARIAN] = TUTOR_LEARNSET(TUTOR(MOVE_BODY_SLAM) | TUTOR(MOVE_ENDURE) | TUTOR(MOVE_ICY_WIND) | TUTOR(MOVE_ROCK_SLIDE) @@ -10313,7 +10313,7 @@ static const u32 sTutorLearnsets[] = | TUTOR(MOVE_SNORE) | TUTOR(MOVE_SUBSTITUTE)), - [SPECIES_ZIGZAGOON_GALARIAN]= TUTOR_LEARNSET(TUTOR(MOVE_BODY_SLAM) + [SPECIES_ZIGZAGOON_GALARIAN] = TUTOR_LEARNSET(TUTOR(MOVE_BODY_SLAM) | TUTOR(MOVE_COUNTER) | TUTOR(MOVE_DOUBLE_EDGE) | TUTOR(MOVE_ENDURE) @@ -10324,7 +10324,7 @@ static const u32 sTutorLearnsets[] = | TUTOR(MOVE_SWIFT) | TUTOR(MOVE_THUNDER_WAVE)), - [SPECIES_LINOONE_GALARIAN]= TUTOR_LEARNSET(TUTOR(MOVE_BODY_SLAM) + [SPECIES_LINOONE_GALARIAN] = TUTOR_LEARNSET(TUTOR(MOVE_BODY_SLAM) | TUTOR(MOVE_COUNTER) | TUTOR(MOVE_DOUBLE_EDGE) | TUTOR(MOVE_ENDURE) @@ -10335,7 +10335,7 @@ static const u32 sTutorLearnsets[] = | TUTOR(MOVE_SWIFT) | TUTOR(MOVE_THUNDER_WAVE)), - [SPECIES_DARUMAKA_GALARIAN]= TUTOR_LEARNSET(TUTOR(MOVE_ENDURE) + [SPECIES_DARUMAKA_GALARIAN] = TUTOR_LEARNSET(TUTOR(MOVE_ENDURE) | TUTOR(MOVE_FIRE_PUNCH) | TUTOR(MOVE_ICE_PUNCH) | TUTOR(MOVE_MEGA_KICK) @@ -10345,7 +10345,7 @@ static const u32 sTutorLearnsets[] = | TUTOR(MOVE_SNORE) | TUTOR(MOVE_SUBSTITUTE)), - [SPECIES_DARMANITAN_GALARIAN]= TUTOR_LEARNSET(TUTOR(MOVE_BODY_SLAM) + [SPECIES_DARMANITAN_GALARIAN] = TUTOR_LEARNSET(TUTOR(MOVE_BODY_SLAM) | TUTOR(MOVE_ENDURE) | TUTOR(MOVE_FIRE_PUNCH) | TUTOR(MOVE_ICE_PUNCH) @@ -10356,13 +10356,13 @@ static const u32 sTutorLearnsets[] = | TUTOR(MOVE_SNORE) | TUTOR(MOVE_SUBSTITUTE)), - [SPECIES_YAMASK_GALARIAN]= TUTOR_LEARNSET(TUTOR(MOVE_ENDURE) + [SPECIES_YAMASK_GALARIAN] = TUTOR_LEARNSET(TUTOR(MOVE_ENDURE) | TUTOR(MOVE_ROCK_SLIDE) | TUTOR(MOVE_SLEEP_TALK) | TUTOR(MOVE_SNORE) | TUTOR(MOVE_SUBSTITUTE)), - [SPECIES_STUNFISK_GALARIAN]= TUTOR_LEARNSET(TUTOR(MOVE_COUNTER) + [SPECIES_STUNFISK_GALARIAN] = TUTOR_LEARNSET(TUTOR(MOVE_COUNTER) | TUTOR(MOVE_ENDURE) | TUTOR(MOVE_MUD_SLAP) | TUTOR(MOVE_ROCK_SLIDE) @@ -10371,11 +10371,11 @@ static const u32 sTutorLearnsets[] = | TUTOR(MOVE_SUBSTITUTE) | TUTOR(MOVE_THUNDER_WAVE)), - [SPECIES_BURMY_SANDY_CLOAK] = TUTOR_LEARNSET(TUTOR(MOVE_SNORE)), + [SPECIES_BURMY_SANDY_CLOAK] = TUTOR_LEARNSET(TUTOR(MOVE_SNORE)), - [SPECIES_BURMY_TRASH_CLOAK] = TUTOR_LEARNSET(TUTOR(MOVE_SNORE)), + [SPECIES_BURMY_TRASH_CLOAK] = TUTOR_LEARNSET(TUTOR(MOVE_SNORE)), - [SPECIES_WORMADAM_SANDY_CLOAK]= TUTOR_LEARNSET(TUTOR(MOVE_DREAM_EATER) + [SPECIES_WORMADAM_SANDY_CLOAK] = TUTOR_LEARNSET(TUTOR(MOVE_DREAM_EATER) | TUTOR(MOVE_ENDURE) | TUTOR(MOVE_MUD_SLAP) | TUTOR(MOVE_PSYCH_UP) @@ -10385,7 +10385,7 @@ static const u32 sTutorLearnsets[] = | TUTOR(MOVE_SUBSTITUTE) | TUTOR(MOVE_SWAGGER)), - [SPECIES_WORMADAM_TRASH_CLOAK]= TUTOR_LEARNSET(TUTOR(MOVE_DREAM_EATER) + [SPECIES_WORMADAM_TRASH_CLOAK] = TUTOR_LEARNSET(TUTOR(MOVE_DREAM_EATER) | TUTOR(MOVE_ENDURE) | TUTOR(MOVE_PSYCH_UP) | TUTOR(MOVE_SLEEP_TALK) @@ -10448,13 +10448,6 @@ static const u32 sTutorLearnsets[] = | TUTOR(MOVE_SWIFT) | TUTOR(MOVE_THUNDER_WAVE)), - [SPECIES_KYUREM_BLACK] = TUTOR_LEARNSET(TUTOR(MOVE_ICY_WIND) - | TUTOR(MOVE_ROCK_SLIDE) - | TUTOR(MOVE_SLEEP_TALK) - | TUTOR(MOVE_SNORE) - | TUTOR(MOVE_SUBSTITUTE) - | TUTOR(MOVE_SWAGGER)), - [SPECIES_KYUREM_WHITE] = TUTOR_LEARNSET(TUTOR(MOVE_ICY_WIND) | TUTOR(MOVE_ROCK_SLIDE) | TUTOR(MOVE_SLEEP_TALK) @@ -10462,7 +10455,14 @@ static const u32 sTutorLearnsets[] = | TUTOR(MOVE_SUBSTITUTE) | TUTOR(MOVE_SWAGGER)), - [SPECIES_MEOWSTIC_FEMALE] = TUTOR_LEARNSET(TUTOR(MOVE_DREAM_EATER) + [SPECIES_KYUREM_BLACK] = TUTOR_LEARNSET(TUTOR(MOVE_ICY_WIND) + | TUTOR(MOVE_ROCK_SLIDE) + | TUTOR(MOVE_SLEEP_TALK) + | TUTOR(MOVE_SNORE) + | TUTOR(MOVE_SUBSTITUTE) + | TUTOR(MOVE_SWAGGER)), + + [SPECIES_MEOWSTIC_FEMALE] = TUTOR_LEARNSET(TUTOR(MOVE_DREAM_EATER) | TUTOR(MOVE_PSYCH_UP) | TUTOR(MOVE_SLEEP_TALK) | TUTOR(MOVE_SNORE) @@ -10470,7 +10470,7 @@ static const u32 sTutorLearnsets[] = | TUTOR(MOVE_SWAGGER) | TUTOR(MOVE_THUNDER_WAVE)), - [SPECIES_TOXTRICITY_LOW_KEY]= TUTOR_LEARNSET(TUTOR(MOVE_ENDURE) + [SPECIES_TOXTRICITY_LOW_KEY] = TUTOR_LEARNSET(TUTOR(MOVE_ENDURE) | TUTOR(MOVE_FIRE_PUNCH) | TUTOR(MOVE_MEGA_KICK) | TUTOR(MOVE_MEGA_PUNCH) @@ -10482,67 +10482,67 @@ static const u32 sTutorLearnsets[] = | TUTOR(MOVE_THUNDER_PUNCH) | TUTOR(MOVE_THUNDER_WAVE)), - [SPECIES_SINISTEA_ANTIQUE]= TUTOR_LEARNSET(TUTOR(MOVE_ENDURE) + [SPECIES_SINISTEA_ANTIQUE] = TUTOR_LEARNSET(TUTOR(MOVE_ENDURE) | TUTOR(MOVE_METRONOME) | TUTOR(MOVE_SLEEP_TALK) | TUTOR(MOVE_SNORE) | TUTOR(MOVE_SUBSTITUTE)), - [SPECIES_POLTEAGEIST_ANTIQUE]= TUTOR_LEARNSET(TUTOR(MOVE_ENDURE) + [SPECIES_POLTEAGEIST_ANTIQUE] = TUTOR_LEARNSET(TUTOR(MOVE_ENDURE) | TUTOR(MOVE_METRONOME) | TUTOR(MOVE_SLEEP_TALK) | TUTOR(MOVE_SNORE) | TUTOR(MOVE_SUBSTITUTE)), - [SPECIES_ALCREMIE_RUBY_CREAM]= TUTOR_LEARNSET(TUTOR(MOVE_ENDURE) + [SPECIES_ALCREMIE_RUBY_CREAM] = TUTOR_LEARNSET(TUTOR(MOVE_ENDURE) | TUTOR(MOVE_METRONOME) | TUTOR(MOVE_SLEEP_TALK) | TUTOR(MOVE_SNORE) | TUTOR(MOVE_SUBSTITUTE)), - [SPECIES_ALCREMIE_MATCHA_CREAM]= TUTOR_LEARNSET(TUTOR(MOVE_ENDURE) + [SPECIES_ALCREMIE_MATCHA_CREAM] = TUTOR_LEARNSET(TUTOR(MOVE_ENDURE) | TUTOR(MOVE_METRONOME) | TUTOR(MOVE_SLEEP_TALK) | TUTOR(MOVE_SNORE) | TUTOR(MOVE_SUBSTITUTE)), - [SPECIES_ALCREMIE_MINT_CREAM]= TUTOR_LEARNSET(TUTOR(MOVE_ENDURE) + [SPECIES_ALCREMIE_MINT_CREAM] = TUTOR_LEARNSET(TUTOR(MOVE_ENDURE) | TUTOR(MOVE_METRONOME) | TUTOR(MOVE_SLEEP_TALK) | TUTOR(MOVE_SNORE) | TUTOR(MOVE_SUBSTITUTE)), - [SPECIES_ALCREMIE_LEMON_CREAM]= TUTOR_LEARNSET(TUTOR(MOVE_ENDURE) + [SPECIES_ALCREMIE_LEMON_CREAM] = TUTOR_LEARNSET(TUTOR(MOVE_ENDURE) | TUTOR(MOVE_METRONOME) | TUTOR(MOVE_SLEEP_TALK) | TUTOR(MOVE_SNORE) | TUTOR(MOVE_SUBSTITUTE)), - [SPECIES_ALCREMIE_SALTED_CREAM]= TUTOR_LEARNSET(TUTOR(MOVE_ENDURE) + [SPECIES_ALCREMIE_SALTED_CREAM] = TUTOR_LEARNSET(TUTOR(MOVE_ENDURE) | TUTOR(MOVE_METRONOME) | TUTOR(MOVE_SLEEP_TALK) | TUTOR(MOVE_SNORE) | TUTOR(MOVE_SUBSTITUTE)), - [SPECIES_ALCREMIE_RUBY_SWIRL]= TUTOR_LEARNSET(TUTOR(MOVE_ENDURE) + [SPECIES_ALCREMIE_RUBY_SWIRL] = TUTOR_LEARNSET(TUTOR(MOVE_ENDURE) | TUTOR(MOVE_METRONOME) | TUTOR(MOVE_SLEEP_TALK) | TUTOR(MOVE_SNORE) | TUTOR(MOVE_SUBSTITUTE)), - [SPECIES_ALCREMIE_CARAMEL_SWIRL]= TUTOR_LEARNSET(TUTOR(MOVE_ENDURE) + [SPECIES_ALCREMIE_CARAMEL_SWIRL] = TUTOR_LEARNSET(TUTOR(MOVE_ENDURE) | TUTOR(MOVE_METRONOME) | TUTOR(MOVE_SLEEP_TALK) | TUTOR(MOVE_SNORE) | TUTOR(MOVE_SUBSTITUTE)), - [SPECIES_ALCREMIE_RAINBOW_SWIRL]= TUTOR_LEARNSET(TUTOR(MOVE_ENDURE) + [SPECIES_ALCREMIE_RAINBOW_SWIRL] = TUTOR_LEARNSET(TUTOR(MOVE_ENDURE) | TUTOR(MOVE_METRONOME) | TUTOR(MOVE_SLEEP_TALK) | TUTOR(MOVE_SNORE) | TUTOR(MOVE_SUBSTITUTE)), - [SPECIES_INDEEDEE_FEMALE]= TUTOR_LEARNSET(TUTOR(MOVE_ENDURE) + [SPECIES_INDEEDEE_FEMALE] = TUTOR_LEARNSET(TUTOR(MOVE_ENDURE) | TUTOR(MOVE_METRONOME) | TUTOR(MOVE_PSYCH_UP) | TUTOR(MOVE_SLEEP_TALK) @@ -10550,7 +10550,7 @@ static const u32 sTutorLearnsets[] = | TUTOR(MOVE_SUBSTITUTE) | TUTOR(MOVE_SWIFT)), - [SPECIES_URSHIFU_RAPID_STRIKE_STYLE]= TUTOR_LEARNSET(TUTOR(MOVE_BODY_SLAM) + [SPECIES_URSHIFU_RAPID_STRIKE_STYLE] = TUTOR_LEARNSET(TUTOR(MOVE_BODY_SLAM) | TUTOR(MOVE_COUNTER) | TUTOR(MOVE_DYNAMIC_PUNCH) | TUTOR(MOVE_ENDURE) @@ -10576,7 +10576,7 @@ static const u32 sTutorLearnsets[] = | TUTOR(MOVE_SWAGGER) | TUTOR(MOVE_SWIFT)), - [SPECIES_CALYREX_ICE_RIDER]= TUTOR_LEARNSET(TUTOR(MOVE_BODY_SLAM) + [SPECIES_CALYREX_ICE_RIDER] = TUTOR_LEARNSET(TUTOR(MOVE_BODY_SLAM) | TUTOR(MOVE_DOUBLE_EDGE) | TUTOR(MOVE_ENDURE) | TUTOR(MOVE_ICY_WIND) @@ -10587,7 +10587,7 @@ static const u32 sTutorLearnsets[] = | TUTOR(MOVE_SWIFT) | TUTOR(MOVE_SWORDS_DANCE)), - [SPECIES_CALYREX_SHADOW_RIDER]= TUTOR_LEARNSET(TUTOR(MOVE_BODY_SLAM) + [SPECIES_CALYREX_SHADOW_RIDER] = TUTOR_LEARNSET(TUTOR(MOVE_BODY_SLAM) | TUTOR(MOVE_DOUBLE_EDGE) | TUTOR(MOVE_ENDURE) | TUTOR(MOVE_METRONOME) diff --git a/src/data/pokemon_graphics/back_pic_coordinates.h b/src/data/pokemon_graphics/back_pic_coordinates.h index 840b5caaf..1770255c2 100644 --- a/src/data/pokemon_graphics/back_pic_coordinates.h +++ b/src/data/pokemon_graphics/back_pic_coordinates.h @@ -2195,7 +2195,7 @@ const struct MonCoords gMonBackPicCoords[] = .size = 0x58, .y_offset = 6, }, - [SPECIES_MIMEJR] = + [SPECIES_MIME_JR] = { .size = 0x88, .y_offset = 1, @@ -5758,7 +5758,7 @@ const struct MonCoords gMonBackPicCoords[] = .size = 0x88, .y_offset = 0, }, - [SPECIES_ORICORIO_PA_U] = + [SPECIES_ORICORIO_PAU] = { .size = 0x88, .y_offset = 0, diff --git a/src/data/pokemon_graphics/back_pic_table.h b/src/data/pokemon_graphics/back_pic_table.h index 4c8c48522..e1670e819 100644 --- a/src/data/pokemon_graphics/back_pic_table.h +++ b/src/data/pokemon_graphics/back_pic_table.h @@ -122,7 +122,7 @@ const struct CompressedSpriteSheet gMonBackPicTable[] = SPECIES_SPRITE(SEAKING, gMonBackPic_Seaking), SPECIES_SPRITE(STARYU, gMonBackPic_Staryu), SPECIES_SPRITE(STARMIE, gMonBackPic_Starmie), - SPECIES_SPRITE(MR_MIME, gMonBackPic_Mrmime), + SPECIES_SPRITE(MR_MIME, gMonBackPic_MrMime), SPECIES_SPRITE(SCYTHER, gMonBackPic_Scyther), SPECIES_SPRITE(JYNX, gMonBackPic_Jynx), SPECIES_SPRITE(ELECTABUZZ, gMonBackPic_Electabuzz), @@ -439,7 +439,7 @@ const struct CompressedSpriteSheet gMonBackPicTable[] = SPECIES_SPRITE(BRONZOR, gMonBackPic_Bronzor), SPECIES_SPRITE(BRONZONG, gMonBackPic_Bronzong), SPECIES_SPRITE(BONSLY, gMonBackPic_Bonsly), - SPECIES_SPRITE(MIMEJR, gMonBackPic_Mimejr), + SPECIES_SPRITE(MIME_JR, gMonBackPic_MimeJr), SPECIES_SPRITE(HAPPINY, gMonBackPic_Happiny), SPECIES_SPRITE(CHATOT, gMonBackPic_Chatot), SPECIES_SPRITE(SPIRITOMB, gMonBackPic_Spiritomb), @@ -772,7 +772,7 @@ const struct CompressedSpriteSheet gMonBackPicTable[] = SPECIES_SPRITE(SANDYGAST, gMonBackPic_Sandygast), SPECIES_SPRITE(PALOSSAND, gMonBackPic_Palossand), SPECIES_SPRITE(PYUKUMUKU, gMonBackPic_Pyukumuku), - SPECIES_SPRITE(TYPE_NULL, gMonBackPic_Type_null), + SPECIES_SPRITE(TYPE_NULL, gMonBackPic_TypeNull), SPECIES_SPRITE(SILVALLY, gMonBackPic_Silvally), SPECIES_SPRITE(MINIOR, gMonBackPic_Minior), SPECIES_SPRITE(KOMALA, gMonBackPic_Komala), @@ -782,13 +782,13 @@ const struct CompressedSpriteSheet gMonBackPicTable[] = SPECIES_SPRITE(BRUXISH, gMonBackPic_Bruxish), SPECIES_SPRITE(DRAMPA, gMonBackPic_Drampa), SPECIES_SPRITE(DHELMISE, gMonBackPic_Dhelmise), - SPECIES_SPRITE(JANGMO_O, gMonBackPic_Jangmo_o), - SPECIES_SPRITE(HAKAMO_O, gMonBackPic_Hakamo_o), - SPECIES_SPRITE(KOMMO_O, gMonBackPic_Kommo_o), - SPECIES_SPRITE(TAPU_KOKO, gMonBackPic_Tapu_koko), - SPECIES_SPRITE(TAPU_LELE, gMonBackPic_Tapu_lele), - SPECIES_SPRITE(TAPU_BULU, gMonBackPic_Tapu_bulu), - SPECIES_SPRITE(TAPU_FINI, gMonBackPic_Tapu_fini), + SPECIES_SPRITE(JANGMO_O, gMonBackPic_Jangmoo), + SPECIES_SPRITE(HAKAMO_O, gMonBackPic_Hakamoo), + SPECIES_SPRITE(KOMMO_O, gMonBackPic_Kommoo), + SPECIES_SPRITE(TAPU_KOKO, gMonBackPic_TapuKoko), + SPECIES_SPRITE(TAPU_LELE, gMonBackPic_TapuLele), + SPECIES_SPRITE(TAPU_BULU, gMonBackPic_TapuBulu), + SPECIES_SPRITE(TAPU_FINI, gMonBackPic_TapuFini), SPECIES_SPRITE(COSMOG, gMonBackPic_Cosmog), SPECIES_SPRITE(COSMOEM, gMonBackPic_Cosmoem), SPECIES_SPRITE(SOLGALEO, gMonBackPic_Solgaleo), @@ -1185,7 +1185,7 @@ const struct CompressedSpriteSheet gMonBackPicTable[] = SPECIES_SPRITE(HOOPA_UNBOUND, gMonBackPic_HoopaUnbound), SPECIES_SPRITE(ORICORIO_POM_POM, gMonBackPic_OricorioPomPom), - SPECIES_SPRITE(ORICORIO_PA_U, gMonBackPic_OricorioPau), + SPECIES_SPRITE(ORICORIO_PAU, gMonBackPic_OricorioPau), SPECIES_SPRITE(ORICORIO_SENSU, gMonBackPic_OricorioSensu), SPECIES_SPRITE(ROCKRUFF_OWN_TEMPO, gMonBackPic_Rockruff), diff --git a/src/data/pokemon_graphics/footprint_table.h b/src/data/pokemon_graphics/footprint_table.h index da132bbf3..f54602855 100644 --- a/src/data/pokemon_graphics/footprint_table.h +++ b/src/data/pokemon_graphics/footprint_table.h @@ -122,7 +122,7 @@ const u8 *const gMonFootprintTable[] = [SPECIES_SEAKING] = gMonFootprint_Seaking, [SPECIES_STARYU] = gMonFootprint_Staryu, [SPECIES_STARMIE] = gMonFootprint_Starmie, - [SPECIES_MR_MIME] = gMonFootprint_Mrmime, + [SPECIES_MR_MIME] = gMonFootprint_MrMime, [SPECIES_SCYTHER] = gMonFootprint_Scyther, [SPECIES_JYNX] = gMonFootprint_Jynx, [SPECIES_ELECTABUZZ] = gMonFootprint_Electabuzz, @@ -439,7 +439,7 @@ const u8 *const gMonFootprintTable[] = [SPECIES_BRONZOR] = gMonFootprint_Bronzor, [SPECIES_BRONZONG] = gMonFootprint_Bronzong, [SPECIES_BONSLY] = gMonFootprint_Bonsly, - [SPECIES_MIMEJR] = gMonFootprint_MimeJr, + [SPECIES_MIME_JR] = gMonFootprint_MimeJr, [SPECIES_HAPPINY] = gMonFootprint_Happiny, [SPECIES_CHATOT] = gMonFootprint_Chatot, [SPECIES_SPIRITOMB] = gMonFootprint_Spiritomb, diff --git a/src/data/pokemon_graphics/front_pic_anims.h b/src/data/pokemon_graphics/front_pic_anims.h index 9f5ae7cbd..421c830df 100644 --- a/src/data/pokemon_graphics/front_pic_anims.h +++ b/src/data/pokemon_graphics/front_pic_anims.h @@ -5256,7 +5256,7 @@ static const union AnimCmd sAnim_BONSLY_1[] = ANIMCMD_END, }; -static const union AnimCmd sAnim_MIMEJR_1[] = +static const union AnimCmd sAnim_MIME_JR_1[] = { ANIMCMD_FRAME(0, 10), ANIMCMD_FRAME(1, 10), @@ -8998,6 +8998,12 @@ static const union AnimCmd sAnim_LANDORUS_THERIAN_1[] = ANIMCMD_END, }; +static const union AnimCmd sAnim_KELDEO_RESOLUTE_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + static const union AnimCmd sAnim_MELOETTA_PIROUETTE_1[] = { ANIMCMD_FRAME(0, 1), @@ -9077,6 +9083,7 @@ static const union AnimCmd sAnim_DEOXYS_ATTACK_1[] = ANIMCMD_FRAME(0, 26), ANIMCMD_FRAME(1, 16), ANIMCMD_FRAME(0, 16), + ANIMCMD_END, }; static const union AnimCmd sAnim_DEOXYS_ATTACK_2[] = @@ -11526,9 +11533,9 @@ static const union AnimCmd *const sAnims_BONSLY[] ={ sAnim_BONSLY_1, }; -static const union AnimCmd *const sAnims_MIMEJR[] ={ +static const union AnimCmd *const sAnims_MIME_JR[] ={ sAnim_GeneralFrame0, - sAnim_MIMEJR_1, + sAnim_MIME_JR_1, }; static const union AnimCmd *const sAnims_HAPPINY[] ={ @@ -14321,6 +14328,11 @@ static const union AnimCmd *const sAnims_LANDORUS_THERIAN[] ={ sAnim_LANDORUS_THERIAN_1, }; +static const union AnimCmd *const sAnims_KELDEO_RESOLUTE[] ={ + sAnim_GeneralFrame0, + sAnim_KELDEO_RESOLUTE_1, +}; + static const union AnimCmd *const sAnims_MELOETTA_PIROUETTE[] ={ sAnim_GeneralFrame0, sAnim_MELOETTA_PIROUETTE_1, @@ -14843,7 +14855,7 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[] = ANIM_CMD(BRONZOR), ANIM_CMD(BRONZONG), ANIM_CMD(BONSLY), - ANIM_CMD(MIMEJR), + ANIM_CMD(MIME_JR), ANIM_CMD(HAPPINY), ANIM_CMD(CHATOT), ANIM_CMD(SPIRITOMB), @@ -15484,7 +15496,7 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[] = ANIM_CMD(KYUREM_WHITE), ANIM_CMD(KYUREM_BLACK), ANIM_CMD(MELOETTA_PIROUETTE), - ANIM_CMD_FULL(KELDEO_RESOLUTE, sAnims_KELDEO), + ANIM_CMD(KELDEO_RESOLUTE), ANIM_CMD_FULL(GENESECT_DOUSE_DRIVE, sAnims_GENESECT), ANIM_CMD_FULL(GENESECT_SHOCK_DRIVE, sAnims_GENESECT), ANIM_CMD_FULL(GENESECT_BURN_DRIVE, sAnims_GENESECT), @@ -15547,7 +15559,7 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[] = ANIM_CMD(ZYGARDE_COMPLETE), ANIM_CMD(HOOPA_UNBOUND), ANIM_CMD_FULL(ORICORIO_POM_POM, sAnims_ORICORIO), - ANIM_CMD_FULL(ORICORIO_PA_U, sAnims_ORICORIO), + ANIM_CMD_FULL(ORICORIO_PAU, sAnims_ORICORIO), ANIM_CMD_FULL(ORICORIO_SENSU, sAnims_ORICORIO), ANIM_CMD_FULL(ROCKRUFF_OWN_TEMPO, sAnims_ROCKRUFF), ANIM_CMD(LYCANROC_MIDNIGHT), diff --git a/src/data/pokemon_graphics/front_pic_coordinates.h b/src/data/pokemon_graphics/front_pic_coordinates.h index f3373ce35..56632aa43 100644 --- a/src/data/pokemon_graphics/front_pic_coordinates.h +++ b/src/data/pokemon_graphics/front_pic_coordinates.h @@ -2195,7 +2195,7 @@ const struct MonCoords gMonFrontPicCoords[] = .size = 0x55, .y_offset = 9, }, - [SPECIES_MIMEJR] = + [SPECIES_MIME_JR] = { .size = 0x77, .y_offset = 9, @@ -5759,7 +5759,7 @@ const struct MonCoords gMonFrontPicCoords[] = .size = 0x45, .y_offset = 2, }, - [SPECIES_ORICORIO_PA_U] = + [SPECIES_ORICORIO_PAU] = { .size = 0x45, .y_offset = 2, diff --git a/src/data/pokemon_graphics/front_pic_table.h b/src/data/pokemon_graphics/front_pic_table.h index ddb907952..e73f6458b 100644 --- a/src/data/pokemon_graphics/front_pic_table.h +++ b/src/data/pokemon_graphics/front_pic_table.h @@ -122,7 +122,7 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] = SPECIES_SPRITE(SEAKING, gMonFrontPic_Seaking), SPECIES_SPRITE(STARYU, gMonFrontPic_Staryu), SPECIES_SPRITE(STARMIE, gMonFrontPic_Starmie), - SPECIES_SPRITE(MR_MIME, gMonFrontPic_Mrmime), + SPECIES_SPRITE(MR_MIME, gMonFrontPic_MrMime), SPECIES_SPRITE(SCYTHER, gMonFrontPic_Scyther), SPECIES_SPRITE(JYNX, gMonFrontPic_Jynx), SPECIES_SPRITE(ELECTABUZZ, gMonFrontPic_Electabuzz), @@ -439,7 +439,7 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] = SPECIES_SPRITE(BRONZOR, gMonFrontPic_Bronzor), SPECIES_SPRITE(BRONZONG, gMonFrontPic_Bronzong), SPECIES_SPRITE(BONSLY, gMonFrontPic_Bonsly), - SPECIES_SPRITE(MIMEJR, gMonFrontPic_Mimejr), + SPECIES_SPRITE(MIME_JR, gMonFrontPic_MimeJr), SPECIES_SPRITE(HAPPINY, gMonFrontPic_Happiny), SPECIES_SPRITE(CHATOT, gMonFrontPic_Chatot), SPECIES_SPRITE(SPIRITOMB, gMonFrontPic_Spiritomb), @@ -772,7 +772,7 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] = SPECIES_SPRITE(SANDYGAST, gMonFrontPic_Sandygast), SPECIES_SPRITE(PALOSSAND, gMonFrontPic_Palossand), SPECIES_SPRITE(PYUKUMUKU, gMonFrontPic_Pyukumuku), - SPECIES_SPRITE(TYPE_NULL, gMonFrontPic_Type_null), + SPECIES_SPRITE(TYPE_NULL, gMonFrontPic_TypeNull), SPECIES_SPRITE(SILVALLY, gMonFrontPic_Silvally), SPECIES_SPRITE(MINIOR, gMonFrontPic_Minior), SPECIES_SPRITE(KOMALA, gMonFrontPic_Komala), @@ -782,13 +782,13 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] = SPECIES_SPRITE(BRUXISH, gMonFrontPic_Bruxish), SPECIES_SPRITE(DRAMPA, gMonFrontPic_Drampa), SPECIES_SPRITE(DHELMISE, gMonFrontPic_Dhelmise), - SPECIES_SPRITE(JANGMO_O, gMonFrontPic_Jangmo_o), - SPECIES_SPRITE(HAKAMO_O, gMonFrontPic_Hakamo_o), - SPECIES_SPRITE(KOMMO_O, gMonFrontPic_Kommo_o), - SPECIES_SPRITE(TAPU_KOKO, gMonFrontPic_Tapu_koko), - SPECIES_SPRITE(TAPU_LELE, gMonFrontPic_Tapu_lele), - SPECIES_SPRITE(TAPU_BULU, gMonFrontPic_Tapu_bulu), - SPECIES_SPRITE(TAPU_FINI, gMonFrontPic_Tapu_fini), + SPECIES_SPRITE(JANGMO_O, gMonFrontPic_Jangmoo), + SPECIES_SPRITE(HAKAMO_O, gMonFrontPic_Hakamoo), + SPECIES_SPRITE(KOMMO_O, gMonFrontPic_Kommoo), + SPECIES_SPRITE(TAPU_KOKO, gMonFrontPic_TapuKoko), + SPECIES_SPRITE(TAPU_LELE, gMonFrontPic_TapuLele), + SPECIES_SPRITE(TAPU_BULU, gMonFrontPic_TapuBulu), + SPECIES_SPRITE(TAPU_FINI, gMonFrontPic_TapuFini), SPECIES_SPRITE(COSMOG, gMonFrontPic_Cosmog), SPECIES_SPRITE(COSMOEM, gMonFrontPic_Cosmoem), SPECIES_SPRITE(SOLGALEO, gMonFrontPic_Solgaleo), @@ -1185,7 +1185,7 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] = SPECIES_SPRITE(HOOPA_UNBOUND, gMonFrontPic_HoopaUnbound), SPECIES_SPRITE(ORICORIO_POM_POM, gMonFrontPic_OricorioPomPom), - SPECIES_SPRITE(ORICORIO_PA_U, gMonFrontPic_OricorioPau), + SPECIES_SPRITE(ORICORIO_PAU, gMonFrontPic_OricorioPau), SPECIES_SPRITE(ORICORIO_SENSU, gMonFrontPic_OricorioSensu), SPECIES_SPRITE(ROCKRUFF_OWN_TEMPO, gMonFrontPic_Rockruff), diff --git a/src/data/pokemon_graphics/palette_table.h b/src/data/pokemon_graphics/palette_table.h index 0e202b5c2..c66d57846 100644 --- a/src/data/pokemon_graphics/palette_table.h +++ b/src/data/pokemon_graphics/palette_table.h @@ -122,7 +122,7 @@ const struct CompressedSpritePalette gMonPaletteTable[] = SPECIES_PAL(SEAKING, gMonPalette_Seaking), SPECIES_PAL(STARYU, gMonPalette_Staryu), SPECIES_PAL(STARMIE, gMonPalette_Starmie), - SPECIES_PAL(MR_MIME, gMonPalette_Mrmime), + SPECIES_PAL(MR_MIME, gMonPalette_MrMime), SPECIES_PAL(SCYTHER, gMonPalette_Scyther), SPECIES_PAL(JYNX, gMonPalette_Jynx), SPECIES_PAL(ELECTABUZZ, gMonPalette_Electabuzz), @@ -439,7 +439,7 @@ const struct CompressedSpritePalette gMonPaletteTable[] = SPECIES_PAL(BRONZOR, gMonPalette_Bronzor), SPECIES_PAL(BRONZONG, gMonPalette_Bronzong), SPECIES_PAL(BONSLY, gMonPalette_Bonsly), - SPECIES_PAL(MIMEJR, gMonPalette_Mimejr), + SPECIES_PAL(MIME_JR, gMonPalette_MimeJr), SPECIES_PAL(HAPPINY, gMonPalette_Happiny), SPECIES_PAL(CHATOT, gMonPalette_Chatot), SPECIES_PAL(SPIRITOMB, gMonPalette_Spiritomb), @@ -772,7 +772,7 @@ const struct CompressedSpritePalette gMonPaletteTable[] = SPECIES_PAL(SANDYGAST, gMonPalette_Sandygast), SPECIES_PAL(PALOSSAND, gMonPalette_Palossand), SPECIES_PAL(PYUKUMUKU, gMonPalette_Pyukumuku), - SPECIES_PAL(TYPE_NULL, gMonPalette_Type_null), + SPECIES_PAL(TYPE_NULL, gMonPalette_TypeNull), SPECIES_PAL(SILVALLY, gMonPalette_Silvally), SPECIES_PAL(MINIOR, gMonPalette_Minior), SPECIES_PAL(KOMALA, gMonPalette_Komala), @@ -782,13 +782,13 @@ const struct CompressedSpritePalette gMonPaletteTable[] = SPECIES_PAL(BRUXISH, gMonPalette_Bruxish), SPECIES_PAL(DRAMPA, gMonPalette_Drampa), SPECIES_PAL(DHELMISE, gMonPalette_Dhelmise), - SPECIES_PAL(JANGMO_O, gMonPalette_Jangmo_o), - SPECIES_PAL(HAKAMO_O, gMonPalette_Hakamo_o), - SPECIES_PAL(KOMMO_O, gMonPalette_Kommo_o), - SPECIES_PAL(TAPU_KOKO, gMonPalette_Tapu_koko), - SPECIES_PAL(TAPU_LELE, gMonPalette_Tapu_lele), - SPECIES_PAL(TAPU_BULU, gMonPalette_Tapu_bulu), - SPECIES_PAL(TAPU_FINI, gMonPalette_Tapu_fini), + SPECIES_PAL(JANGMO_O, gMonPalette_Jangmoo), + SPECIES_PAL(HAKAMO_O, gMonPalette_Hakamoo), + SPECIES_PAL(KOMMO_O, gMonPalette_Kommoo), + SPECIES_PAL(TAPU_KOKO, gMonPalette_TapuKoko), + SPECIES_PAL(TAPU_LELE, gMonPalette_TapuLele), + SPECIES_PAL(TAPU_BULU, gMonPalette_TapuBulu), + SPECIES_PAL(TAPU_FINI, gMonPalette_TapuFini), SPECIES_PAL(COSMOG, gMonPalette_Cosmog), SPECIES_PAL(COSMOEM, gMonPalette_Cosmoem), SPECIES_PAL(SOLGALEO, gMonPalette_Solgaleo), @@ -1185,7 +1185,7 @@ const struct CompressedSpritePalette gMonPaletteTable[] = SPECIES_PAL(HOOPA_UNBOUND, gMonPalette_HoopaUnbound), SPECIES_PAL(ORICORIO_POM_POM, gMonPalette_OricorioPomPom), - SPECIES_PAL(ORICORIO_PA_U, gMonPalette_OricorioPau), + SPECIES_PAL(ORICORIO_PAU, gMonPalette_OricorioPau), SPECIES_PAL(ORICORIO_SENSU, gMonPalette_OricorioSensu), SPECIES_PAL(ROCKRUFF_OWN_TEMPO, gMonPalette_Rockruff), diff --git a/src/data/pokemon_graphics/shiny_palette_table.h b/src/data/pokemon_graphics/shiny_palette_table.h index 180fc7c00..0985b1609 100644 --- a/src/data/pokemon_graphics/shiny_palette_table.h +++ b/src/data/pokemon_graphics/shiny_palette_table.h @@ -122,7 +122,7 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] = SPECIES_SHINY_PAL(SEAKING, gMonShinyPalette_Seaking), SPECIES_SHINY_PAL(STARYU, gMonShinyPalette_Staryu), SPECIES_SHINY_PAL(STARMIE, gMonShinyPalette_Starmie), - SPECIES_SHINY_PAL(MR_MIME, gMonShinyPalette_Mrmime), + SPECIES_SHINY_PAL(MR_MIME, gMonShinyPalette_MrMime), SPECIES_SHINY_PAL(SCYTHER, gMonShinyPalette_Scyther), SPECIES_SHINY_PAL(JYNX, gMonShinyPalette_Jynx), SPECIES_SHINY_PAL(ELECTABUZZ, gMonShinyPalette_Electabuzz), @@ -439,7 +439,7 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] = SPECIES_SHINY_PAL(BRONZOR, gMonShinyPalette_Bronzor), SPECIES_SHINY_PAL(BRONZONG, gMonShinyPalette_Bronzong), SPECIES_SHINY_PAL(BONSLY, gMonShinyPalette_Bonsly), - SPECIES_SHINY_PAL(MIMEJR, gMonShinyPalette_Mimejr), + SPECIES_SHINY_PAL(MIME_JR, gMonShinyPalette_MimeJr), SPECIES_SHINY_PAL(HAPPINY, gMonShinyPalette_Happiny), SPECIES_SHINY_PAL(CHATOT, gMonShinyPalette_Chatot), SPECIES_SHINY_PAL(SPIRITOMB, gMonShinyPalette_Spiritomb), @@ -772,7 +772,7 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] = SPECIES_SHINY_PAL(SANDYGAST, gMonShinyPalette_Sandygast), SPECIES_SHINY_PAL(PALOSSAND, gMonShinyPalette_Palossand), SPECIES_SHINY_PAL(PYUKUMUKU, gMonShinyPalette_Pyukumuku), - SPECIES_SHINY_PAL(TYPE_NULL, gMonShinyPalette_Type_null), + SPECIES_SHINY_PAL(TYPE_NULL, gMonShinyPalette_TypeNull), SPECIES_SHINY_PAL(SILVALLY, gMonShinyPalette_Silvally), SPECIES_SHINY_PAL(MINIOR, gMonShinyPalette_Minior), SPECIES_SHINY_PAL(KOMALA, gMonShinyPalette_Komala), @@ -782,13 +782,13 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] = SPECIES_SHINY_PAL(BRUXISH, gMonShinyPalette_Bruxish), SPECIES_SHINY_PAL(DRAMPA, gMonShinyPalette_Drampa), SPECIES_SHINY_PAL(DHELMISE, gMonShinyPalette_Dhelmise), - SPECIES_SHINY_PAL(JANGMO_O, gMonShinyPalette_Jangmo_o), - SPECIES_SHINY_PAL(HAKAMO_O, gMonShinyPalette_Hakamo_o), - SPECIES_SHINY_PAL(KOMMO_O, gMonShinyPalette_Kommo_o), - SPECIES_SHINY_PAL(TAPU_KOKO, gMonShinyPalette_Tapu_koko), - SPECIES_SHINY_PAL(TAPU_LELE, gMonShinyPalette_Tapu_lele), - SPECIES_SHINY_PAL(TAPU_BULU, gMonShinyPalette_Tapu_bulu), - SPECIES_SHINY_PAL(TAPU_FINI, gMonShinyPalette_Tapu_fini), + SPECIES_SHINY_PAL(JANGMO_O, gMonShinyPalette_Jangmoo), + SPECIES_SHINY_PAL(HAKAMO_O, gMonShinyPalette_Hakamoo), + SPECIES_SHINY_PAL(KOMMO_O, gMonShinyPalette_Kommoo), + SPECIES_SHINY_PAL(TAPU_KOKO, gMonShinyPalette_TapuKoko), + SPECIES_SHINY_PAL(TAPU_LELE, gMonShinyPalette_TapuLele), + SPECIES_SHINY_PAL(TAPU_BULU, gMonShinyPalette_TapuBulu), + SPECIES_SHINY_PAL(TAPU_FINI, gMonShinyPalette_TapuFini), SPECIES_SHINY_PAL(COSMOG, gMonShinyPalette_Cosmog), SPECIES_SHINY_PAL(COSMOEM, gMonShinyPalette_Cosmoem), SPECIES_SHINY_PAL(SOLGALEO, gMonShinyPalette_Solgaleo), @@ -1185,7 +1185,7 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] = SPECIES_SHINY_PAL(HOOPA_UNBOUND, gMonShinyPalette_HoopaUnbound), SPECIES_SHINY_PAL(ORICORIO_POM_POM, gMonShinyPalette_OricorioPomPom), - SPECIES_SHINY_PAL(ORICORIO_PA_U, gMonShinyPalette_OricorioPau), + SPECIES_SHINY_PAL(ORICORIO_PAU, gMonShinyPalette_OricorioPau), SPECIES_SHINY_PAL(ORICORIO_SENSU, gMonShinyPalette_OricorioSensu), SPECIES_SHINY_PAL(ROCKRUFF_OWN_TEMPO, gMonShinyPalette_Rockruff), diff --git a/src/data/text/species_names.h b/src/data/text/species_names.h index d51f76ae2..9d5c3ebd5 100644 --- a/src/data/text/species_names.h +++ b/src/data/text/species_names.h @@ -438,7 +438,7 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = { [SPECIES_BRONZOR] = _("Bronzor"), [SPECIES_BRONZONG] = _("Bronzong"), [SPECIES_BONSLY] = _("Bonsly"), - [SPECIES_MIMEJR] = _("Mime jr."), + [SPECIES_MIME_JR] = _("Mime Jr."), [SPECIES_HAPPINY] = _("Happiny"), [SPECIES_CHATOT] = _("Chatot"), [SPECIES_SPIRITOMB] = _("Spiritomb"), @@ -473,7 +473,7 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = { [SPECIES_GLACEON] = _("Glaceon"), [SPECIES_GLISCOR] = _("Gliscor"), [SPECIES_MAMOSWINE] = _("Mamoswine"), - [SPECIES_PORYGON_Z] = _("Porygon-z"), + [SPECIES_PORYGON_Z] = _("Porygon-Z"), [SPECIES_GALLADE] = _("Gallade"), [SPECIES_PROBOPASS] = _("Probopass"), [SPECIES_DUSKNOIR] = _("Dusknoir"), @@ -1188,7 +1188,7 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = { [SPECIES_HOOPA_UNBOUND] = _("Hoopa"), // Oricorio [SPECIES_ORICORIO_POM_POM] = _("Oricorio"), - [SPECIES_ORICORIO_PA_U] = _("Oricorio"), + [SPECIES_ORICORIO_PAU] = _("Oricorio"), [SPECIES_ORICORIO_SENSU] = _("Oricorio"), // Rockruff [SPECIES_ROCKRUFF_OWN_TEMPO] = _("Rockruff"), diff --git a/src/daycare.c b/src/daycare.c index 511fa0551..2a1efefcc 100644 --- a/src/daycare.c +++ b/src/daycare.c @@ -838,7 +838,7 @@ void CreateEgg(struct Pokemon *mon, u16 species, bool8 setHotSpringsLocation) u8 metLocation; u8 isEgg; - CreateMon(mon, species, EGG_HATCH_LEVEL, 32, FALSE, 0, OT_ID_PLAYER_ID, 0); + CreateMon(mon, species, EGG_HATCH_LEVEL, USE_RANDOM_IVS, FALSE, 0, OT_ID_PLAYER_ID, 0); metLevel = 0; ball = ITEM_POKE_BALL; language = LANGUAGE_JAPANESE; @@ -865,7 +865,7 @@ static void SetInitialEggData(struct Pokemon *mon, u16 species, struct DayCare * u8 language; personality = daycare->offspringPersonality; - CreateMon(mon, species, EGG_HATCH_LEVEL, 32, TRUE, personality, OT_ID_PLAYER_ID, 0); + CreateMon(mon, species, EGG_HATCH_LEVEL, USE_RANDOM_IVS, TRUE, personality, OT_ID_PLAYER_ID, 0); metLevel = 0; ball = ITEM_POKE_BALL; language = LANGUAGE_JAPANESE; diff --git a/src/decoration.c b/src/decoration.c index 74dbacdf9..484398aba 100644 --- a/src/decoration.c +++ b/src/decoration.c @@ -113,7 +113,7 @@ EWRAM_DATA static u16 sDecorationsCursorPos = 0; EWRAM_DATA static u16 sDecorationsScrollOffset = 0; EWRAM_DATA u8 gCurDecorationIndex = 0; EWRAM_DATA static u8 sCurDecorationCategory = DECORCAT_DESK; -EWRAM_DATA static u32 filler_0203a174[2] = {}; +EWRAM_DATA static u32 sFiller[2] = {}; EWRAM_DATA static struct DecorationPCContext sDecorationContext = {}; EWRAM_DATA static u8 sDecorMenuWindowIds[WINDOW_COUNT] = {}; EWRAM_DATA static struct DecorationItemsMenu *sDecorationItemsMenu = NULL; @@ -1210,7 +1210,7 @@ static void ShowDecorationOnMap_(u16 mapX, u16 mapY, u8 decWidth, u8 decHeight, for (i = 0; i < decWidth; i++) { x = mapX + i; - behavior = GetBehaviorByMetatileId(0x200 + gDecorations[decoration].tiles[j * decWidth + i]); + behavior = GetBehaviorByMetatileId(NUM_TILES_IN_PRIMARY + gDecorations[decoration].tiles[j * decWidth + i]); if (MetatileBehavior_IsSecretBaseImpassable(behavior) == TRUE || (gDecorations[decoration].permission != DECORPERM_PASS_FLOOR && (behavior >> METATILE_ELEVATION_SHIFT))) impassableFlag = METATILE_COLLISION_MASK; else @@ -1224,9 +1224,9 @@ static void ShowDecorationOnMap_(u16 mapX, u16 mapY, u8 decWidth, u8 decHeight, elevation = GetDecorationElevation(gDecorations[decoration].id, j * decWidth + i); if (elevation != 0xFFFF) - MapGridSetMetatileEntryAt(x, y, (gDecorations[decoration].tiles[j * decWidth + i] + (0x200 | overlapsWall)) | impassableFlag | elevation); + MapGridSetMetatileEntryAt(x, y, (gDecorations[decoration].tiles[j * decWidth + i] + (NUM_TILES_IN_PRIMARY | overlapsWall)) | impassableFlag | elevation); else - MapGridSetMetatileIdAt(x, y, (gDecorations[decoration].tiles[j * decWidth + i] + (0x200 | overlapsWall)) | impassableFlag); + MapGridSetMetatileIdAt(x, y, (gDecorations[decoration].tiles[j * decWidth + i] + (NUM_TILES_IN_PRIMARY | overlapsWall)) | impassableFlag); } } } @@ -1524,7 +1524,7 @@ static bool8 CanPlaceDecoration(u8 taskId, const struct Decoration *decoration) { curX = gTasks[taskId].tCursorX + j; behaviorAt = MapGridGetMetatileBehaviorAt(curX, curY); - behaviorBy = GetBehaviorByMetatileId(0x200 + decoration->tiles[(mapY - 1 - i) * mapX + j]) & METATILE_ELEVATION_MASK; + behaviorBy = GetBehaviorByMetatileId(NUM_TILES_IN_PRIMARY + decoration->tiles[(mapY - 1 - i) * mapX + j]) & METATILE_ELEVATION_MASK; if (!IsFloorOrBoardAndHole(behaviorAt, decoration)) return FALSE; @@ -1545,7 +1545,7 @@ static bool8 CanPlaceDecoration(u8 taskId, const struct Decoration *decoration) { curX = gTasks[taskId].tCursorX + j; behaviorAt = MapGridGetMetatileBehaviorAt(curX, curY); - behaviorBy = GetBehaviorByMetatileId(0x200 + decoration->tiles[(mapY - 1 - i) * mapX + j]) & METATILE_ELEVATION_MASK; + behaviorBy = GetBehaviorByMetatileId(NUM_TILES_IN_PRIMARY + decoration->tiles[(mapY - 1 - i) * mapX + j]) & METATILE_ELEVATION_MASK; if (!MetatileBehavior_IsNormal(behaviorAt) && !IsNonBlockNonElevated(behaviorAt, behaviorBy)) return FALSE; @@ -1562,7 +1562,7 @@ static bool8 CanPlaceDecoration(u8 taskId, const struct Decoration *decoration) { curX = gTasks[taskId].tCursorX + j; behaviorAt = MapGridGetMetatileBehaviorAt(curX, curY); - behaviorBy = GetBehaviorByMetatileId(0x200 + decoration->tiles[j]) & METATILE_ELEVATION_MASK; + behaviorBy = GetBehaviorByMetatileId(NUM_TILES_IN_PRIMARY + decoration->tiles[j]) & METATILE_ELEVATION_MASK; if (!MetatileBehavior_IsNormal(behaviorAt) && !MetatileBehavior_IsSecretBaseNorthWall(behaviorAt)) return FALSE; @@ -1971,9 +1971,9 @@ static void SetDecorSelectionMetatiles(struct PlaceDecorationGraphicsDataBuffer u8 shape; shape = data->decoration->shape; - for (i = 0; i < gUnknown_085A71B0[shape].size; i++) + for (i = 0; i < sDecorTilemaps[shape].size; i++) { - data->tiles[gUnknown_085A71B0[shape].tiles[i]] = GetMetatile(data->decoration->tiles[gUnknown_085A71B0[shape].y[i]] * 8 + gUnknown_085A71B0[shape].x[i]); + data->tiles[sDecorTilemaps[shape].tiles[i]] = GetMetatile(data->decoration->tiles[sDecorTilemaps[shape].y[i]] * 8 + sDecorTilemaps[shape].x[i]); } } diff --git a/src/diploma.c b/src/diploma.c index f243d09f9..8f04bb9ad 100644 --- a/src/diploma.c +++ b/src/diploma.c @@ -168,7 +168,7 @@ static const struct BgTemplate sDiplomaBgTemplates[2] = static void InitDiplomaBg(void) { ResetBgsAndClearDma3BusyFlags(0); - InitBgsFromTemplates(0, sDiplomaBgTemplates, 2); + InitBgsFromTemplates(0, sDiplomaBgTemplates, ARRAY_COUNT(sDiplomaBgTemplates)); SetBgTilemapBuffer(1, sDiplomaTilemapPtr); SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_ON | DISPCNT_OBJ_1D_MAP); ShowBg(0); diff --git a/src/easy_chat.c b/src/easy_chat.c index 2590eea1a..6bb77bc84 100644 --- a/src/easy_chat.c +++ b/src/easy_chat.c @@ -4073,7 +4073,6 @@ static void sub_811D864(u8 arg0, u8 arg1) { int i, j; u16 easyChatWord; - u8 *str; int y; int var0; diff --git a/src/egg_hatch.c b/src/egg_hatch.c index cdaa032b5..a47fff3f1 100644 --- a/src/egg_hatch.c +++ b/src/egg_hatch.c @@ -322,7 +322,7 @@ static void CreateHatchedMon(struct Pokemon *egg, struct Pokemon *temp) pokerus = GetMonData(egg, MON_DATA_POKERUS); obedience = GetMonData(egg, MON_DATA_OBEDIENCE); - CreateMon(temp, species, EGG_HATCH_LEVEL, 32, TRUE, personality, OT_ID_PLAYER_ID, 0); + CreateMon(temp, species, EGG_HATCH_LEVEL, USE_RANDOM_IVS, TRUE, personality, OT_ID_PLAYER_ID, 0); for (i = 0; i < MAX_MON_MOVES; i++) { diff --git a/src/ereader_screen.c b/src/ereader_screen.c index 3f2cf3217..d27605c1d 100755 --- a/src/ereader_screen.c +++ b/src/ereader_screen.c @@ -211,7 +211,6 @@ static u32 sub_81D4EE4(u8 *arg0, u16 *arg1) void task_add_00_ereader(void) { - int value; struct Unk81D5014 *data; u8 taskId = CreateTask(sub_81D5084, 0); data = (struct Unk81D5014 *)gTasks[taskId].data; diff --git a/src/event_object_movement.c b/src/event_object_movement.c index 12ef4acdc..d9c06eb10 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -87,7 +87,7 @@ static void GetGroundEffectFlags_Puddle(struct ObjectEvent*, u32*); static void GetGroundEffectFlags_Ripple(struct ObjectEvent*, u32*); static void GetGroundEffectFlags_Seaweed(struct ObjectEvent*, u32*); static void GetGroundEffectFlags_JumpLanding(struct ObjectEvent*, u32*); -static u8 ObjectEventCheckForReflectiveSurface(struct ObjectEvent*); +static u8 ObjectEventGetNearbyReflectionType(struct ObjectEvent*); static u8 GetReflectionTypeByMetatileBehavior(u32); static void InitObjectPriorityByZCoord(struct Sprite *sprite, u8 z); static void ObjectEventUpdateSubpriority(struct ObjectEvent*, struct Sprite*); @@ -130,7 +130,6 @@ static struct ObjectEventTemplate *FindObjectEventTemplateByLocalId(u8 localId, static void ClearObjectEventMovement(struct ObjectEvent *, struct Sprite *); static void ObjectEventSetSingleMovement(struct ObjectEvent *, struct Sprite *, u8); static void oamt_npc_ministep_reset(struct Sprite *, u8, u8); -static void UpdateObjectEventSpriteSubpriorityAndVisibility(struct Sprite *); static void InitSpriteForFigure8Anim(struct Sprite *sprite); static bool8 AnimateSpriteInFigure8(struct Sprite *sprite); static void UpdateObjectEventSprite(struct Sprite *); @@ -7514,21 +7513,23 @@ static void ObjectEventUpdateMetatileBehaviors(struct ObjectEvent *objEvent) static void GetGroundEffectFlags_Reflection(struct ObjectEvent *objEvent, u32 *flags) { - u32 reflectionFlags[2] = { GROUND_EFFECT_FLAG_REFLECTION, GROUND_EFFECT_FLAG_ICE_REFLECTION }; - u8 type = ObjectEventCheckForReflectiveSurface(objEvent); + u32 reflectionFlags[NUM_REFLECTION_TYPES - 1] = { + [REFL_TYPE_ICE - 1] = GROUND_EFFECT_FLAG_ICE_REFLECTION, + [REFL_TYPE_WATER - 1] = GROUND_EFFECT_FLAG_WATER_REFLECTION + }; + u8 reflType = ObjectEventGetNearbyReflectionType(objEvent); - if (type) + if (reflType) { - if (!objEvent->hasReflection) + if (objEvent->hasReflection == 0) { - objEvent->hasReflection = 0; - objEvent->hasReflection = 1; - *flags |= reflectionFlags[type - 1]; + objEvent->hasReflection++; + *flags |= reflectionFlags[reflType - 1]; } } else { - objEvent->hasReflection = 0; + objEvent->hasReflection = FALSE; } } @@ -7701,26 +7702,24 @@ static void GetGroundEffectFlags_JumpLanding(struct ObjectEvent *objEvent, u32 * } } -static u8 ObjectEventCheckForReflectiveSurface(struct ObjectEvent *objEvent) +#define RETURN_REFLECTION_TYPE_AT(x, y) \ + b = MapGridGetMetatileBehaviorAt(x, y); \ + result = GetReflectionTypeByMetatileBehavior(b); \ + if (result != REFL_TYPE_NONE) \ + return result; + +static u8 ObjectEventGetNearbyReflectionType(struct ObjectEvent *objEvent) { const struct ObjectEventGraphicsInfo *info = GetObjectEventGraphicsInfo(objEvent->graphicsId); // ceil div by tile width? s16 width = (info->width + 8) >> 4; s16 height = (info->height + 8) >> 4; - s16 i; - s16 j; - u8 result; - u8 b; - s16 one; + s16 i, j; + u8 result, b; // used by RETURN_REFLECTION_TYPE_AT + s16 one = 1; -#define RETURN_REFLECTION_TYPE_AT(x, y) \ - b = MapGridGetMetatileBehaviorAt(x, y); \ - result = GetReflectionTypeByMetatileBehavior(b); \ - if (result != 0) \ - return result; - - for (i = 0, one = 1; i < height; i++) + for (i = 0; i < height; i++) { RETURN_REFLECTION_TYPE_AT(objEvent->currentCoords.x, objEvent->currentCoords.y + one + i) RETURN_REFLECTION_TYPE_AT(objEvent->previousCoords.x, objEvent->previousCoords.y + one + i) @@ -7732,19 +7731,20 @@ static u8 ObjectEventCheckForReflectiveSurface(struct ObjectEvent *objEvent) RETURN_REFLECTION_TYPE_AT(objEvent->previousCoords.x - j, objEvent->previousCoords.y + one + i) } } - return 0; + + return REFL_TYPE_NONE; +} #undef RETURN_REFLECTION_TYPE_AT -} static u8 GetReflectionTypeByMetatileBehavior(u32 behavior) { if (MetatileBehavior_IsIce(behavior)) - return 1; + return REFL_TYPE_ICE; else if (MetatileBehavior_IsReflective(behavior)) - return 2; + return REFL_TYPE_WATER; else - return 0; + return REFL_TYPE_NONE; } u8 GetLedgeJumpDirection(s16 x, s16 y, u8 z) @@ -7945,12 +7945,12 @@ void GroundEffect_StepOnLongGrass(struct ObjectEvent *objEvent, struct Sprite *s void GroundEffect_WaterReflection(struct ObjectEvent *objEvent, struct Sprite *sprite) { - SetUpReflection(objEvent, sprite, 0); + SetUpReflection(objEvent, sprite, FALSE); } void GroundEffect_IceReflection(struct ObjectEvent *objEvent, struct Sprite *sprite) { - SetUpReflection(objEvent, sprite, 1); + SetUpReflection(objEvent, sprite, TRUE); } void GroundEffect_FlowingWater(struct ObjectEvent *objEvent, struct Sprite *sprite) @@ -8117,8 +8117,8 @@ static void (*const sGroundEffectFuncs[])(struct ObjectEvent *objEvent, struct S GroundEffect_StepOnTallGrass, // GROUND_EFFECT_FLAG_TALL_GRASS_ON_MOVE GroundEffect_SpawnOnLongGrass, // GROUND_EFFECT_FLAG_LONG_GRASS_ON_SPAWN GroundEffect_StepOnLongGrass, // GROUND_EFFECT_FLAG_LONG_GRASS_ON_MOVE - GroundEffect_WaterReflection, // GROUND_EFFECT_FLAG_ICE_REFLECTION - GroundEffect_IceReflection, // GROUND_EFFECT_FLAG_REFLECTION + GroundEffect_WaterReflection, // GROUND_EFFECT_FLAG_WATER_REFLECTION + GroundEffect_IceReflection, // GROUND_EFFECT_FLAG_ICE_REFLECTION GroundEffect_FlowingWater, // GROUND_EFFECT_FLAG_SHALLOW_FLOWING_WATER GroundEffect_SandTracks, // GROUND_EFFECT_FLAG_SAND GroundEffect_DeepSandTracks, // GROUND_EFFECT_FLAG_DEEP_SAND @@ -8649,14 +8649,14 @@ static void DestroyObjectEventSprites(void) } } -static int GetObjectEventSpriteId(u8 var) // this should return a u8, because all that call this shifts to u8, but it wont match because it doesnt shift u8 at the end. +static int GetObjectEventSpriteId(u8 objectEventId) // this should return a u8, because all that call this shifts to u8, but it wont match because it doesnt shift u8 at the end. { int i; for (i = 0; i < MAX_SPRITES; i++) { struct Sprite *sprite = &gSprites[i]; - if(sprite->inUse && sprite->callback == UpdateObjectEventSprite && (u8)sprite->data[0] == var) + if (sprite->inUse && sprite->callback == UpdateObjectEventSprite && (u8)sprite->data[0] == objectEventId) return i; } return MAX_SPRITES; @@ -8788,9 +8788,9 @@ static void UpdateObjectEventSpritePosition(struct Sprite *sprite) } } -bool32 IsObjectEventSpriteAnimating(u8 var) +bool32 IsObjectEventSpriteAnimating(u8 objectEventId) { - u8 spriteId = GetObjectEventSpriteId(var); + u8 spriteId = GetObjectEventSpriteId(objectEventId); if (spriteId == MAX_SPRITES) return FALSE; diff --git a/src/evolution_scene.c b/src/evolution_scene.c index 27a62ec80..0438d6e66 100644 --- a/src/evolution_scene.c +++ b/src/evolution_scene.c @@ -60,7 +60,6 @@ static void CB2_TradeEvolutionSceneUpdate(void); static void EvoDummyFunc(void); static void VBlankCB_EvolutionScene(void); static void VBlankCB_TradeEvolutionScene(void); -static void sub_81150D8(void); static void sub_8140134(void); static void EvoScene_DoMonAnimation(u8 monSpriteId, u16 speciesId); static bool32 EvoScene_IsMonAnimFinished(u8 monSpriteId); diff --git a/src/faraway_island.c b/src/faraway_island.c index e3d8444c9..bc0814652 100755 --- a/src/faraway_island.c +++ b/src/faraway_island.c @@ -372,7 +372,6 @@ void SetMewAboveGrass(void) { s16 x; s16 y; - u8 spriteId; struct ObjectEvent *mew = &gObjectEvents[GetMewObjectEventId()]; mew->invisible = FALSE; diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c index fab14c577..a811901a9 100644 --- a/src/field_control_avatar.c +++ b/src/field_control_avatar.c @@ -730,7 +730,8 @@ static bool8 TryStartWarpEventScript(struct MapPosition *position, u16 metatileB } if (MetatileBehavior_IsWarpOrBridge(metatileBehavior) == TRUE) { - sub_80B0268(); + // Maybe unused? This MB is used by log bridges, but there's never a warp event on them + DoSpinExitWarp(); return TRUE; } if (MetatileBehavior_IsMtPyreHole(metatileBehavior) == TRUE) diff --git a/src/field_effect.c b/src/field_effect.c index 877df4610..16785e438 100644 --- a/src/field_effect.c +++ b/src/field_effect.c @@ -934,43 +934,43 @@ void FreeResourcesAndDestroySprite(struct Sprite *sprite, u8 spriteId) // r, g, b are between 0 and 16 void MultiplyInvertedPaletteRGBComponents(u16 i, u8 r, u8 g, u8 b) { - int curRed; - int curGreen; - int curBlue; - u16 outPal; - - outPal = gPlttBufferUnfaded[i]; - curRed = outPal & 0x1f; - curGreen = (outPal & (0x1f << 5)) >> 5; - curBlue = (outPal & (0x1f << 10)) >> 10; - curRed += (((0x1f - curRed) * r) >> 4); - curGreen += (((0x1f - curGreen) * g) >> 4); - curBlue += (((0x1f - curBlue) * b) >> 4); - outPal = curRed; - outPal |= curGreen << 5; - outPal |= curBlue << 10; - gPlttBufferFaded[i] = outPal; + int curRed, curGreen, curBlue; + u16 color = gPlttBufferUnfaded[i]; + + curRed = (color & RGB_RED); + curGreen = (color & RGB_GREEN) >> 5; + curBlue = (color & RGB_BLUE) >> 10; + + curRed += (((0x1F - curRed) * r) >> 4); + curGreen += (((0x1F - curGreen) * g) >> 4); + curBlue += (((0x1F - curBlue) * b) >> 4); + + color = curRed; + color |= (curGreen << 5); + color |= (curBlue << 10); + + gPlttBufferFaded[i] = color; } // r, g, b are between 0 and 16 void MultiplyPaletteRGBComponents(u16 i, u8 r, u8 g, u8 b) { - int curRed; - int curGreen; - int curBlue; - u16 outPal; - - outPal = gPlttBufferUnfaded[i]; - curRed = outPal & 0x1f; - curGreen = (outPal & (0x1f << 5)) >> 5; - curBlue = (outPal & (0x1f << 10)) >> 10; - curRed -= ((curRed * r) >> 4); + int curRed, curGreen, curBlue; + u16 color = gPlttBufferUnfaded[i]; + + curRed = (color & RGB_RED); + curGreen = (color & RGB_GREEN) >> 5; + curBlue = (color & RGB_BLUE) >> 10; + + curRed -= ((curRed * r) >> 4); curGreen -= ((curGreen * g) >> 4); - curBlue -= ((curBlue * b) >> 4); - outPal = curRed; - outPal |= curGreen << 5; - outPal |= curBlue << 10; - gPlttBufferFaded[i] = outPal; + curBlue -= ((curBlue * b) >> 4); + + color = curRed; + color |= curGreen << 5; + color |= curBlue << 10; + + gPlttBufferFaded[i] = color; } // Task data for Task_PokecenterHeal and Task_HallOfFameRecord diff --git a/src/field_effect_helpers.c b/src/field_effect_helpers.c index 2322232b8..67102a83b 100755 --- a/src/field_effect_helpers.c +++ b/src/field_effect_helpers.c @@ -32,6 +32,11 @@ static void CreateBobbingEffect(struct ObjectEvent *, struct Sprite *, struct Sp static void sub_8155850(struct Sprite *); static u32 ShowDisguiseFieldEffect(u8, u8, u8); +#define sReflectionObjEventId data[0] +#define sReflectionObjEventLocalId data[1] +#define sReflectionVerticalOffset data[2] +#define sIsStillReflection data[7] + void SetUpReflection(struct ObjectEvent *objectEvent, struct Sprite *sprite, bool8 stillReflection) { struct Sprite *reflectionSprite; @@ -46,9 +51,9 @@ void SetUpReflection(struct ObjectEvent *objectEvent, struct Sprite *sprite, boo reflectionSprite->affineAnims = gDummySpriteAffineAnimTable; reflectionSprite->affineAnimBeginning = TRUE; reflectionSprite->subspriteMode = SUBSPRITES_OFF; - reflectionSprite->data[0] = sprite->data[0]; - reflectionSprite->data[1] = objectEvent->localId; - reflectionSprite->data[7] = stillReflection; + reflectionSprite->sReflectionObjEventId = sprite->data[0]; + reflectionSprite->sReflectionObjEventLocalId = objectEvent->localId; + reflectionSprite->sIsStillReflection = stillReflection; LoadObjectReflectionPalette(objectEvent, reflectionSprite); if (!stillReflection) @@ -60,19 +65,19 @@ static s16 GetReflectionVerticalOffset(struct ObjectEvent *objectEvent) return GetObjectEventGraphicsInfo(objectEvent->graphicsId)->height - 2; } -static void LoadObjectReflectionPalette(struct ObjectEvent *objectEvent, struct Sprite *sprite) +static void LoadObjectReflectionPalette(struct ObjectEvent *objectEvent, struct Sprite *reflectionSprite) { u8 bridgeType; u16 bridgeReflectionVerticalOffsets[] = { 12, 28, 44 }; - sprite->data[2] = 0; + reflectionSprite->sReflectionVerticalOffset = 0; if (!GetObjectEventGraphicsInfo(objectEvent->graphicsId)->disableReflectionPaletteLoad && ((bridgeType = MetatileBehavior_GetBridgeType(objectEvent->previousMetatileBehavior)) || (bridgeType = MetatileBehavior_GetBridgeType(objectEvent->currentMetatileBehavior)))) { - sprite->data[2] = bridgeReflectionVerticalOffsets[bridgeType - 1]; - LoadObjectHighBridgeReflectionPalette(objectEvent, sprite->oam.paletteNum); + reflectionSprite->sReflectionVerticalOffset = bridgeReflectionVerticalOffsets[bridgeType - 1]; + LoadObjectHighBridgeReflectionPalette(objectEvent, reflectionSprite->oam.paletteNum); } else { - LoadObjectRegularReflectionPalette(objectEvent, sprite->oam.paletteNum); + LoadObjectRegularReflectionPalette(objectEvent, reflectionSprite->oam.paletteNum); } } @@ -118,9 +123,9 @@ static void UpdateObjectReflectionSprite(struct Sprite *reflectionSprite) struct ObjectEvent *objectEvent; struct Sprite *mainSprite; - objectEvent = &gObjectEvents[reflectionSprite->data[0]]; + objectEvent = &gObjectEvents[reflectionSprite->sReflectionObjEventId]; mainSprite = &gSprites[objectEvent->spriteId]; - if (!objectEvent->active || !objectEvent->hasReflection || objectEvent->localId != reflectionSprite->data[1]) + if (!objectEvent->active || !objectEvent->hasReflection || objectEvent->localId != reflectionSprite->sReflectionObjEventLocalId) { reflectionSprite->inUse = FALSE; } @@ -135,8 +140,7 @@ static void UpdateObjectReflectionSprite(struct Sprite *reflectionSprite) reflectionSprite->subspriteTableNum = mainSprite->subspriteTableNum; reflectionSprite->invisible = mainSprite->invisible; reflectionSprite->pos1.x = mainSprite->pos1.x; - // reflectionSprite->data[2] holds an additional vertical offset, used by the high bridges on Route 120 - reflectionSprite->pos1.y = mainSprite->pos1.y + GetReflectionVerticalOffset(objectEvent) + reflectionSprite->data[2]; + reflectionSprite->pos1.y = mainSprite->pos1.y + GetReflectionVerticalOffset(objectEvent) + reflectionSprite->sReflectionVerticalOffset; reflectionSprite->centerToCornerVecX = mainSprite->centerToCornerVecX; reflectionSprite->centerToCornerVecY = mainSprite->centerToCornerVecY; reflectionSprite->pos2.x = mainSprite->pos2.x; @@ -146,8 +150,7 @@ static void UpdateObjectReflectionSprite(struct Sprite *reflectionSprite) if (objectEvent->hideReflection == TRUE) reflectionSprite->invisible = TRUE; - // Check if the reflection is not still. - if (reflectionSprite->data[7] == FALSE) + if (reflectionSprite->sIsStillReflection == FALSE) { // Sets the reflection sprite's rot/scale matrix to the appropriate // matrix based on whether or not the main sprite is horizontally flipped. @@ -159,6 +162,11 @@ static void UpdateObjectReflectionSprite(struct Sprite *reflectionSprite) } } +#undef sReflectionObjEventId +#undef sReflectionObjEventLocalId +#undef sReflectionVerticalOffset +#undef sIsStillReflection + extern const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[]; u8 CreateWarpArrowSprite(void) diff --git a/src/field_message_box.c b/src/field_message_box.c index 1b760c7df..b98425b66 100755 --- a/src/field_message_box.c +++ b/src/field_message_box.c @@ -1,6 +1,5 @@ #include "global.h" #include "menu.h" -#include "string.h" #include "string_util.h" #include "task.h" #include "text.h" diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c index f57cc9979..cc4c03c9d 100644 --- a/src/field_player_avatar.c +++ b/src/field_player_avatar.c @@ -31,7 +31,7 @@ #include "constants/songs.h" #include "constants/trainer_types.h" -static EWRAM_DATA u8 gUnknown_0203734C = 0; +static EWRAM_DATA u8 sSpinStartFacingDir = 0; EWRAM_DATA struct ObjectEvent gObjectEvents[OBJECT_EVENTS_COUNT] = {}; EWRAM_DATA struct PlayerAvatar gPlayerAvatar = {}; @@ -138,7 +138,7 @@ static u8 Fishing_PutRodAway(struct Task *task); static u8 Fishing_EndNoMon(struct Task *task); static void AlignFishingAnimationFrames(void); -static u8 sub_808D38C(struct ObjectEvent *object, s16 *a1); +static u8 TrySpinPlayerForWarp(struct ObjectEvent *object, s16 *a1); // .rodata @@ -2050,54 +2050,64 @@ static void AlignFishingAnimationFrames(void) SetSurfBobWhileFishingState(gObjectEvents[gPlayerAvatar.objectEventId].fieldEffectSpriteId, 1, playerSprite->pos2.y); } -void sub_808D074(u8 a0) +void SetSpinStartFacingDir(u8 direction) { - gUnknown_0203734C = a0; + sSpinStartFacingDir = direction; } -static u8 sub_808D080(void) +static u8 GetSpinStartFacingDir(void) { - if (gUnknown_0203734C == 0) - { - return 1; - } - return gUnknown_0203734C; + if (sSpinStartFacingDir == DIR_NONE) + return DIR_SOUTH; + + return sSpinStartFacingDir; } -static void sub_808D094(u8 taskId) +// Task data for Task_DoPlayerSpinEntrance and Task_DoPlayerSpinExit +#define tState data[0] +#define tSpinDelayTimer data[1] +#define tSpeed data[2] +#define tCurY data[3] +#define tDestY data[4] +#define tStartDir data[5] +#define tPriority data[6] +#define tSubpriority data[7] +#define tGroundTimer data[8] + +static void Task_DoPlayerSpinExit(u8 taskId) { struct ObjectEvent *object = &gObjectEvents[gPlayerAvatar.objectEventId]; struct Sprite *sprite = &gSprites[object->spriteId]; s16 *data = gTasks[taskId].data; - switch (data[0]) + switch (tState) { - case 0: + case 0: // Init if (!ObjectEventClearHeldMovementIfFinished(object)) - { return; - } - sub_808D074(object->facingDirection); - data[1] = 0; - data[2] = 1; - data[3] = (u16)(sprite->pos1.y + sprite->pos2.y) << 4; + SetSpinStartFacingDir(object->facingDirection); + tSpinDelayTimer = 0; + tSpeed = 1; + tCurY = (u16)(sprite->pos1.y + sprite->pos2.y) << 4; sprite->pos2.y = 0; CameraObjectReset2(); object->fixedPriority = TRUE; sprite->oam.priority = 0; sprite->subpriority = 0; sprite->subspriteMode = SUBSPRITES_OFF; - data[0]++; - case 1: - sub_808D38C(object, &data[1]); - data[3] -= data[2]; - data[2] += 3; - sprite->pos1.y = data[3] >> 4; + tState++; + case 1: // Spin while rising + TrySpinPlayerForWarp(object, &tSpinDelayTimer); + + // Rise and accelerate + tCurY -= tSpeed; + tSpeed += 3; + sprite->pos1.y = tCurY >> 4; + + // Check if offscreen if (sprite->pos1.y + (s16)gTotalCameraPixelOffsetY < -32) - { - data[0]++; - } + tState++; break; case 2: DestroyTask(taskId); @@ -2105,84 +2115,86 @@ static void sub_808D094(u8 taskId) } } -static void sub_808D1FC(u8 taskId); +static void Task_DoPlayerSpinEntrance(u8 taskId); -void sub_808D194(void) +void DoPlayerSpinEntrance(void) { - sub_808D1FC(CreateTask(sub_808D1FC, 0)); + Task_DoPlayerSpinEntrance(CreateTask(Task_DoPlayerSpinEntrance, 0)); } -bool32 sub_808D1B4(void) +bool32 IsPlayerSpinEntranceActive(void) { - return FuncIsActiveTask(sub_808D1FC); + return FuncIsActiveTask(Task_DoPlayerSpinEntrance); } -void sub_808D1C8(void) +void DoPlayerSpinExit(void) { - sub_808D094(CreateTask(sub_808D094, 0)); + Task_DoPlayerSpinExit(CreateTask(Task_DoPlayerSpinExit, 0)); } -bool32 sub_808D1E8(void) +bool32 IsPlayerSpinExitActive(void) { - return FuncIsActiveTask(sub_808D094); + return FuncIsActiveTask(Task_DoPlayerSpinExit); } -static const u8 gUnknown_084975BC[] = {DIR_SOUTH, DIR_WEST, DIR_EAST, DIR_NORTH, DIR_SOUTH}; +static const u8 sSpinDirections[] = {DIR_SOUTH, DIR_WEST, DIR_EAST, DIR_NORTH, DIR_SOUTH}; -static void sub_808D1FC(u8 taskId) +static void Task_DoPlayerSpinEntrance(u8 taskId) { struct ObjectEvent *object = &gObjectEvents[gPlayerAvatar.objectEventId]; struct Sprite *sprite = &gSprites[object->spriteId]; s16 *data = gTasks[taskId].data; - switch (data[0]) + switch (tState) { case 0: - data[5] = sub_808D080(); - ObjectEventForceSetHeldMovement(object, GetFaceDirectionMovementAction(gUnknown_084975BC[data[5]])); - data[1] = 0; - data[2] = 116; - data[4] = sprite->pos1.y; - data[6] = sprite->oam.priority; - data[7] = sprite->subpriority; - data[3] = -((u16)sprite->pos2.y + 32) * 16; + // Because the spin start facing direction is never set for this + // warp type, the player will always exit the warp facing South. + // This may have been intentional, unclear + tStartDir = GetSpinStartFacingDir(); + ObjectEventForceSetHeldMovement(object, GetFaceDirectionMovementAction(sSpinDirections[tStartDir])); + tSpinDelayTimer = 0; + tSpeed = 116; + tDestY = sprite->pos1.y; + tPriority = sprite->oam.priority; + tSubpriority = sprite->subpriority; + tCurY = -((u16)sprite->pos2.y + 32) * 16; sprite->pos2.y = 0; CameraObjectReset2(); object->fixedPriority = TRUE; sprite->oam.priority = 1; sprite->subpriority = 0; sprite->subspriteMode = SUBSPRITES_OFF; - data[0]++; - case 1: - sub_808D38C(object, &data[1]); - data[3] += data[2]; - data[2] -= 3; - if (data[2] < 4) + tState++; + case 1: // Spin while descending + TrySpinPlayerForWarp(object, &tSpinDelayTimer); + + // Fall and decelerate + tCurY += tSpeed; + tSpeed -= 3; + if (tSpeed < 4) + tSpeed = 4; + sprite->pos1.y = tCurY >> 4; + + // Check if reached dest + if (sprite->pos1.y >= tDestY) { - data[2] = 4; - } - sprite->pos1.y = data[3] >> 4; - if (sprite->pos1.y >= data[4]) - { - sprite->pos1.y = data[4]; - data[8] = 0; - data[0]++; + sprite->pos1.y = tDestY; + tGroundTimer = 0; + tState++; } break; - case 2: - sub_808D38C(object, &data[1]); - data[8]++; - if (data[8] > 8) - { - data[0]++; - } + case 2: // Spin on ground + TrySpinPlayerForWarp(object, &tSpinDelayTimer); + if (++tGroundTimer > 8) + tState++; break; - case 3: - if (data[5] == sub_808D38C(object, &data[1])) + case 3: // Spin until facing original direction + if (tStartDir == TrySpinPlayerForWarp(object, &tSpinDelayTimer)) { object->fixedPriority = 0; - sprite->oam.priority = data[6]; - sprite->subpriority = data[7]; + sprite->oam.priority = tPriority; + sprite->subpriority = tSubpriority; CameraObjectReset1(); DestroyTask(taskId); } @@ -2190,19 +2202,15 @@ static void sub_808D1FC(u8 taskId) } } -static u8 sub_808D38C(struct ObjectEvent *object, s16 *a1) +static u8 TrySpinPlayerForWarp(struct ObjectEvent *object, s16 *delayTimer) { - if (*a1 < 8 && ++(*a1) < 8) - { + if (*delayTimer < 8 && ++(*delayTimer) < 8) return object->facingDirection; - } if (!ObjectEventCheckHeldMovementStatus(object)) - { return object->facingDirection; - } - ObjectEventForceSetHeldMovement(object, GetFaceDirectionMovementAction(gUnknown_084975BC[object->facingDirection])); - *a1 = 0; - return gUnknown_084975BC[object->facingDirection]; + ObjectEventForceSetHeldMovement(object, GetFaceDirectionMovementAction(sSpinDirections[object->facingDirection])); + *delayTimer = 0; + return sSpinDirections[object->facingDirection]; } diff --git a/src/field_screen_effect.c b/src/field_screen_effect.c index 9becd2166..db82d667c 100644 --- a/src/field_screen_effect.c +++ b/src/field_screen_effect.c @@ -42,11 +42,14 @@ static void Task_DoContestHallWarp(u8); static void FillPalBufferWhite(void); static void Task_ExitDoor(u8); static bool32 WaitForWeatherFadeIn(void); -static void Task_TeleportTileWarpExit(u8 taskId); +static void Task_SpinEnterWarp(u8 taskId); static void Task_WarpAndLoadMap(u8 taskId); static void Task_DoDoorWarp(u8 taskId); static void Task_EnableScriptAfterMusicFade(u8 taskId); +// data[0] is used universally by tasks in this file as a state for switches +#define tState data[0] + // const static const u16 sFlashLevelPixelRadii[] = { 200, 72, 64, 56, 48, 40, 32, 24, 0 }; const s32 gMaxFlashLevel = ARRAY_COUNT(sFlashLevelPixelRadii) - 1; @@ -156,17 +159,17 @@ static void Task_ReturnToFieldCableLink(u8 taskId) { struct Task *task = &gTasks[taskId]; - switch (task->data[0]) + switch (task->tState) { case 0: task->data[1] = CreateTask_ReestablishCableClubLink(); - task->data[0]++; + task->tState++; break; case 1: if (gTasks[task->data[1]].isActive != TRUE) { WarpFadeInScreen(); - task->data[0]++; + task->tState++; } break; case 2: @@ -191,11 +194,11 @@ static void Task_ReturnToFieldWirelessLink(u8 taskId) { struct Task *task = &gTasks[taskId]; - switch (task->data[0]) + switch (task->tState) { case 0: SetLinkStandbyCallback(); - task->data[0]++; + task->tState++; break; case 1: if (!IsLinkTaskFinished()) @@ -206,7 +209,7 @@ static void Task_ReturnToFieldWirelessLink(u8 taskId) else { WarpFadeInScreen(); - task->data[0]++; + task->tState++; } break; case 2: @@ -224,16 +227,16 @@ void Task_ReturnToFieldRecordMixing(u8 taskId) { struct Task *task = &gTasks[taskId]; - switch (task->data[0]) + switch (task->tState) { case 0: SetLinkStandbyCallback(); - task->data[0]++; + task->tState++; break; case 1: if (IsLinkTaskFinished()) { - task->data[0]++; + task->tState++; } break; case 2: @@ -295,12 +298,12 @@ void FieldCB_WarpExitFadeFromBlack(void) ScriptContext2_Enable(); } -static void FieldCB_TeleportTileWarpExit(void) +static void FieldCB_SpinEnterWarp(void) { Overworld_PlaySpecialMapMusic(); WarpFadeInScreen(); PlaySE(SE_WARP_OUT); - CreateTask(Task_TeleportTileWarpExit, 10); + CreateTask(Task_SpinEnterWarp, 10); ScriptContext2_Enable(); } @@ -320,14 +323,14 @@ static void Task_ExitDoor(u8 taskId) s16 *x = &task->data[2]; s16 *y = &task->data[3]; - switch (task->data[0]) + switch (task->tState) { case 0: SetPlayerVisibility(FALSE); FreezeObjectEvents(); PlayerGetDestCoords(x, y); FieldSetDoorOpened(*x, *y); - task->data[0] = 1; + task->tState = 1; break; case 1: if (WaitForWeatherFadeIn()) @@ -336,7 +339,7 @@ static void Task_ExitDoor(u8 taskId) SetPlayerVisibility(TRUE); objEventId = GetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_PLAYER, 0, 0); ObjectEventSetHeldMovement(&gObjectEvents[objEventId], MOVEMENT_ACTION_WALK_NORMAL_DOWN); - task->data[0] = 2; + task->tState = 2; } break; case 2: @@ -346,14 +349,14 @@ static void Task_ExitDoor(u8 taskId) task->data[1] = FieldAnimateDoorClose(*x, *y); objEventId = GetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_PLAYER, 0, 0); ObjectEventClearHeldMovementIfFinished(&gObjectEvents[objEventId]); - task->data[0] = 3; + task->tState = 3; } break; case 3: if (task->data[1] < 0 || gTasks[task->data[1]].isActive != TRUE) { UnfreezeObjectEvents(); - task->data[0] = 4; + task->tState = 4; } break; case 4: @@ -369,13 +372,13 @@ static void Task_ExitNonAnimDoor(u8 taskId) s16 *x = &task->data[2]; s16 *y = &task->data[3]; - switch (task->data[0]) + switch (task->tState) { case 0: SetPlayerVisibility(FALSE); FreezeObjectEvents(); PlayerGetDestCoords(x, y); - task->data[0] = 1; + task->tState = 1; break; case 1: if (WaitForWeatherFadeIn()) @@ -384,14 +387,14 @@ static void Task_ExitNonAnimDoor(u8 taskId) SetPlayerVisibility(TRUE); objEventId = GetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_PLAYER, 0, 0); ObjectEventSetHeldMovement(&gObjectEvents[objEventId], GetWalkNormalMovementAction(GetPlayerFacingDirection())); - task->data[0] = 2; + task->tState = 2; } break; case 2: if (IsPlayerStandingStill()) { UnfreezeObjectEvents(); - task->data[0] = 3; + task->tState = 3; } break; case 3: @@ -403,12 +406,12 @@ static void Task_ExitNonAnimDoor(u8 taskId) static void Task_ExitNonDoor(u8 taskId) { - switch (gTasks[taskId].data[0]) + switch (gTasks[taskId].tState) { case 0: FreezeObjectEvents(); ScriptContext2_Enable(); - gTasks[taskId].data[0]++; + gTasks[taskId].tState++; break; case 1: if (WaitForWeatherFadeIn()) @@ -443,7 +446,7 @@ bool8 FieldCB_ReturnToFieldOpenStartMenu(void) return FALSE; } -static void task_mpl_807E3C8(u8 taskId) +static void Task_ReturnToFieldNoScript(u8 taskId) { if (WaitForWeatherFadeIn() == 1) { @@ -453,19 +456,19 @@ static void task_mpl_807E3C8(u8 taskId) } } -void sub_80AF6D4(void) +void FieldCB_ReturnToFieldNoScript(void) { ScriptContext2_Enable(); FadeInFromBlack(); - CreateTask(task_mpl_807E3C8, 10); + CreateTask(Task_ReturnToFieldNoScript, 10); } -void sub_80AF6F0(void) +void FieldCB_ReturnToFieldNoScriptCheckMusic(void) { ScriptContext2_Enable(); Overworld_PlaySpecialMapMusic(); FadeInFromBlack(); - CreateTask(task_mpl_807E3C8, 10); + CreateTask(Task_ReturnToFieldNoScript, 10); } static bool32 PaletteFadeActive(void) @@ -543,7 +546,9 @@ void DoLavaridgeGym1FWarp(void) StartLavaridgeGym1FWarp(10); } -// Warp from a teleporting tile, e.g. in Aqua Hideout (For the move Teleport see FldEff_TeleportWarpOut) +// DoSpinEnterWarp but with a fade out +// Screen fades out to exit current map, player spins down from top to enter new map +// Used by teleporting tiles, e.g. in Aqua Hideout (For the move Teleport see FldEff_TeleportWarpOut) void DoTeleportTileWarp(void) { ScriptContext2_Enable(); @@ -551,7 +556,7 @@ void DoTeleportTileWarp(void) WarpFadeOutScreen(); PlaySE(SE_WARP_IN); CreateTask(Task_WarpAndLoadMap, 10); - gFieldCallback = FieldCB_TeleportTileWarpExit; + gFieldCallback = FieldCB_SpinEnterWarp; } void DoMossdeepGymWarp(void) @@ -574,8 +579,6 @@ void DoPortholeWarp(void) gFieldCallback = FieldCB_ShowPortholeView; } -#define tState data[0] - static void Task_DoCableClubWarp(u8 taskId) { struct Task *task = &gTasks[taskId]; @@ -598,8 +601,6 @@ static void Task_DoCableClubWarp(u8 taskId) } } -#undef tState - void DoCableClubWarp(void) { ScriptContext2_Enable(); @@ -613,20 +614,20 @@ static void Task_ReturnToWorldFromLinkRoom(u8 taskId) { s16 *data = gTasks[taskId].data; - switch (data[0]) + switch (tState) { case 0: ClearLinkCallback_2(); FadeScreen(FADE_TO_BLACK, 0); TryFadeOutOldMapMusic(); PlaySE(SE_EXIT); - data[0]++; + tState++; break; case 1: if (!PaletteFadeActive() && BGMusicStopped()) { SetCloseLinkCallback(); - data[0]++; + tState++; } break; case 2: @@ -649,12 +650,12 @@ static void Task_WarpAndLoadMap(u8 taskId) { struct Task *task = &gTasks[taskId]; - switch (task->data[0]) + switch (task->tState) { case 0: FreezeObjectEvents(); ScriptContext2_Enable(); - task->data[0]++; + task->tState++; break; case 1: if (!PaletteFadeActive()) @@ -665,7 +666,7 @@ static void Task_WarpAndLoadMap(u8 taskId) task->data[1] = 1; } if (BGMusicStopped()) - task->data[0]++; + task->tState++; } break; case 2: @@ -682,14 +683,14 @@ static void Task_DoDoorWarp(u8 taskId) s16 *x = &task->data[2]; s16 *y = &task->data[3]; - switch (task->data[0]) + switch (task->tState) { case 0: FreezeObjectEvents(); PlayerGetDestCoords(x, y); PlaySE(GetDoorSoundEffect(*x, *y - 1)); task->data[1] = FieldAnimateDoorOpen(*x, *y - 1); - task->data[0] = 1; + task->tState = 1; break; case 1: if (task->data[1] < 0 || gTasks[task->data[1]].isActive != TRUE) @@ -699,7 +700,7 @@ static void Task_DoDoorWarp(u8 taskId) ObjectEventClearHeldMovementIfActive(&gObjectEvents[objEventId]); objEventId = GetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_PLAYER, 0, 0); ObjectEventSetHeldMovement(&gObjectEvents[objEventId], MOVEMENT_ACTION_WALK_NORMAL_UP); - task->data[0] = 2; + task->tState = 2; } break; case 2: @@ -710,20 +711,20 @@ static void Task_DoDoorWarp(u8 taskId) objEventId = GetObjectEventIdByLocalIdAndMap(OBJ_EVENT_ID_PLAYER, 0, 0); ObjectEventClearHeldMovementIfFinished(&gObjectEvents[objEventId]); SetPlayerVisibility(FALSE); - task->data[0] = 3; + task->tState = 3; } break; case 3: if (task->data[1] < 0 || gTasks[task->data[1]].isActive != TRUE) { - task->data[0] = 4; + task->tState = 4; } break; case 4: TryFadeOutOldMapMusic(); WarpFadeOutScreen(); PlayRainStoppingSoundEffect(); - task->data[0] = 0; + task->tState = 0; task->func = Task_WarpAndLoadMap; break; } @@ -733,17 +734,17 @@ static void Task_DoContestHallWarp(u8 taskId) { struct Task *task = &gTasks[taskId]; - switch (task->data[0]) + switch (task->tState) { case 0: FreezeObjectEvents(); ScriptContext2_Enable(); - task->data[0]++; + task->tState++; break; case 1: if (!PaletteFadeActive() && BGMusicStopped()) { - task->data[0]++; + task->tState++; } break; case 2: @@ -850,22 +851,22 @@ static void UpdateFlashLevelEffect(u8 taskId) { s16 *data = gTasks[taskId].data; - switch (data[0]) + switch (tState) { case 0: SetFlashScanlineEffectWindowBoundaries(gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer], tFlashCenterX, tFlashCenterY, tCurFlashRadius); - data[0] = 1; + tState = 1; break; case 1: SetFlashScanlineEffectWindowBoundaries(gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer], tFlashCenterX, tFlashCenterY, tCurFlashRadius); - data[0] = 0; + tState = 0; tCurFlashRadius += tFlashRadiusDelta; if (tCurFlashRadius > tDestFlashRadius) { if (tClearScanlineEffect == 1) { ScanlineEffect_Stop(); - data[0] = 2; + tState = 2; } else { @@ -884,22 +885,22 @@ static void UpdateOrbFlashEffect(u8 taskId) { s16 *data = gTasks[taskId].data; - switch (data[0]) + switch (tState) { case 0: SetOrbFlashScanlineEffectWindowBoundaries(gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer], tFlashCenterX, tFlashCenterY, tCurFlashRadius); - data[0] = 1; + tState = 1; break; case 1: SetOrbFlashScanlineEffectWindowBoundaries(gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer], tFlashCenterX, tFlashCenterY, tCurFlashRadius); - data[0] = 0; + tState = 0; tCurFlashRadius += tFlashRadiusDelta; if (tCurFlashRadius > tDestFlashRadius) { if (tClearScanlineEffect == 1) { ScanlineEffect_Stop(); - data[0] = 2; + tState = 2; } else { @@ -914,7 +915,7 @@ static void UpdateOrbFlashEffect(u8 taskId) } } -static void sub_80AFF90(u8 taskId) +static void Task_WaitForFlashUpdate(u8 taskId) { if (!FuncIsActiveTask(UpdateFlashLevelEffect)) { @@ -923,13 +924,13 @@ static void sub_80AFF90(u8 taskId) } } -static void sub_80AFFB8(void) +static void StartWaitForFlashUpdate(void) { - if (!FuncIsActiveTask(sub_80AFF90)) - CreateTask(sub_80AFF90, 80); + if (!FuncIsActiveTask(Task_WaitForFlashUpdate)) + CreateTask(Task_WaitForFlashUpdate, 80); } -static u8 sub_80AFFDC(s32 centerX, s32 centerY, s32 initialFlashRadius, s32 destFlashRadius, s32 clearScanlineEffect, u8 delta) +static u8 StartUpdateFlashLevelEffect(s32 centerX, s32 centerY, s32 initialFlashRadius, s32 destFlashRadius, s32 clearScanlineEffect, u8 delta) { u8 taskId = CreateTask(UpdateFlashLevelEffect, 80); s16 *data = gTasks[taskId].data; @@ -948,7 +949,7 @@ static u8 sub_80AFFDC(s32 centerX, s32 centerY, s32 initialFlashRadius, s32 dest return taskId; } -static u8 sub_80B003C(s32 centerX, s32 centerY, s32 initialFlashRadius, s32 destFlashRadius, s32 clearScanlineEffect, u8 delta) +static u8 StartUpdateOrbFlashEffect(s32 centerX, s32 centerY, s32 initialFlashRadius, s32 destFlashRadius, s32 clearScanlineEffect, u8 delta) { u8 taskId = CreateTask(UpdateOrbFlashEffect, 80); s16 *data = gTasks[taskId].data; @@ -972,14 +973,15 @@ static u8 sub_80B003C(s32 centerX, s32 centerY, s32 initialFlashRadius, s32 dest #undef tFlashRadiusDelta #undef tClearScanlineEffect +// A higher flashLevel value is a smaller flash radius (more darkness). 0 is full brightness void AnimateFlash(u8 flashLevel) { u8 curFlashLevel = Overworld_GetFlashLevel(); - u8 value = 0; + bool8 fullBrightness = FALSE; if (!flashLevel) - value = 1; - sub_80AFFDC(DISPLAY_WIDTH / 2, DISPLAY_HEIGHT / 2, sFlashLevelPixelRadii[curFlashLevel], sFlashLevelPixelRadii[flashLevel], value, 1); - sub_80AFFB8(); + fullBrightness = TRUE; + StartUpdateFlashLevelEffect(DISPLAY_WIDTH / 2, DISPLAY_HEIGHT / 2, sFlashLevelPixelRadii[curFlashLevel], sFlashLevelPixelRadii[flashLevel], fullBrightness, 1); + StartWaitForFlashUpdate(); ScriptContext2_Enable(); } @@ -998,18 +1000,18 @@ void WriteBattlePyramidViewScanlineEffectBuffer(void) CpuFastSet(&gScanlineEffectRegBuffers[0], &gScanlineEffectRegBuffers[1], 480); } -static void Task_TeleportTileWarpExit(u8 taskId) +static void Task_SpinEnterWarp(u8 taskId) { - switch (gTasks[taskId].data[0]) + switch (gTasks[taskId].tState) { case 0: FreezeObjectEvents(); ScriptContext2_Enable(); - sub_808D194(); - gTasks[taskId].data[0]++; + DoPlayerSpinEntrance(); + gTasks[taskId].tState++; break; case 1: - if (WaitForWeatherFadeIn() && sub_808D1B4() != TRUE) + if (WaitForWeatherFadeIn() && IsPlayerSpinEntranceActive() != TRUE) { UnfreezeObjectEvents(); ScriptContext2_Disable(); @@ -1019,29 +1021,29 @@ static void Task_TeleportTileWarpExit(u8 taskId) } } -static void sub_80B01BC(u8 taskId) +static void Task_SpinExitWarp(u8 taskId) { struct Task *task = &gTasks[taskId]; - switch (task->data[0]) + switch (task->tState) { case 0: FreezeObjectEvents(); ScriptContext2_Enable(); PlaySE(SE_WARP_IN); - sub_808D1C8(); - task->data[0]++; + DoPlayerSpinExit(); + task->tState++; break; case 1: - if (!sub_808D1E8()) + if (!IsPlayerSpinExitActive()) { WarpFadeOutScreen(); - task->data[0]++; + task->tState++; } break; case 2: if (!PaletteFadeActive() && BGMusicStopped()) - task->data[0]++; + task->tState++; break; case 3: WarpIntoMap(); @@ -1051,18 +1053,22 @@ static void sub_80B01BC(u8 taskId) } } -void sub_80B0244(void) +// Only called by an unused function +// DoTeleportTileWarp is used instead +void DoSpinEnterWarp(void) { ScriptContext2_Enable(); CreateTask(Task_WarpAndLoadMap, 10); - gFieldCallback = FieldCB_TeleportTileWarpExit; + gFieldCallback = FieldCB_SpinEnterWarp; } -void sub_80B0268(void) +// Opposite of DoSpinEnterWarp / DoTeleportTileWarp +// Player exits current map by spinning up offscreen, enters new map with a fade in +void DoSpinExitWarp(void) { ScriptContext2_Enable(); gFieldCallback = FieldCB_DefaultWarpExit; - CreateTask(sub_80B01BC, 10); + CreateTask(Task_SpinExitWarp, 10); } static void LoadOrbEffectPalette(bool8 blueOrb) @@ -1109,7 +1115,6 @@ static bool8 sub_80B02C8(u16 shakeDir) return FALSE; } -#define tState data[0] #define tBlueOrb data[1] #define tCenterX data[2] #define tCenterY data[3] @@ -1148,7 +1153,7 @@ static void Task_OrbEffect(u8 taskId) case 1: sub_8199DF0(0, PIXEL_FILL(1), 0, 1); LoadOrbEffectPalette(tBlueOrb); - sub_80B003C(tCenterX, tCenterY, 1, 160, 1, 2); + StartUpdateOrbFlashEffect(tCenterX, tCenterY, 1, 160, 1, 2); tState = 2; break; case 2: @@ -1243,7 +1248,6 @@ void FadeOutOrbEffect(void) gTasks[taskId].tState = 6; } -#undef tState #undef tBlueOrb #undef tCenterX #undef tCenterY diff --git a/src/field_specials.c b/src/field_specials.c index 51030a387..a6831ec5b 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -1414,7 +1414,7 @@ void GiveLeadMonEffortRibbon(void) bool8 Special_AreLeadMonEVsMaxedOut(void) { - if (GetMonEVCount(&gPlayerParty[GetLeadMonIndex()]) >= 510) + if (GetMonEVCount(&gPlayerParty[GetLeadMonIndex()]) >= MAX_TOTAL_EVS) { return TRUE; } @@ -1449,7 +1449,7 @@ void SetShoalItemFlag(u16 unused) void PutZigzagoonInPlayerParty(void) { u16 monData; - CreateMon(&gPlayerParty[0], SPECIES_ZIGZAGOON, 7, 32, FALSE, 0, OT_ID_PLAYER_ID, 0); + CreateMon(&gPlayerParty[0], SPECIES_ZIGZAGOON, 7, USE_RANDOM_IVS, FALSE, 0, OT_ID_PLAYER_ID, 0); monData = TRUE; SetMonData(&gPlayerParty[0], MON_DATA_ABILITY_NUM, &monData); monData = MOVE_TACKLE; diff --git a/src/fieldmap.c b/src/fieldmap.c index 296c4edf2..2961d2f49 100644 --- a/src/fieldmap.c +++ b/src/fieldmap.c @@ -28,7 +28,7 @@ EWRAM_DATA static u16 gBackupMapData[MAX_MAP_DATA_SIZE] = {0}; EWRAM_DATA struct MapHeader gMapHeader = {0}; EWRAM_DATA struct Camera gCamera = {0}; EWRAM_DATA static struct ConnectionFlags gMapConnectionFlags = {0}; -EWRAM_DATA static u32 sFiller_02037344 = 0; // without this, the next file won't align properly +EWRAM_DATA static u32 sFiller = 0; // without this, the next file won't align properly struct BackupMapLayout gBackupMapLayout; diff --git a/src/fldeff_cut.c b/src/fldeff_cut.c index 0458f7621..446633a53 100644 --- a/src/fldeff_cut.c +++ b/src/fldeff_cut.c @@ -62,7 +62,6 @@ static void HandleLongGrassOnHyper(u8, s16, s16); static u8 sCutSquareSide; static u8 sTileCountFromPlayer_X; static u8 sTileCountFromPlayer_Y; -static u32 sUnused; static bool8 sHyperCutTiles[CUT_HYPER_AREA]; // EWRAM variables diff --git a/src/fldeff_escalator.c b/src/fldeff_escalator.c index 7a96eaa82..733dca722 100644 --- a/src/fldeff_escalator.c +++ b/src/fldeff_escalator.c @@ -10,8 +10,6 @@ static EWRAM_DATA u8 sEscalatorAnim_TaskId = 0; static void SetEscalatorMetatile(u8 taskId, const s16 *metatileIds, u16 metatileMasks); static void Task_DrawEscalator(u8 taskId); -static void Task_DrawTeleporterHousing(u8 taskId); -static void Task_DrawTeleporterCable(u8 taskId); #define ESCALATOR_STAGES 3 #define LAST_ESCALATOR_STAGE (ESCALATOR_STAGES - 1) diff --git a/src/frontier_util.c b/src/frontier_util.c index 021e7f6ed..e0ad3971c 100644 --- a/src/frontier_util.c +++ b/src/frontier_util.c @@ -129,7 +129,7 @@ static const struct FrontierBrainMon sFrontierBrainsMons[][2][FRONTIER_PARTY_SIZ { .species = SPECIES_RAIKOU, .heldItem = ITEM_LUM_BERRY, - .fixedIV = 31, + .fixedIV = MAX_PER_STAT_IVS, .nature = NATURE_MODEST, .evs = {158, 0, 252, 100, 0, 0}, .moves = {MOVE_THUNDERBOLT, MOVE_CALM_MIND, MOVE_REFLECT, MOVE_REST}, @@ -137,7 +137,7 @@ static const struct FrontierBrainMon sFrontierBrainsMons[][2][FRONTIER_PARTY_SIZ { .species = SPECIES_LATIOS, .heldItem = ITEM_BRIGHT_POWDER, - .fixedIV = 31, + .fixedIV = MAX_PER_STAT_IVS, .nature = NATURE_MODEST, .evs = {252, 0, 252, 6, 0, 0}, .moves = {MOVE_PSYCHIC, MOVE_CALM_MIND, MOVE_RECOVER, MOVE_DRAGON_CLAW}, @@ -145,7 +145,7 @@ static const struct FrontierBrainMon sFrontierBrainsMons[][2][FRONTIER_PARTY_SIZ { .species = SPECIES_SNORLAX, .heldItem = ITEM_CHESTO_BERRY, - .fixedIV = 31, + .fixedIV = MAX_PER_STAT_IVS, .nature = NATURE_ADAMANT, .evs = {252, 252, 0, 0, 6, 0}, .moves = {MOVE_CURSE, MOVE_RETURN, MOVE_REST, MOVE_SHADOW_BALL}, @@ -186,7 +186,7 @@ static const struct FrontierBrainMon sFrontierBrainsMons[][2][FRONTIER_PARTY_SIZ { .species = SPECIES_SWAMPERT, .heldItem = ITEM_LEFTOVERS, - .fixedIV = 31, + .fixedIV = MAX_PER_STAT_IVS, .nature = NATURE_BRAVE, .evs = {252, 252, 6, 0, 0, 0}, .moves = {MOVE_SURF, MOVE_EARTHQUAKE, MOVE_ICE_BEAM, MOVE_MIRROR_COAT}, @@ -194,7 +194,7 @@ static const struct FrontierBrainMon sFrontierBrainsMons[][2][FRONTIER_PARTY_SIZ { .species = SPECIES_METAGROSS, .heldItem = ITEM_QUICK_CLAW, - .fixedIV = 31, + .fixedIV = MAX_PER_STAT_IVS, .nature = NATURE_BRAVE, .evs = {252, 252, 6, 0, 0, 0}, .moves = {MOVE_PSYCHIC, MOVE_METEOR_MASH, MOVE_EARTHQUAKE, MOVE_PROTECT}, @@ -202,7 +202,7 @@ static const struct FrontierBrainMon sFrontierBrainsMons[][2][FRONTIER_PARTY_SIZ { .species = SPECIES_LATIAS, .heldItem = ITEM_CHESTO_BERRY, - .fixedIV = 31, + .fixedIV = MAX_PER_STAT_IVS, .nature = NATURE_MODEST, .evs = {252, 0, 252, 6, 0, 0}, .moves = {MOVE_THUNDERBOLT, MOVE_PSYCHIC, MOVE_CALM_MIND, MOVE_REST}, @@ -243,7 +243,7 @@ static const struct FrontierBrainMon sFrontierBrainsMons[][2][FRONTIER_PARTY_SIZ { .species = SPECIES_ARCANINE, .heldItem = ITEM_WHITE_HERB, - .fixedIV = 31, + .fixedIV = MAX_PER_STAT_IVS, .nature = NATURE_HASTY, .evs = {6, 252, 252, 0, 0, 0}, .moves = {MOVE_OVERHEAT, MOVE_EXTREME_SPEED, MOVE_ROAR, MOVE_PROTECT}, @@ -251,7 +251,7 @@ static const struct FrontierBrainMon sFrontierBrainsMons[][2][FRONTIER_PARTY_SIZ { .species = SPECIES_SLAKING, .heldItem = ITEM_SCOPE_LENS, - .fixedIV = 31, + .fixedIV = MAX_PER_STAT_IVS, .nature = NATURE_HARDY, .evs = {6, 252, 0, 252, 0, 0}, .moves = {MOVE_HYPER_BEAM, MOVE_EARTHQUAKE, MOVE_SHADOW_BALL, MOVE_YAWN}, @@ -259,7 +259,7 @@ static const struct FrontierBrainMon sFrontierBrainsMons[][2][FRONTIER_PARTY_SIZ { .species = SPECIES_SUICUNE, .heldItem = ITEM_KINGS_ROCK, - .fixedIV = 31, + .fixedIV = MAX_PER_STAT_IVS, .nature = NATURE_HASTY, .evs = {252, 0, 252, 6, 0, 0}, .moves = {MOVE_BLIZZARD, MOVE_SURF, MOVE_BITE, MOVE_CALM_MIND}, @@ -300,7 +300,7 @@ static const struct FrontierBrainMon sFrontierBrainsMons[][2][FRONTIER_PARTY_SIZ { .species = SPECIES_UMBREON, .heldItem = ITEM_CHESTO_BERRY, - .fixedIV = 31, + .fixedIV = MAX_PER_STAT_IVS, .nature = NATURE_CALM, .evs = {252, 0, 0, 0, 252, 6}, .moves = {MOVE_DOUBLE_EDGE, MOVE_CONFUSE_RAY, MOVE_REST, MOVE_PSYCHIC}, @@ -308,7 +308,7 @@ static const struct FrontierBrainMon sFrontierBrainsMons[][2][FRONTIER_PARTY_SIZ { .species = SPECIES_GENGAR, .heldItem = ITEM_LEFTOVERS, - .fixedIV = 31, + .fixedIV = MAX_PER_STAT_IVS, .nature = NATURE_MODEST, .evs = {252, 0, 252, 0, 6, 0}, .moves = {MOVE_PSYCHIC, MOVE_HYPNOSIS, MOVE_DREAM_EATER, MOVE_DESTINY_BOND}, @@ -316,7 +316,7 @@ static const struct FrontierBrainMon sFrontierBrainsMons[][2][FRONTIER_PARTY_SIZ { .species = SPECIES_BRELOOM, .heldItem = ITEM_LUM_BERRY, - .fixedIV = 31, + .fixedIV = MAX_PER_STAT_IVS, .nature = NATURE_JOLLY, .evs = {6, 252, 0, 252, 0, 0}, .moves = {MOVE_SPORE, MOVE_FOCUS_PUNCH, MOVE_GIGA_DRAIN, MOVE_HEADBUTT}, @@ -331,7 +331,7 @@ static const struct FrontierBrainMon sFrontierBrainsMons[][2][FRONTIER_PARTY_SIZ { .species = SPECIES_METANG, .heldItem = ITEM_SITRUS_BERRY, - .fixedIV = 31, + .fixedIV = MAX_PER_STAT_IVS, .nature = NATURE_BRAVE, .evs = {0, 252, 252, 0, 6, 0}, .moves = {MOVE_LIGHT_SCREEN, MOVE_PSYCHIC, MOVE_REFLECT, MOVE_METAL_CLAW}, @@ -339,7 +339,7 @@ static const struct FrontierBrainMon sFrontierBrainsMons[][2][FRONTIER_PARTY_SIZ { .species = SPECIES_SKARMORY, .heldItem = ITEM_SITRUS_BERRY, - .fixedIV = 31, + .fixedIV = MAX_PER_STAT_IVS, .nature = NATURE_IMPISH, .evs = {252, 0, 0, 0, 6, 252}, .moves = {MOVE_TOXIC, MOVE_AERIAL_ACE, MOVE_PROTECT, MOVE_STEEL_WING}, @@ -347,7 +347,7 @@ static const struct FrontierBrainMon sFrontierBrainsMons[][2][FRONTIER_PARTY_SIZ { .species = SPECIES_AGGRON, .heldItem = ITEM_SITRUS_BERRY, - .fixedIV = 31, + .fixedIV = MAX_PER_STAT_IVS, .nature = NATURE_ADAMANT, .evs = {0, 252, 0, 0, 252, 6}, .moves = {MOVE_THUNDERBOLT, MOVE_PROTECT, MOVE_SOLAR_BEAM, MOVE_DRAGON_CLAW}, @@ -357,7 +357,7 @@ static const struct FrontierBrainMon sFrontierBrainsMons[][2][FRONTIER_PARTY_SIZ { .species = SPECIES_METANG, .heldItem = ITEM_SITRUS_BERRY, - .fixedIV = 31, + .fixedIV = MAX_PER_STAT_IVS, .nature = NATURE_BRAVE, .evs = {0, 252, 252, 0, 6, 0}, .moves = {MOVE_LIGHT_SCREEN, MOVE_PSYCHIC, MOVE_REFLECT, MOVE_METAL_CLAW}, @@ -365,7 +365,7 @@ static const struct FrontierBrainMon sFrontierBrainsMons[][2][FRONTIER_PARTY_SIZ { .species = SPECIES_SKARMORY, .heldItem = ITEM_SITRUS_BERRY, - .fixedIV = 31, + .fixedIV = MAX_PER_STAT_IVS, .nature = NATURE_IMPISH, .evs = {252, 0, 0, 0, 6, 252}, .moves = {MOVE_TOXIC, MOVE_AERIAL_ACE, MOVE_PROTECT, MOVE_STEEL_WING}, @@ -373,7 +373,7 @@ static const struct FrontierBrainMon sFrontierBrainsMons[][2][FRONTIER_PARTY_SIZ { .species = SPECIES_AGGRON, .heldItem = ITEM_SITRUS_BERRY, - .fixedIV = 31, + .fixedIV = MAX_PER_STAT_IVS, .nature = NATURE_ADAMANT, .evs = {0, 252, 0, 0, 252, 6}, .moves = {MOVE_THUNDERBOLT, MOVE_PROTECT, MOVE_SOLAR_BEAM, MOVE_DRAGON_CLAW}, @@ -414,7 +414,7 @@ static const struct FrontierBrainMon sFrontierBrainsMons[][2][FRONTIER_PARTY_SIZ { .species = SPECIES_SEVIPER, .heldItem = ITEM_FOCUS_BAND, - .fixedIV = 31, + .fixedIV = MAX_PER_STAT_IVS, .nature = NATURE_BOLD, .evs = {252, 0, 0, 0, 252, 6}, .moves = {MOVE_SWAGGER, MOVE_CRUNCH, MOVE_SLUDGE_BOMB, MOVE_GIGA_DRAIN}, @@ -422,7 +422,7 @@ static const struct FrontierBrainMon sFrontierBrainsMons[][2][FRONTIER_PARTY_SIZ { .species = SPECIES_STEELIX, .heldItem = ITEM_BRIGHT_POWDER, - .fixedIV = 31, + .fixedIV = MAX_PER_STAT_IVS, .nature = NATURE_BRAVE, .evs = {252, 0, 0, 0, 6, 252}, .moves = {MOVE_EARTHQUAKE, MOVE_ROCK_SLIDE, MOVE_EXPLOSION, MOVE_SCREECH}, @@ -430,7 +430,7 @@ static const struct FrontierBrainMon sFrontierBrainsMons[][2][FRONTIER_PARTY_SIZ { .species = SPECIES_GYARADOS, .heldItem = ITEM_CHESTO_BERRY, - .fixedIV = 31, + .fixedIV = MAX_PER_STAT_IVS, .nature = NATURE_ADAMANT, .evs = {252, 6, 0, 0, 0, 252}, .moves = {MOVE_DRAGON_DANCE, MOVE_RETURN, MOVE_ROAR, MOVE_REST}, @@ -471,7 +471,7 @@ static const struct FrontierBrainMon sFrontierBrainsMons[][2][FRONTIER_PARTY_SIZ { .species = SPECIES_ARTICUNO, .heldItem = ITEM_SCOPE_LENS, - .fixedIV = 31, + .fixedIV = MAX_PER_STAT_IVS, .nature = NATURE_MILD, .evs = {6, 0, 252, 252, 0, 0}, .moves = {MOVE_BLIZZARD, MOVE_WATER_PULSE, MOVE_AERIAL_ACE, MOVE_REFLECT}, @@ -479,7 +479,7 @@ static const struct FrontierBrainMon sFrontierBrainsMons[][2][FRONTIER_PARTY_SIZ { .species = SPECIES_ZAPDOS, .heldItem = ITEM_LUM_BERRY, - .fixedIV = 31, + .fixedIV = MAX_PER_STAT_IVS, .nature = NATURE_MILD, .evs = {6, 0, 252, 252, 0, 0}, .moves = {MOVE_THUNDER, MOVE_DETECT, MOVE_DRILL_PECK, MOVE_LIGHT_SCREEN}, @@ -487,7 +487,7 @@ static const struct FrontierBrainMon sFrontierBrainsMons[][2][FRONTIER_PARTY_SIZ { .species = SPECIES_MOLTRES, .heldItem = ITEM_BRIGHT_POWDER, - .fixedIV = 31, + .fixedIV = MAX_PER_STAT_IVS, .nature = NATURE_MILD, .evs = {6, 0, 252, 252, 0, 0}, .moves = {MOVE_FIRE_BLAST, MOVE_HYPER_BEAM, MOVE_AERIAL_ACE, MOVE_SAFEGUARD}, @@ -1513,9 +1513,9 @@ static void ShowLinkContestResultsWindow(void) AddTextPrinterParameterized(gRecordsWindowId, 1, gText_Smart, x, 89, TEXT_SPEED_FF, NULL); AddTextPrinterParameterized(gRecordsWindowId, 1, gText_Tough, x, 105, TEXT_SPEED_FF, NULL); - for (i = 0; i < 5; i++) + for (i = 0; i < CONTEST_CATEGORIES_COUNT; i++) { - for (j = 0; j < 4; j++) + for (j = 0; j < CONTESTANT_COUNT; j++) { ConvertIntToDecimalStringN(gStringVar4, gSaveBlock2Ptr->contestLinkResults[i][j], STR_CONV_MODE_RIGHT_ALIGN, 4); AddTextPrinterParameterized(gRecordsWindowId, 1, gStringVar4, (j * 38) + 64, (i * 16) + 41, TEXT_SPEED_FF, NULL); diff --git a/src/graphics.c b/src/graphics.c index 8f8ced5cb..4f61d3a65 100644 --- a/src/graphics.c +++ b/src/graphics.c @@ -862,8 +862,8 @@ const u32 gBattleAnimSpriteGfx_Confetti[] = INCBIN_U32("graphics/battle_anims/sp const u32 gBattleAnimSpritePal_Confetti[] = INCBIN_U32("graphics/battle_anims/sprites/confetti.gbapal.lz"); const u32 gSubstituteDollPal[] = INCBIN_U32("graphics/battle_anims/sprites/substitute.gbapal.lz"); -const u32 gSubstituteDollGfx[] = INCBIN_U32("graphics/battle_anims/sprites/substitute.4bpp.lz"); -const u32 gSubstituteDollTilemap[] = INCBIN_U32("graphics/battle_anims/sprites/substitute.bin.lz"); +const u32 gSubstituteDollFrontGfx[] = INCBIN_U32("graphics/battle_anims/sprites/substitute.4bpp.lz"); +const u32 gSubstituteDollBackGfx[] = INCBIN_U32("graphics/battle_anims/sprites/substitute_back.4bpp.lz"); const u32 gBattleAnimSpriteGfx_GreenStar[] = INCBIN_U32("graphics/battle_anims/sprites/green_star.4bpp.lz"); const u32 gBattleAnimSpritePal_GreenStar[] = INCBIN_U32("graphics/battle_anims/sprites/green_star.gbapal.lz"); diff --git a/src/image_processing_effects.c b/src/image_processing_effects.c index cbd8b9b37..224de6fe1 100644 --- a/src/image_processing_effects.c +++ b/src/image_processing_effects.c @@ -129,11 +129,11 @@ static void ApplyImageEffect_RedChannelGrayscale(u8 delta) u16 *pixel = &pixelRow[gCanvasColumnStart]; for (i = 0; i < gCanvasColumnEnd; i++, pixel++) { - if (!(0x8000 & *pixel)) + if (!IS_ALPHA(*pixel)) { // Gets the grayscale value, based on the pixel's red channel. // Also adds a delta to skew lighter or darker. - u8 grayValue = (31 & *pixel); + u8 grayValue = (*pixel & RGB_RED); grayValue += delta; if (grayValue > 31) grayValue = 31; @@ -154,9 +154,9 @@ static void ApplyImageEffect_RedChannelGrayscaleHighlight(u8 highlight) u16 *pixel = &pixelRow[gCanvasColumnStart]; for (i = 0; i < gCanvasColumnEnd; i++, pixel++) { - if (!(0x8000 & *pixel)) + if (!IS_ALPHA(*pixel)) { - u8 grayValue = (31 & *pixel); + u8 grayValue = (*pixel & RGB_RED); if (grayValue > 31 - highlight) grayValue = 31 - (highlight >> 1); @@ -183,7 +183,7 @@ static void ApplyImageEffect_Grayscale(void) u16 *pixel = &pixelRow[gCanvasColumnStart]; for (i = 0; i < gCanvasColumnEnd; i++, pixel++) { - if (!(0x8000 & *pixel)) + if (!IS_ALPHA(*pixel)) *pixel = ConvertColorToGrayscale(pixel); } } @@ -203,7 +203,7 @@ static void ApplyImageEffect_Blur(void) pixel += gCanvasWidth; while (j < gCanvasRowEnd - 1) { - if (!(0x8000 & *pixel)) + if (!IS_ALPHA(*pixel)) { *pixel = QuantizePixel_Blur(&prevPixel, pixel, pixel + gCanvasWidth); prevPixel = *pixel; @@ -225,7 +225,7 @@ static void ApplyImageEffect_PersonalityColor(u8 personality) u16 *pixel = &pixelRow[gCanvasColumnStart]; for (i = 0; i < gCanvasColumnEnd; i++, pixel++) { - if (!(0x8000 & *pixel)) + if (!IS_ALPHA(*pixel)) *pixel = QuantizePixel_PersonalityColor(pixel, personality); } } @@ -241,7 +241,7 @@ static void ApplyImageEffect_BlackAndWhite(void) u16 *pixel = &pixelRow[gCanvasColumnStart]; for (i = 0; i < gCanvasColumnEnd; i++, pixel++) { - if (!(0x8000 & *pixel)) + if (!IS_ALPHA(*pixel)) *pixel = QuantizePixel_BlackAndWhite(pixel); } } @@ -293,7 +293,7 @@ static void ApplyImageEffect_Invert(void) u16 *pixel = &pixelRow[gCanvasColumnStart]; for (i = 0; i < gCanvasColumnEnd; i++, pixel++) { - if (!(0x8000 & *pixel)) + if (!IS_ALPHA(*pixel)) *pixel = QuantizePixel_Invert(pixel); } } @@ -311,7 +311,7 @@ static void ApplyImageEffect_Shimmer(void) { for (j = 0; j < 64; j++, pixel++) { - if (!(0x8000 & *pixel)) + if (!IS_ALPHA(*pixel)) *pixel = QuantizePixel_Invert(pixel); } } @@ -321,30 +321,30 @@ static void ApplyImageEffect_Shimmer(void) { pixel = &gCanvasPixels[j]; prevPixel = *pixel; - *pixel = 0x8000; + *pixel = RGB_ALPHA; for (i = 1, pixel += 64; i < 63; i++, pixel += 64) { - if (!(0x8000 & *pixel)) + if (!IS_ALPHA(*pixel)) { *pixel = QuantizePixel_BlurHard(&prevPixel, pixel, pixel + 64); prevPixel = *pixel; } } - *pixel = 0x8000; + *pixel = RGB_ALPHA; pixel = &gCanvasPixels[j]; prevPixel = *pixel; - *pixel = 0x8000; + *pixel = RGB_ALPHA; for (i = 1, pixel += 64; i < 63; i++, pixel += 64) { - if (!(0x8000 & *pixel)) + if (!IS_ALPHA(*pixel)) { *pixel = QuantizePixel_BlurHard(&prevPixel, pixel, pixel + 64); prevPixel = *pixel; } } - *pixel = 0x8000; + *pixel = RGB_ALPHA; } // Finally, invert colors back to the original color space. @@ -355,7 +355,7 @@ static void ApplyImageEffect_Shimmer(void) { for (j = 0; j < 64; j++, pixel++) { - if (!(0x8000 & *pixel)) + if (!IS_ALPHA(*pixel)) *pixel = QuantizePixel_Invert(pixel); } } @@ -372,7 +372,7 @@ static void ApplyImageEffect_BlurRight(void) u16 prevPixel = *pixel; for (i = 1, pixel++; i < gCanvasColumnEnd - 1; i++, pixel++) { - if (!(0x8000 & *pixel)) + if (!IS_ALPHA(*pixel)) { *pixel = QuantizePixel_MotionBlur(&prevPixel, pixel); prevPixel = *pixel; @@ -392,7 +392,7 @@ static void ApplyImageEffect_BlurDown(void) u16 prevPixel = *pixel; for (j = 1, pixel += gCanvasWidth; j < gCanvasRowEnd - 1; j++, pixel += gCanvasWidth) { - if (!(0x8000 & *pixel)) + if (!IS_ALPHA(*pixel)) { *pixel = QuantizePixel_MotionBlur(&prevPixel, pixel); prevPixel = *pixel; @@ -447,11 +447,11 @@ static void AddPointillismPoints(u16 arg0) { u16 *pixel = &gCanvasPixels[points[i].row * 64] + points[i].column; - if (!(0x8000 & *pixel)) + if (!IS_ALPHA(*pixel)) { - u16 red = (*pixel) & 0x1F; - u16 green = (*pixel >> 5) & 0x1F; - u16 blue = (*pixel >> 10) & 0x1F; + u16 red = GET_R(*pixel); + u16 green = GET_G(*pixel); + u16 blue = GET_B(*pixel); switch (colorType) { @@ -501,9 +501,9 @@ static void AddPointillismPoints(u16 arg0) static u16 ConvertColorToGrayscale(u16 *color) { s32 clr = *color; - s32 r = clr & 0x1F; - s32 g = (clr >> 5) & 0x1F; - s32 b = (clr >> 10) & 0x1F; + s32 r = GET_R(clr); + s32 g = GET_G(clr); + s32 b = GET_B(clr); s32 gray = (r * Q_8_8(0.3) + g * Q_8_8(0.59) + b * Q_8_8(0.1133)) >> 8; return RGB2(gray, gray, gray); } @@ -512,9 +512,9 @@ static u16 ConvertColorToGrayscale(u16 *color) // Everything else is white. static u16 QuantizePixel_PersonalityColor(u16 *color, u8 personality) { - u16 red = *color & 0x1F; - u16 green = (*color >> 5) & 0x1F; - u16 blue = (*color >> 10) & 0x1F; + u16 red = GET_R(*color); + u16 green = GET_G(*color); + u16 blue = GET_B(*color); if (red < 17 && green < 17 && blue < 17) return GetColorFromPersonality(personality); @@ -526,9 +526,9 @@ static u16 QuantizePixel_PersonalityColor(u16 *color, u8 personality) // the mon's personality value, return a color. static u16 GetColorFromPersonality(u8 personality) { - u16 red = 0; + u16 red = 0; u16 green = 0; - u16 blue = 0; + u16 blue = 0; u8 strength = (personality / 6) % 3; u8 colorType = personality % 6; @@ -577,9 +577,9 @@ static u16 GetColorFromPersonality(u8 personality) static u16 QuantizePixel_BlackAndWhite(u16 *color) { - u16 red = *color & 0x1F; - u16 green = (*color >> 5) & 0x1F; - u16 blue = (*color >> 10) & 0x1F; + u16 red = GET_R(*color); + u16 green = GET_G(*color); + u16 blue = GET_B(*color); if (red < 17 && green < 17 && blue < 17) return RGB_BLACK; @@ -591,9 +591,9 @@ static u16 QuantizePixel_BlackOutline(u16 *pixelA, u16 *pixelB) { if (*pixelA != RGB_BLACK) { - if (*pixelA & 0x8000) - return 0x8000; - if (*pixelB & 0x8000) + if (IS_ALPHA(*pixelA)) + return RGB_ALPHA; + if (IS_ALPHA(*pixelB)) return RGB_BLACK; return *pixelA; @@ -604,13 +604,13 @@ static u16 QuantizePixel_BlackOutline(u16 *pixelA, u16 *pixelB) static u16 QuantizePixel_Invert(u16 *color) { - u16 red = *color & 0x1F; - u16 green = (*color >> 5) & 0x1F; - u16 blue = (*color >> 10) & 0x1F; + u16 red = GET_R(*color); + u16 green = GET_G(*color); + u16 blue = GET_B(*color); - red = 31 - red; + red = 31 - red; green = 31 - green; - blue = 31 - blue; + blue = 31 - blue; return RGB2(red, green, blue); } @@ -626,12 +626,12 @@ static u16 QuantizePixel_MotionBlur(u16 *prevPixel, u16 *curPixel) if (*prevPixel == *curPixel) return *curPixel; - pixelChannels[0][0] = (*prevPixel >> 0) & 0x1F; - pixelChannels[0][1] = (*prevPixel >> 5) & 0x1F; - pixelChannels[0][2] = (*prevPixel >> 10) & 0x1F; - pixelChannels[1][0] = (*curPixel >> 0) & 0x1F; - pixelChannels[1][1] = (*curPixel >> 5) & 0x1F; - pixelChannels[1][2] = (*curPixel >> 10) & 0x1F; + pixelChannels[0][0] = GET_R(*prevPixel); + pixelChannels[0][1] = GET_G(*prevPixel); + pixelChannels[0][2] = GET_B(*prevPixel); + pixelChannels[1][0] = GET_R(*curPixel); + pixelChannels[1][1] = GET_G(*curPixel); + pixelChannels[1][2] = GET_B(*curPixel); // Don't blur light colors. if (pixelChannels[0][0] > 25 && pixelChannels[0][1] > 25 && pixelChannels[0][2] > 25) @@ -667,9 +667,9 @@ static u16 QuantizePixel_MotionBlur(u16 *prevPixel, u16 *curPixel) largestDiff = diffs[0]; } - red = (pixelChannels[1][0] * (31 - largestDiff / 2)) / 31; + red = (pixelChannels[1][0] * (31 - largestDiff / 2)) / 31; green = (pixelChannels[1][1] * (31 - largestDiff / 2)) / 31; - blue = (pixelChannels[1][2] * (31 - largestDiff / 2)) / 31; + blue = (pixelChannels[1][2] * (31 - largestDiff / 2)) / 31; return RGB2(red, green, blue); } @@ -684,13 +684,13 @@ static u16 QuantizePixel_Blur(u16 *prevPixel, u16 *curPixel, u16 *nextPixel) if (*prevPixel == *curPixel && *nextPixel == *curPixel) return *curPixel; - red = (*curPixel >> 0) & 0x1F; - green = (*curPixel >> 5) & 0x1F; - blue = (*curPixel >> 10) & 0x1F; + red = GET_R(*curPixel); + green = GET_G(*curPixel); + blue = GET_B(*curPixel); - prevAvg = (((*prevPixel >> 0) & 0x1F) + ((*prevPixel >> 5) & 0x1F) + ((*prevPixel >> 10) & 0x1F)) / 3; - curAvg = (((*curPixel >> 0) & 0x1F) + ((*curPixel >> 5) & 0x1F) + ((*curPixel >> 10) & 0x1F)) / 3; - nextAvg = (((*nextPixel >> 0) & 0x1F) + ((*nextPixel >> 5) & 0x1F) + ((*nextPixel >> 10) & 0x1F)) / 3; + prevAvg = (GET_R(*prevPixel) + GET_G(*prevPixel) + GET_B(*prevPixel)) / 3; + curAvg = (GET_R(*curPixel) + GET_G(*curPixel) + GET_B(*curPixel)) / 3; + nextAvg = (GET_R(*nextPixel) + GET_G(*nextPixel) + GET_B(*nextPixel)) / 3; if (prevAvg == curAvg && nextAvg == curAvg) return *curPixel; @@ -728,14 +728,14 @@ static u16 QuantizePixel_BlurHard(u16 *prevPixel, u16 *curPixel, u16 *nextPixel) if (*prevPixel == *curPixel && *nextPixel == *curPixel) return *curPixel; - red = (*curPixel >> 0) & 0x1F; - green = (*curPixel >> 5) & 0x1F; - blue = (*curPixel >> 10) & 0x1F; - - prevAvg = (((*prevPixel >> 0) & 0x1F) + ((*prevPixel >> 5) & 0x1F) + ((*prevPixel >> 10) & 0x1F)) / 3; - curAvg = (((*curPixel >> 0) & 0x1F) + ((*curPixel >> 5) & 0x1F) + ((*curPixel >> 10) & 0x1F)) / 3; - nextAvg = (((*nextPixel >> 0) & 0x1F) + ((*nextPixel >> 5) & 0x1F) + ((*nextPixel >> 10) & 0x1F)) / 3; - + red = GET_R(*curPixel); + green = GET_G(*curPixel); + blue = GET_B(*curPixel); + + prevAvg = (GET_R(*prevPixel) + GET_G(*prevPixel) + GET_B(*prevPixel)) / 3; + curAvg = (GET_R(*curPixel) + GET_G(*curPixel) + GET_B(*curPixel)) / 3; + nextAvg = (GET_R(*nextPixel) + GET_G(*nextPixel) + GET_B(*nextPixel)) / 3; + if (prevAvg == curAvg && nextAvg == curAvg) return *curPixel; @@ -851,37 +851,37 @@ void ApplyImageProcessingQuantization(struct ImageProcessingContext *context) static void SetPresetPalette_PrimaryColors(void) { - gCanvasPalette[0] = RGB2(0, 0, 0); - gCanvasPalette[1] = RGB2(6, 6, 6); - gCanvasPalette[2] = RGB2(29, 29, 29); - gCanvasPalette[3] = RGB2(11, 11, 11); - gCanvasPalette[4] = RGB2(29, 6, 6); - gCanvasPalette[5] = RGB2(6, 29, 6); - gCanvasPalette[6] = RGB2(6, 6, 29); - gCanvasPalette[7] = RGB2(29, 29, 6); - gCanvasPalette[8] = RGB2(29, 6, 29); - gCanvasPalette[9] = RGB2(6, 29, 29); - gCanvasPalette[10] = RGB2(29, 11, 6); - gCanvasPalette[11] = RGB2(11, 29, 6); - gCanvasPalette[12] = RGB2(6, 11, 29); - gCanvasPalette[13] = RGB2(29, 6, 11); - gCanvasPalette[14] = RGB2(6, 29, 11); - gCanvasPalette[15] = RGB2(11, 6, 29); + gCanvasPalette[0] = RGB_BLACK; + gCanvasPalette[1] = RGB(6, 6, 6); + gCanvasPalette[2] = RGB(29, 29, 29); + gCanvasPalette[3] = RGB(11, 11, 11); + gCanvasPalette[4] = RGB(29, 6, 6); + gCanvasPalette[5] = RGB(6, 29, 6); + gCanvasPalette[6] = RGB(6, 6, 29); + gCanvasPalette[7] = RGB(29, 29, 6); + gCanvasPalette[8] = RGB(29, 6, 29); + gCanvasPalette[9] = RGB(6, 29, 29); + gCanvasPalette[10] = RGB(29, 11, 6); + gCanvasPalette[11] = RGB(11, 29, 6); + gCanvasPalette[12] = RGB(6, 11, 29); + gCanvasPalette[13] = RGB(29, 6, 11); + gCanvasPalette[14] = RGB(6, 29, 11); + gCanvasPalette[15] = RGB(11, 6, 29); } static void SetPresetPalette_BlackAndWhite(void) { - gCanvasPalette[0] = RGB2(0, 0, 0); - gCanvasPalette[1] = RGB2(0, 0, 0); - gCanvasPalette[2] = RGB2(31, 31, 31); + gCanvasPalette[0] = RGB_BLACK; + gCanvasPalette[1] = RGB_BLACK; + gCanvasPalette[2] = RGB_WHITE; } static void SetPresetPalette_GrayscaleSmall(void) { u8 i; - gCanvasPalette[0] = RGB2(0, 0, 0); - gCanvasPalette[1] = RGB2(0, 0, 0); + gCanvasPalette[0] = RGB_BLACK; + gCanvasPalette[1] = RGB_BLACK; for (i = 0; i < 14; i++) gCanvasPalette[i + 2] = RGB2(2 * (i + 2), 2 * (i + 2), 2 * (i + 2)); } @@ -890,7 +890,7 @@ static void SetPresetPalette_Grayscale(void) { u8 i; - gCanvasPalette[0] = RGB2(0, 0, 0); + gCanvasPalette[0] = RGB_BLACK; for (i = 0; i < 32; i++) gCanvasPalette[i + 1] = RGB2(i, i, i); } @@ -914,7 +914,7 @@ static void QuantizePalette_Standard(bool8 useLimitedPalette) u16 *pixel = &pixelRow[gCanvasColumnStart]; for (i = 0; i < gCanvasColumnEnd; i++, pixel++) { - if (*pixel & 0x8000) + if (IS_ALPHA(*pixel)) { *pixel = gCanvasPaletteStart; } @@ -982,7 +982,7 @@ static void QuantizePalette_BlackAndWhite(void) u16 *pixel = &pixelRow[gCanvasColumnStart]; for (i = 0; i < gCanvasColumnEnd; i++, pixel++) { - if (*pixel & 0x8000) + if (IS_ALPHA(*pixel)) { *pixel = gCanvasPaletteStart; } @@ -1013,7 +1013,7 @@ static void QuantizePalette_GrayscaleSmall(void) u16 *pixel = &pixelRow[gCanvasColumnStart]; for (i = 0; i < gCanvasColumnEnd; i++, pixel++) { - if (*pixel & 0x8000) + if (IS_ALPHA(*pixel)) *pixel = gCanvasPaletteStart; else *pixel = QuantizePixel_GrayscaleSmall(pixel) + gCanvasPaletteStart; @@ -1031,7 +1031,7 @@ static void QuantizePalette_Grayscale(void) u16 *pixel = &pixelRow[gCanvasColumnStart]; for (i = 0; i < gCanvasColumnEnd; i++, pixel++) { - if (*pixel & 0x8000) + if (IS_ALPHA(*pixel)) *pixel = gCanvasPaletteStart; else *pixel = QuantizePixel_Grayscale(pixel) + gCanvasPaletteStart; @@ -1049,7 +1049,7 @@ static void QuantizePalette_PrimaryColors(void) u16 *pixel = &pixelRow[gCanvasColumnStart]; for (i = 0; i < gCanvasColumnEnd; i++, pixel++) { - if (*pixel & 0x8000) + if (IS_ALPHA(*pixel)) *pixel = gCanvasPaletteStart; else *pixel = QuantizePixel_PrimaryColors(pixel) + gCanvasPaletteStart; @@ -1060,9 +1060,9 @@ static void QuantizePalette_PrimaryColors(void) // Quantizes the pixel's color channels to nearest multiple of 4, and clamps to [6, 30]. static u16 QuantizePixel_Standard(u16 *pixel) { - u16 red = *pixel & 0x1F; - u16 green = (*pixel >> 5) & 0x1F; - u16 blue = (*pixel >> 10) & 0x1F; + u16 red = GET_R(*pixel); + u16 green = GET_G(*pixel); + u16 blue = GET_B(*pixel); // Quantize color channels to muliples of 4, rounding up. if (red & 3) @@ -1091,10 +1091,10 @@ static u16 QuantizePixel_Standard(u16 *pixel) static u16 QuantizePixel_PrimaryColors(u16* color) { - u16 red = *color & 0x1F; - u16 green = (*color >> 5) & 0x1F; - u16 blue = (*color >> 10) & 0x1F; - + u16 red = GET_R(*color); + u16 green = GET_G(*color); + u16 blue = GET_B(*color); + if (red < 12 && green < 11 && blue < 11) return 1; @@ -1206,9 +1206,9 @@ static u16 QuantizePixel_PrimaryColors(u16* color) static u16 QuantizePixel_GrayscaleSmall(u16 *color) { - u16 red = *color & 0x1F; - u16 green = (*color >> 5) & 0x1F; - u16 blue = (*color >> 10) & 0x1F; + u16 red = GET_R(*color); + u16 green = GET_G(*color); + u16 blue = GET_B(*color); u16 average = ((red + green + blue) / 3) & 0x1E; if (average == 0) return 1; @@ -1218,9 +1218,9 @@ static u16 QuantizePixel_GrayscaleSmall(u16 *color) static u16 QuantizePixel_Grayscale(u16 *color) { - u16 red = *color & 0x1F; - u16 green = (*color >> 5) & 0x1F; - u16 blue = (*color >> 10) & 0x1F; + u16 red = GET_R(*color); + u16 green = GET_G(*color); + u16 blue = GET_B(*color); u16 average = (red + green + blue) / 3; return average + 1; } diff --git a/src/intro.c b/src/intro.c index 7dab2ad46..7c92913b6 100644 --- a/src/intro.c +++ b/src/intro.c @@ -986,8 +986,6 @@ static void SerialCB_CopyrightScreen(void) static u8 SetUpCopyrightScreen(void) { - u16 ime; - switch (gMain.state) { case 0: @@ -1302,7 +1300,6 @@ static void Task_IntroStartBikeRide(u8 taskId) static void Task_IntroHandleBikeAndFlygonMovement(u8 taskId) { - s16 a; u16 offset; if (gIntroFrameCounter == 1856) diff --git a/src/item.c b/src/item.c index 0b6366048..91d2f1a0a 100644 --- a/src/item.c +++ b/src/item.c @@ -102,8 +102,8 @@ void CopyItemNameHandlePlural(u16 itemId, u8 *dst, u32 quantity) } else { - if (itemId >= ITEM_CHERI_BERRY && itemId <= ITEM_ENIGMA_BERRY) - GetBerryCountString(dst, gBerries[itemId - ITEM_CHERI_BERRY].name, quantity); + if (itemId >= FIRST_BERRY_INDEX && itemId <= LAST_BERRY_INDEX) + GetBerryCountString(dst, gBerries[itemId - FIRST_BERRY_INDEX].name, quantity); else StringCopy(dst, ItemId_GetName(itemId)); } diff --git a/src/item_menu.c b/src/item_menu.c index 80035b945..6d30038d0 100755 --- a/src/item_menu.c +++ b/src/item_menu.c @@ -41,7 +41,6 @@ #include "shop.h" #include "sound.h" #include "sprite.h" -#include "string.h" #include "strings.h" #include "string_util.h" #include "task.h" @@ -628,7 +627,6 @@ void CB2_Bag(void) bool8 SetupBagMenu(void) { - u32 index; u8 taskId; switch (gMain.state) @@ -743,7 +741,7 @@ void BagMenu_InitBGs(void) ResetVramOamAndBgCntRegs(); memset(gBagMenu->tilemapBuffer, 0, 0x800); ResetBgsAndClearDma3BusyFlags(0); - InitBgsFromTemplates(0, sBgTemplates_ItemMenu, 3); + InitBgsFromTemplates(0, sBgTemplates_ItemMenu, ARRAY_COUNT(sBgTemplates_ItemMenu)); SetBgTilemapBuffer(2, gBagMenu->tilemapBuffer); ResetAllBgsCoordinates(); ScheduleBgCopyTilemapToVram(2); @@ -866,7 +864,7 @@ void GetItemName(s8 *dest, u16 itemId) } break; case BERRIES_POCKET: - ConvertIntToDecimalStringN(gStringVar1, itemId - ITEM_CHERI_BERRY + 1, STR_CONV_MODE_LEADING_ZEROS, 2); + ConvertIntToDecimalStringN(gStringVar1, itemId - FIRST_BERRY_INDEX + 1, STR_CONV_MODE_LEADING_ZEROS, 2); CopyItemName(itemId, gStringVar2); StringExpandPlaceholders(dest, gText_NumberVar1Clear7Var2); break; @@ -1722,7 +1720,7 @@ void ItemMenu_UseOutOfBattle(u8 taskId) if (ItemId_GetFieldFunc(gSpecialVar_ItemId)) { BagMenu_RemoveSomeWindow(); - if (CalculatePlayerPartyCount() == 0 && ItemId_GetType(gSpecialVar_ItemId) == 1) + if (CalculatePlayerPartyCount() == 0 && ItemId_GetType(gSpecialVar_ItemId) == ITEM_USE_PARTY_MENU) BagMenu_PrintThereIsNoPokemon(taskId); else { diff --git a/src/item_use.c b/src/item_use.c index 9ab755a5e..af0ca9ee5 100755 --- a/src/item_use.c +++ b/src/item_use.c @@ -53,7 +53,7 @@ static bool8 ItemfinderCheckForHiddenItems(const struct MapEvents *, u8); static u8 GetDirectionToHiddenItem(s16 distanceX, s16 distanceY); static void PlayerFaceHiddenItem(u8 a); static void CheckForHiddenItemsInMapConnection(u8 taskId); -static void sub_80FDC00(u8 taskId); +static void Task_OpenRegisteredPokeblockCase(u8 taskId); static void ItemUseOnFieldCB_Bike(u8 taskId); static void ItemUseOnFieldCB_Rod(u8); static void ItemUseOnFieldCB_Itemfinder(u8); @@ -69,7 +69,7 @@ static void Task_StartUseRepel(u8 taskId); static void Task_UseRepel(u8 taskId); static void Task_CloseCantUseKeyItemMessage(u8 taskId); static void SetDistanceOfClosestHiddenItem(u8 taskId, s16 x, s16 y); -static void CB2_OpenPokeblockCaseOnField(void); +static void CB2_OpenPokeblockFromBag(void); // EWRAM variables EWRAM_DATA static void(*sItemUseOnFieldCB)(u8 taskId) = NULL; @@ -77,13 +77,13 @@ EWRAM_DATA static void(*sItemUseOnFieldCB)(u8 taskId) = NULL; // Below is set TRUE by UseRegisteredKeyItemOnField #define tUsingRegisteredKeyItem data[3] -// .rodata - +// UB here if an item with type ITEM_USE_MAIL or ITEM_USE_BAG_MENU uses SetUpItemUseCallback +// Never occurs in vanilla, but can occur with improperly created items static const MainCallback sItemUseCallbacks[] = { - CB2_ShowPartyMenuForItemUse, - CB2_ReturnToField, - NULL, + [ITEM_USE_PARTY_MENU - 1] = CB2_ShowPartyMenuForItemUse, + [ITEM_USE_FIELD - 1] = CB2_ReturnToField, + [ITEM_USE_PBLOCK_CASE - 1] = NULL, }; static const u8 sClockwiseDirections[] = {DIR_NORTH, DIR_EAST, DIR_SOUTH, DIR_WEST}; @@ -94,13 +94,12 @@ static const struct YesNoFuncTable sUseTMHMYesNoFuncTable = .noFunc = BagMenu_InitListsMenu, }; -// .text - +#define tEnigmaBerryType data[4] static void SetUpItemUseCallback(u8 taskId) { u8 type; if (gSpecialVar_ItemId == ITEM_ENIGMA_BERRY) - type = gTasks[taskId].data[4] - 1; + type = gTasks[taskId].tEnigmaBerryType - 1; else type = ItemId_GetType(gSpecialVar_ItemId) - 1; if (!InBattlePyramid()) @@ -218,9 +217,9 @@ void ItemUseOutOfBattle_Bike(u8 taskId) static void ItemUseOnFieldCB_Bike(u8 taskId) { - if (!ItemId_GetSecondaryId(gSpecialVar_ItemId)) + if (ItemId_GetSecondaryId(gSpecialVar_ItemId) == MACH_BIKE) GetOnOffBike(PLAYER_AVATAR_FLAG_MACH_BIKE); - else + else // ACRO_BIKE GetOnOffBike(PLAYER_AVATAR_FLAG_ACRO_BIKE); ScriptUnfreezeObjectEvents(); ScriptContext2_Disable(); @@ -615,23 +614,23 @@ void ItemUseOutOfBattle_PokeblockCase(u8 taskId) } else if (gTasks[taskId].tUsingRegisteredKeyItem != TRUE) { - gBagMenu->exitCallback = CB2_OpenPokeblockCaseOnField; + gBagMenu->exitCallback = CB2_OpenPokeblockFromBag; Task_FadeAndCloseBagMenu(taskId); } else { - gFieldCallback = sub_80AF6D4; + gFieldCallback = FieldCB_ReturnToFieldNoScript; FadeScreen(FADE_TO_BLACK, 0); - gTasks[taskId].func = sub_80FDC00; + gTasks[taskId].func = Task_OpenRegisteredPokeblockCase; } } -static void CB2_OpenPokeblockCaseOnField(void) +static void CB2_OpenPokeblockFromBag(void) { OpenPokeblockCase(PBLOCK_CASE_FIELD, CB2_ReturnToBagMenuPocket); } -static void sub_80FDC00(u8 taskId) +static void Task_OpenRegisteredPokeblockCase(u8 taskId) { if (!gPaletteFade.active) { @@ -1065,28 +1064,28 @@ void ItemUseOutOfBattle_EnigmaBerry(u8 taskId) case ITEM_EFFECT_SPDEF_EV: case ITEM_EFFECT_SPEED_EV: case ITEM_EFFECT_DEF_EV: - gTasks[taskId].data[4] = 1; + gTasks[taskId].tEnigmaBerryType = ITEM_USE_PARTY_MENU; ItemUseOutOfBattle_Medicine(taskId); break; case ITEM_EFFECT_SACRED_ASH: - gTasks[taskId].data[4] = 1; + gTasks[taskId].tEnigmaBerryType = ITEM_USE_PARTY_MENU; ItemUseOutOfBattle_SacredAsh(taskId); break; case ITEM_EFFECT_RAISE_LEVEL: - gTasks[taskId].data[4] = 1; + gTasks[taskId].tEnigmaBerryType = ITEM_USE_PARTY_MENU; ItemUseOutOfBattle_RareCandy(taskId); break; case ITEM_EFFECT_PP_UP: case ITEM_EFFECT_PP_MAX: - gTasks[taskId].data[4] = 1; + gTasks[taskId].tEnigmaBerryType = ITEM_USE_PARTY_MENU; ItemUseOutOfBattle_PPUp(taskId); break; case ITEM_EFFECT_HEAL_PP: - gTasks[taskId].data[4] = 1; + gTasks[taskId].tEnigmaBerryType = ITEM_USE_PARTY_MENU; ItemUseOutOfBattle_PPRecovery(taskId); break; default: - gTasks[taskId].data[4] = 4; + gTasks[taskId].tEnigmaBerryType = ITEM_USE_BAG_MENU; ItemUseOutOfBattle_CannotUse(taskId); break; } diff --git a/src/librfu_rfu.c b/src/librfu_rfu.c index fe1d10834..7cb9b1bd6 100644 --- a/src/librfu_rfu.c +++ b/src/librfu_rfu.c @@ -1724,7 +1724,6 @@ static void rfu_constructSendLLFrame(void) u32 pakcketSize, currSize; u8 i; u8 *llf_p; - struct RfuSlotStatusNI *slotStatusNI; if (gRfuLinkStatus->parentChild != MODE_NEUTRAL && gRfuLinkStatus->sendSlotNIFlag | gRfuLinkStatus->recvSlotNIFlag | gRfuLinkStatus->sendSlotUNIFlag) diff --git a/src/link.c b/src/link.c index 9fd35a10b..dffb5b4cd 100644 --- a/src/link.c +++ b/src/link.c @@ -1489,7 +1489,7 @@ static void LinkCB_WaitCloseLink(void) if (count == linkPlayerCount) { // All ready, close link - gBattleTypeFlags &= ~BATTLE_TYPE_20; + gBattleTypeFlags &= ~BATTLE_TYPE_LINK_IN_BATTLE; gLinkVSyncDisabled = TRUE; CloseLink(); gLinkCallback = NULL; @@ -1551,7 +1551,7 @@ static void LinkCB_WaitCloseLinkWithJP(void) if (count == linkPlayerCount) { // All ready, close link - gBattleTypeFlags &= ~BATTLE_TYPE_20; + gBattleTypeFlags &= ~BATTLE_TYPE_LINK_IN_BATTLE; gLinkVSyncDisabled = TRUE; CloseLink(); gLinkCallback = NULL; diff --git a/src/link_rfu_2.c b/src/link_rfu_2.c index 5e0ef0aa4..b7713fa3f 100644 --- a/src/link_rfu_2.c +++ b/src/link_rfu_2.c @@ -1380,7 +1380,7 @@ static void WaitAllReadyToCloseLink(void) if (count == playerCount) { // All ready, close link - gBattleTypeFlags &= ~BATTLE_TYPE_20; + gBattleTypeFlags &= ~BATTLE_TYPE_LINK_IN_BATTLE; if (Rfu.parentChild == MODE_CHILD) { Rfu.errorState = 3; diff --git a/src/mail.c b/src/mail.c index 01574f53a..cfdfb341c 100644 --- a/src/mail.c +++ b/src/mail.c @@ -125,7 +125,7 @@ static void CB2_ExitMailReadFreeVars(void); // .rodata -static const struct BgTemplate sUnknown_0859F290[] = { +static const struct BgTemplate sBgTemplates[] = { { .bg = 0, .charBaseIndex = 2, @@ -254,7 +254,7 @@ void ReadMail(struct MailStruct *mail, void (*callback)(void), bool8 flag) sMailRead->parserMultiple = ConvertEasyChatWordsToString; if (IS_ITEM_MAIL(mail->itemId)) { - sMailRead->mailType = mail->itemId - ITEM_ORANGE_MAIL; + sMailRead->mailType = mail->itemId - FIRST_MAIL_INDEX; } else { @@ -279,10 +279,10 @@ void ReadMail(struct MailStruct *mail, void (*callback)(void), bool8 flag) default: sMailRead->animsActive = 0; break; - case ITEM_BEAD_MAIL - ITEM_ORANGE_MAIL: + case ITEM_BEAD_MAIL - FIRST_MAIL_INDEX: sMailRead->animsActive = 1; break; - case ITEM_DREAM_MAIL - ITEM_ORANGE_MAIL: + case ITEM_DREAM_MAIL - FIRST_MAIL_INDEX: sMailRead->animsActive = 2; break; } @@ -336,7 +336,7 @@ static bool8 MailReadBuildGraphics(void) break; case 6: ResetBgsAndClearDma3BusyFlags(0); - InitBgsFromTemplates(0, sUnknown_0859F290, 3); + InitBgsFromTemplates(0, sBgTemplates, ARRAY_COUNT(sBgTemplates)); SetBgTilemapBuffer(1, sMailRead->bg1TilemapBuffer); SetBgTilemapBuffer(2, sMailRead->bg2TilemapBuffer); break; diff --git a/src/main.c b/src/main.c index 9fd1d0a35..992d23ead 100644 --- a/src/main.c +++ b/src/main.c @@ -75,7 +75,7 @@ static EWRAM_DATA u16 gTrainerId = 0; static void UpdateLinkAndCallCallbacks(void); static void InitMainCallbacks(void); static void CallCallbacks(void); -//static void SeedRngWithRtc(void); +static void SeedRngWithRtc(void); static void ReadKeys(void); void InitIntrHandlers(void); static void WaitForVBlank(void); @@ -102,7 +102,9 @@ void AgbMain() CheckForFlashMemory(); InitMainCallbacks(); InitMapMusic(); - //SeedRngWithRtc(); see comment at SeedRngWithRtc declaration below +#ifdef BUGFIX + SeedRngWithRtc(); // see comment at SeedRngWithRtc definition below +#endif ClearDma3Requests(); ResetBgs(); SetDefaultFontsPointer(); @@ -213,13 +215,15 @@ void EnableVCountIntrAtLine150(void) EnableInterrupts(INTR_FLAG_VCOUNT); } -// oops! FRLG commented this out to remove RTC, however Emerald didnt undo this! -//static void SeedRngWithRtc(void) -//{ -// u32 seed = RtcGetMinuteCount(); -// seed = (seed >> 16) ^ (seed & 0xFFFF); -// SeedRng(seed); -//} +// FRLG commented this out to remove RTC, however Emerald didn't undo this! +#ifdef BUGFIX +static void SeedRngWithRtc(void) +{ + u32 seed = RtcGetMinuteCount(); + seed = (seed >> 16) ^ (seed & 0xFFFF); + SeedRng(seed); +} +#endif void InitKeys(void) { @@ -294,7 +298,7 @@ void InitIntrHandlers(void) REG_IME = 1; - EnableInterrupts(0x1); + EnableInterrupts(INTR_FLAG_VBLANK); } void SetVBlankCallback(IntrCallback callback) diff --git a/src/main_menu.c b/src/main_menu.c index 5b39b6d45..74af96da8 100644 --- a/src/main_menu.c +++ b/src/main_menu.c @@ -28,7 +28,6 @@ #include "scanline_effect.h" #include "sound.h" #include "sprite.h" -#include "string.h" #include "strings.h" #include "string_util.h" #include "task.h" @@ -1800,7 +1799,7 @@ static void CB2_NewGameBirchSpeech_ReturnFromNamingScreen(void) ResetBgsAndClearDma3BusyFlags(0); SetGpuReg(REG_OFFSET_DISPCNT, 0); SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_ON | DISPCNT_OBJ_1D_MAP); - InitBgsFromTemplates(0, sMainMenuBgTemplates, 2); + InitBgsFromTemplates(0, sMainMenuBgTemplates, ARRAY_COUNT(sMainMenuBgTemplates)); InitBgFromTemplate(&sBirchBgTemplate); SetVBlankCallback(NULL); SetGpuReg(REG_OFFSET_BG2CNT, 0); @@ -2098,7 +2097,7 @@ static void NewGameBirchSpeech_ShowGenderMenu(void) { DrawMainMenuWindowBorder(&gNewGameBirchSpeechTextWindows[1], 0xF3); FillWindowPixelBuffer(1, PIXEL_FILL(1)); - PrintMenuTable(1, 2, sMenuActions_Gender); + PrintMenuTable(1, ARRAY_COUNT(sMenuActions_Gender), sMenuActions_Gender); InitMenuInUpperLeftCornerPlaySoundWhenAPressed(1, 2, 0); PutWindowTilemap(1); CopyWindowToVram(1, 3); diff --git a/src/match_call.c b/src/match_call.c index 723562ade..7e8d0c38a 100644 --- a/src/match_call.c +++ b/src/match_call.c @@ -1494,7 +1494,6 @@ static const struct MatchCallText *GetGeneralMatchCallText(int matchCallId, u8 * int count; u32 topic, id; u16 rand; - u16 var3; rand = Random(); if (!(rand & 1)) diff --git a/src/mauville_old_man.c b/src/mauville_old_man.c index af68c6116..c97ee94f3 100644 --- a/src/mauville_old_man.c +++ b/src/mauville_old_man.c @@ -1324,7 +1324,6 @@ static void PrintStoryList(void) { s32 i; s32 width = GetStringWidth(1, gText_Exit, 0); - u8 tileWidth; for (i = 0; i < NUM_STORYTELLER_TALES; i++) { s32 curWidth; diff --git a/src/mevent_server.c b/src/mevent_server.c index 0d3afea30..2e7b3d89a 100644 --- a/src/mevent_server.c +++ b/src/mevent_server.c @@ -288,8 +288,8 @@ static u32 (*const func_tbl[])(struct mevent_srv_common *) = { static u32 mevent_srv_exec_common(struct mevent_srv_common * svr) { u32 response; - AGB_ASSERT(svr->mainseqno < NELEMS(func_tbl)); + AGB_ASSERT(svr->mainseqno < ARRAY_COUNT(func_tbl)); response = func_tbl[svr->mainseqno](svr); - AGB_ASSERT(svr->mainseqno < NELEMS(func_tbl)); + AGB_ASSERT(svr->mainseqno < ARRAY_COUNT(func_tbl)); return response; } diff --git a/src/minigame_countdown.c b/src/minigame_countdown.c index cd5710d44..d2f7d3ea8 100644 --- a/src/minigame_countdown.c +++ b/src/minigame_countdown.c @@ -14,7 +14,6 @@ static void sub_802E83C(u8 taskId); static void sub_802E8C8(u8 taskId); static void sub_802EA50(u8 taskId); static void sub_802EAB0(u8 taskId); -static void sub_802EB98(u8 taskId); static void Task_MinigameCountdown(u8 taskId); static bool32 RunMinigameCountdownDigitsAnim(u8 spriteId); static bool32 IsStartGraphicAnimRunning(u8 spriteId); diff --git a/src/overworld.c b/src/overworld.c index 72aa17929..cbfc70898 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -174,7 +174,6 @@ static u8 sPlayerTradingStates[MAX_LINK_PLAYERS]; static u16 (*sPlayerKeyInterceptCallback)(u32); static bool8 sUnknown_03000E18; static u8 sRfuKeepAliveTimer; -static u32 sUnusedVar; // IWRAM common u16 *gBGTilemapBuffers1; diff --git a/src/palette.c b/src/palette.c index 320e11ecc..ece753d21 100644 --- a/src/palette.c +++ b/src/palette.c @@ -60,7 +60,7 @@ ALIGNED(4) EWRAM_DATA u16 gPlttBufferUnfaded[PLTT_BUFFER_SIZE] = {0}; ALIGNED(4) EWRAM_DATA u16 gPlttBufferFaded[PLTT_BUFFER_SIZE] = {0}; EWRAM_DATA struct PaletteStruct sPaletteStructs[0x10] = {0}; EWRAM_DATA struct PaletteFadeControl gPaletteFade = {0}; -static EWRAM_DATA u32 gFiller_2037FE0 = 0; +static EWRAM_DATA u32 sFiller = 0; static EWRAM_DATA u32 sPlttBufferTransferPending = 0; EWRAM_DATA u8 gPaletteDecompressionBuffer[PLTT_DECOMP_BUFFER_SIZE] = {0}; @@ -624,7 +624,7 @@ static u8 UpdateFastPaletteFade(void) if (b < b0) b = b0; - gPlttBufferFaded[i] = r | (g << 5) | (b << 10); + gPlttBufferFaded[i] = RGB(r, g, b); } break; case FAST_FADE_OUT_TO_WHITE: @@ -642,7 +642,7 @@ static u8 UpdateFastPaletteFade(void) if (b > 31) b = 31; - gPlttBufferFaded[i] = r | (g << 5) | (b << 10); + gPlttBufferFaded[i] = RGB(r, g, b); } break; case FAST_FADE_IN_FROM_BLACK: @@ -668,7 +668,7 @@ static u8 UpdateFastPaletteFade(void) if (b > b0) b = b0; - gPlttBufferFaded[i] = r | (g << 5) | (b << 10); + gPlttBufferFaded[i] = RGB(r, g, b); } break; case FAST_FADE_OUT_TO_BLACK: @@ -686,7 +686,7 @@ static u8 UpdateFastPaletteFade(void) if (b < 0) b = 0; - gPlttBufferFaded[i] = r | (g << 5) | (b << 10); + gPlttBufferFaded[i] = RGB(r, g, b); } } @@ -856,13 +856,13 @@ void TintPalette_GrayScale(u16 *palette, u16 count) for (i = 0; i < count; i++) { - r = (*palette >> 0) & 0x1F; - g = (*palette >> 5) & 0x1F; - b = (*palette >> 10) & 0x1F; + r = GET_R(*palette); + g = GET_G(*palette); + b = GET_B(*palette); gray = (r * Q_8_8(0.3) + g * Q_8_8(0.59) + b * Q_8_8(0.1133)) >> 8; - *palette++ = (gray << 10) | (gray << 5) | (gray << 0); + *palette++ = RGB2(gray, gray, gray); } } @@ -873,18 +873,18 @@ void TintPalette_GrayScale2(u16 *palette, u16 count) for (i = 0; i < count; i++) { - r = (*palette >> 0) & 0x1F; - g = (*palette >> 5) & 0x1F; - b = (*palette >> 10) & 0x1F; + r = GET_R(*palette); + g = GET_G(*palette); + b = GET_B(*palette); gray = (r * Q_8_8(0.3) + g * Q_8_8(0.59) + b * Q_8_8(0.1133)) >> 8; - if (gray > 0x1F) - gray = 0x1F; + if (gray > 31) + gray = 31; gray = sRoundedDownGrayscaleMap[gray]; - *palette++ = (gray << 10) | (gray << 5) | (gray << 0); + *palette++ = RGB2(gray, gray, gray); } } @@ -895,9 +895,9 @@ void TintPalette_SepiaTone(u16 *palette, u16 count) for (i = 0; i < count; i++) { - r = (*palette >> 0) & 0x1F; - g = (*palette >> 5) & 0x1F; - b = (*palette >> 10) & 0x1F; + r = GET_R(*palette); + g = GET_G(*palette); + b = GET_B(*palette); gray = (r * Q_8_8(0.3) + g * Q_8_8(0.59) + b * Q_8_8(0.1133)) >> 8; @@ -908,7 +908,7 @@ void TintPalette_SepiaTone(u16 *palette, u16 count) if (r > 31) r = 31; - *palette++ = (b << 10) | (g << 5) | (r << 0); + *palette++ = RGB2(r, g, b); } } @@ -919,9 +919,9 @@ void TintPalette_CustomTone(u16 *palette, u16 count, u16 rTone, u16 gTone, u16 b for (i = 0; i < count; i++) { - r = (*palette >> 0) & 0x1F; - g = (*palette >> 5) & 0x1F; - b = (*palette >> 10) & 0x1F; + r = GET_R(*palette); + g = GET_G(*palette); + b = GET_B(*palette); gray = (r * Q_8_8(0.3) + g * Q_8_8(0.59) + b * Q_8_8(0.1133)) >> 8; @@ -936,7 +936,7 @@ void TintPalette_CustomTone(u16 *palette, u16 count, u16 rTone, u16 gTone, u16 b if (b > 31) b = 31; - *palette++ = (b << 10) | (g << 5) | (r << 0); + *palette++ = RGB2(r, g, b); } } diff --git a/src/party_menu.c b/src/party_menu.c index 7c2f6f771..2d4432367 100755 --- a/src/party_menu.c +++ b/src/party_menu.c @@ -151,7 +151,7 @@ static EWRAM_DATA u16 *sSlot1TilemapBuffer = 0; // for switching party slots static EWRAM_DATA u16 *sSlot2TilemapBuffer = 0; // EWRAM_DATA u8 gSelectedOrderFromParty[MAX_FRONTIER_PARTY_SIZE] = {0}; static EWRAM_DATA u16 sPartyMenuItemId = 0; -static EWRAM_DATA u16 sUnused_0203CEFE = 0; +static EWRAM_DATA u16 sUnused = 0; EWRAM_DATA u8 gBattlePartyCurrentOrder[PARTY_SIZE / 2] = {0}; // bits 0-3 are the current pos of Slot 1, 4-7 are Slot 2, and so on // IWRAM common @@ -1221,16 +1221,16 @@ static void HandleChooseMonSelection(u8 taskId, s8 *slotPtr) } else { - switch (gPartyMenu.action - 3) + switch (gPartyMenu.action) { - case PARTY_ACTION_SOFTBOILED - 3: + case PARTY_ACTION_SOFTBOILED: if (IsSelectedMonNotEgg((u8*)slotPtr)) { PartyMenuRemoveWindow(&sPartyMenuInternal->windowId[1]); Task_TryUseSoftboiledOnPartyMon(taskId); } break; - case PARTY_ACTION_USE_ITEM - 3: + case PARTY_ACTION_USE_ITEM: if (IsSelectedMonNotEgg((u8*)slotPtr)) { if (gPartyMenu.menuType == PARTY_MENU_TYPE_IN_BATTLE) @@ -1240,7 +1240,7 @@ static void HandleChooseMonSelection(u8 taskId, s8 *slotPtr) gItemUseCB(taskId, Task_ClosePartyMenuAfterText); } break; - case PARTY_ACTION_MOVE_TUTOR - 3: + case PARTY_ACTION_MOVE_TUTOR: if (IsSelectedMonNotEgg((u8*)slotPtr)) { PlaySE(SE_SELECT); @@ -1248,7 +1248,7 @@ static void HandleChooseMonSelection(u8 taskId, s8 *slotPtr) TryTutorSelectedMon(taskId); } break; - case PARTY_ACTION_GIVE_MAILBOX_MAIL - 3: + case PARTY_ACTION_GIVE_MAILBOX_MAIL: if (IsSelectedMonNotEgg((u8*)slotPtr)) { PlaySE(SE_SELECT); @@ -1256,8 +1256,8 @@ static void HandleChooseMonSelection(u8 taskId, s8 *slotPtr) TryGiveMailToSelectedMon(taskId); } break; - case PARTY_ACTION_GIVE_ITEM - 3: - case PARTY_ACTION_GIVE_PC_ITEM - 3: + case PARTY_ACTION_GIVE_ITEM: + case PARTY_ACTION_GIVE_PC_ITEM: if (IsSelectedMonNotEgg((u8*)slotPtr)) { PlaySE(SE_SELECT); @@ -1265,23 +1265,23 @@ static void HandleChooseMonSelection(u8 taskId, s8 *slotPtr) TryGiveItemOrMailToSelectedMon(taskId); } break; - case PARTY_ACTION_SWITCH - 3: + case PARTY_ACTION_SWITCH: PlaySE(SE_SELECT); SwitchSelectedMons(taskId); break; - case PARTY_ACTION_CHOOSE_AND_CLOSE - 3: + case PARTY_ACTION_CHOOSE_AND_CLOSE: PlaySE(SE_SELECT); Task_ClosePartyMenu(taskId); break; - case PARTY_ACTION_MINIGAME - 3: + case PARTY_ACTION_MINIGAME: if (IsSelectedMonNotEgg((u8*)slotPtr)) { TryEnterMonForMinigame(taskId, (u8)*slotPtr); } break; default: - case PARTY_ACTION_ABILITY_PREVENTS - 3: - case PARTY_ACTION_SWITCHING - 3: + case PARTY_ACTION_ABILITY_PREVENTS: + case PARTY_ACTION_SWITCHING: PlaySE(SE_SELECT); Task_TryCreateSelectionWindow(taskId); break; @@ -1961,9 +1961,9 @@ static u8 CanMonLearnTMTutor(struct Pokemon *mon, u16 item, u8 tutor) if (GetMonData(mon, MON_DATA_IS_EGG)) return CANNOT_LEARN_MOVE_IS_EGG; - if (item >= ITEM_TM01_FOCUS_PUNCH) + if (item >= ITEM_TM01) { - if (!CanMonLearnTMHM(mon, item - ITEM_TM01_FOCUS_PUNCH)) + if (!CanMonLearnTMHM(mon, item - ITEM_TM01)) return CANNOT_LEARN_MOVE; else move = ItemIdToBattleMoveId(item); @@ -4607,7 +4607,7 @@ void ItemUseCB_PPUp(u8 taskId, TaskFunc task) u16 ItemIdToBattleMoveId(u16 item) { - u16 tmNumber = item - ITEM_TM01_FOCUS_PUNCH; + u16 tmNumber = item - ITEM_TM01; return sTMHMMoves[tmNumber]; } diff --git a/src/player_pc.c b/src/player_pc.c index 928aac706..1f293a195 100644 --- a/src/player_pc.c +++ b/src/player_pc.c @@ -443,7 +443,7 @@ static void InitItemStorageMenu(u8 taskId, u8 var) windowTemplate.width = GetMaxWidthInMenuTable(gPCText_ItemPCOptionsText, 4); data[4] = AddWindow(&windowTemplate); SetStandardWindowBorderStyle(data[4], 0); - PrintMenuTable(data[4], 4, gPCText_ItemPCOptionsText); + PrintMenuTable(data[4], ARRAY_COUNT(gPCText_ItemPCOptionsText), gPCText_ItemPCOptionsText); InitMenuInUpperLeftCornerPlaySoundWhenAPressed(data[4], 4, var); ScheduleBgCopyTilemapToVram(0); ItemStorageMenuPrint(gPCText_OptionDescList[var]); @@ -686,7 +686,7 @@ static void Mailbox_ReturnToPlayerPC(u8 taskId) static void Mailbox_PrintMailOptions(u8 taskId) { u8 r4 = sub_81D1C84(2); - PrintMenuTable(r4, 4, gMailboxMailOptions); + PrintMenuTable(r4, ARRAY_COUNT(gMailboxMailOptions), gMailboxMailOptions); InitMenuInUpperLeftCornerPlaySoundWhenAPressed(r4, 4, 0); ScheduleBgCopyTilemapToVram(0); gTasks[taskId].func = Mailbox_MailOptionsProcessInput; @@ -1058,7 +1058,6 @@ static void ItemStorage_ProcessWithdrawTossInput(u8 taskId) s16 *data; bool32 toss; u32 i, x; - u8 windowId; const u8* text; data = gTasks[taskId].data; diff --git a/src/pokeblock_feed.c b/src/pokeblock_feed.c index e2202b59e..36471fb62 100644 --- a/src/pokeblock_feed.c +++ b/src/pokeblock_feed.c @@ -61,7 +61,6 @@ static void HandleInitWindows(void); static void LaunchPokeblockFeedTask(void); static void SetPokeblockSpritePal(u8 pokeblockCaseId); static void sub_817A5CC(void); -static void sub_8148108(u8 spriteId, bool8 a1); static void DoPokeblockCaseThrowEffect(u8 spriteId, bool8 arg1); static void PrepareMonToMoveToPokeblock(u8 spriteId); static void Task_HandleMonAtePokeblock(u8 taskId); diff --git a/src/pokedex.c b/src/pokedex.c index 32c495530..3cd93203e 100644 --- a/src/pokedex.c +++ b/src/pokedex.c @@ -1373,7 +1373,7 @@ static const struct SearchOptionText sDexSearchColorOptions[] = {}, }; -static const struct SearchOptionText sDexSearchTypeOptions[] = +static const struct SearchOptionText sDexSearchTypeOptions[NUMBER_OF_MON_TYPES + 1] = // + 2 for "None" and terminator, - 1 for Mystery { {gText_DexEmptyString, gText_DexSearchTypeNone}, {gText_DexEmptyString, gTypeNames[TYPE_NORMAL]}, @@ -1407,7 +1407,7 @@ static const u8 sOrderOptions[] = ORDER_SMALLEST, }; -static const u8 sDexSearchTypeIds[] = +static const u8 sDexSearchTypeIds[NUMBER_OF_MON_TYPES] = { TYPE_NONE, TYPE_NORMAL, @@ -1585,9 +1585,6 @@ static void ResetPokedexView(struct PokedexView *pokedexView) void CB2_OpenPokedex(void) { - u8 *addr; - u32 size; - switch (gMain.state) { case 0: @@ -3040,7 +3037,7 @@ static void SpriteCB_PokedexListMonSprite(struct Sprite *sprite) if (gSineTable[sprite->data[5] + 64] != 0) var = 0x10000 / gSineTable[sprite->data[5] + 64]; else - var = 0xFFFF; + var = 0; #else var = 0x10000 / gSineTable[sprite->data[5] + 64]; #endif //UBFIX diff --git a/src/pokedex_area_screen.c b/src/pokedex_area_screen.c index 7a3b38dc2..b63b00290 100755 --- a/src/pokedex_area_screen.c +++ b/src/pokedex_area_screen.c @@ -489,7 +489,6 @@ static bool8 MonListHasMon(const struct WildPokemonInfo *info, u16 species, u16 static void BuildAreaGlowTilemap(void) { u16 i, y, x, j; - u16 val; for (i = 0; i < ARRAY_COUNT(sPokedexAreaScreen->areaGlowTilemap); i++) sPokedexAreaScreen->areaGlowTilemap[i] = 0; diff --git a/src/pokemon.c b/src/pokemon.c index 8e8472b81..4d6df5524 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -751,7 +751,7 @@ const u16 gSpeciesToNationalPokedexNum[NUM_SPECIES] = // Assigns all species to SPECIES_TO_NATIONAL(BRONZOR), SPECIES_TO_NATIONAL(BRONZONG), SPECIES_TO_NATIONAL(BONSLY), - SPECIES_TO_NATIONAL(MIMEJR), + SPECIES_TO_NATIONAL(MIME_JR), SPECIES_TO_NATIONAL(HAPPINY), SPECIES_TO_NATIONAL(CHATOT), SPECIES_TO_NATIONAL(SPIRITOMB), @@ -1496,7 +1496,7 @@ const u16 gSpeciesToNationalPokedexNum[NUM_SPECIES] = // Assigns all species to [SPECIES_HOOPA_UNBOUND - 1] = NATIONAL_DEX_HOOPA, // Oricorio [SPECIES_ORICORIO_POM_POM - 1] = NATIONAL_DEX_ORICORIO, - [SPECIES_ORICORIO_PA_U - 1] = NATIONAL_DEX_ORICORIO, + [SPECIES_ORICORIO_PAU - 1] = NATIONAL_DEX_ORICORIO, [SPECIES_ORICORIO_SENSU - 1] = NATIONAL_DEX_ORICORIO, // Rockruff [SPECIES_ROCKRUFF_OWN_TEMPO - 1] = NATIONAL_DEX_ROCKRUFF, @@ -2294,7 +2294,7 @@ static const u8 sMonFrontAnimIdsTable[NUM_SPECIES - 1] = [SPECIES_BRONZOR - 1] = 0x4E, [SPECIES_BRONZONG - 1] = 0x51, [SPECIES_BONSLY - 1] = 0x52, - [SPECIES_MIMEJR - 1] = 0x40, + [SPECIES_MIME_JR - 1] = 0x40, [SPECIES_HAPPINY - 1] = 0x45, [SPECIES_CHATOT - 1] = 0x19, [SPECIES_SPIRITOMB - 1] = 0x3A, @@ -3048,7 +3048,7 @@ void CreateBoxMon(struct BoxPokemon *boxMon, u16 species, u8 level, u8 fixedIV, SetBoxMonData(boxMon, MON_DATA_POKEBALL, &value); SetBoxMonData(boxMon, MON_DATA_OT_GENDER, &gSaveBlock2Ptr->playerGender); - if (fixedIV < 32) + if (fixedIV < USE_RANDOM_IVS) { SetBoxMonData(boxMon, MON_DATA_HP_IV, &fixedIV); SetBoxMonData(boxMon, MON_DATA_ATK_IV, &fixedIV); @@ -3062,20 +3062,20 @@ void CreateBoxMon(struct BoxPokemon *boxMon, u16 species, u8 level, u8 fixedIV, u32 iv; value = Random(); - iv = value & 0x1F; + iv = value & MAX_IV_MASK; SetBoxMonData(boxMon, MON_DATA_HP_IV, &iv); - iv = (value & 0x3E0) >> 5; + iv = (value & (MAX_IV_MASK << 5)) >> 5; SetBoxMonData(boxMon, MON_DATA_ATK_IV, &iv); - iv = (value & 0x7C00) >> 10; + iv = (value & (MAX_IV_MASK << 10)) >> 10; SetBoxMonData(boxMon, MON_DATA_DEF_IV, &iv); value = Random(); - iv = value & 0x1F; + iv = value & MAX_IV_MASK; SetBoxMonData(boxMon, MON_DATA_SPEED_IV, &iv); - iv = (value & 0x3E0) >> 5; + iv = (value & (MAX_IV_MASK << 5)) >> 5; SetBoxMonData(boxMon, MON_DATA_SPATK_IV, &iv); - iv = (value & 0x7C00) >> 10; + iv = (value & (MAX_IV_MASK << 10)) >> 10; SetBoxMonData(boxMon, MON_DATA_SPDEF_IV, &iv); } @@ -3105,14 +3105,14 @@ void CreateMonWithGenderNatureLetter(struct Pokemon *mon, u16 species, u8 level, { u32 personality; - if ((u8)(unownLetter - 1) < 28) + if ((u8)(unownLetter - 1) < NUM_UNOWN_FORMS) { u16 actualLetter; do { personality = Random32(); - actualLetter = ((((personality & 0x3000000) >> 18) | ((personality & 0x30000) >> 12) | ((personality & 0x300) >> 6) | (personality & 0x3)) % 28); + actualLetter = GET_UNOWN_LETTER(personality); } while (nature != GetNatureFromPersonality(personality) || gender != GetGenderFromSpeciesAndPersonality(species, personality) @@ -3143,7 +3143,7 @@ void CreateMaleMon(struct Pokemon *mon, u16 species, u8 level) personality = Random32(); } while (GetGenderFromSpeciesAndPersonality(species, personality) != MON_MALE); - CreateMon(mon, species, level, 32, 1, personality, OT_ID_PRESET, otId); + CreateMon(mon, species, level, USE_RANDOM_IVS, 1, personality, OT_ID_PRESET, otId); } void CreateMonWithIVsPersonality(struct Pokemon *mon, u16 species, u8 level, u32 ivs, u32 personality) @@ -3325,7 +3325,7 @@ void CreateApprenticeMon(struct Pokemon *mon, const struct Apprentice *src, u8 m CreateMon(mon, src->party[monId].species, GetFrontierEnemyMonLevel(src->lvlMode - 1), - 0x1F, + MAX_PER_STAT_IVS, TRUE, personality, OT_ID_PRESET, @@ -3485,8 +3485,8 @@ u16 GetUnionRoomTrainerPic(void) u8 linkId; u32 arrId; - if (gBattleTypeFlags & BATTLE_TYPE_x2000000) - linkId = gUnknown_0203C7B4 ^ 1; + if (gBattleTypeFlags & BATTLE_TYPE_RECORDED_LINK) + linkId = gRecordedBattleMultiplayerId ^ 1; else linkId = GetMultiplayerId() ^ 1; @@ -3500,8 +3500,8 @@ u16 GetUnionRoomTrainerClass(void) u8 linkId; u32 arrId; - if (gBattleTypeFlags & BATTLE_TYPE_x2000000) - linkId = gUnknown_0203C7B4 ^ 1; + if (gBattleTypeFlags & BATTLE_TYPE_RECORDED_LINK) + linkId = gRecordedBattleMultiplayerId ^ 1; else linkId = GetMultiplayerId() ^ 1; @@ -3517,7 +3517,7 @@ void CreateObedientEnemyMon(void) s32 itemId = gSpecialVar_0x8006; ZeroEnemyPartyMons(); - CreateObedientMon(&gEnemyParty[0], species, level, 32, 0, 0, 0, 0); + CreateObedientMon(&gEnemyParty[0], species, level, USE_RANDOM_IVS, 0, 0, 0, 0); if (itemId) { u8 heldItem[2]; @@ -3615,13 +3615,14 @@ void CalculateMonStats(struct Pokemon *mon) { if (currentHP == 0 && oldMaxHP == 0) currentHP = newMaxHP; - else if (currentHP != 0) + else if (currentHP != 0) { // BUG: currentHP is unintentionally able to become <= 0 after the instruction below. This causes the pomeg berry glitch. currentHP += newMaxHP - oldMaxHP; #ifdef BUGFIX if (currentHP <= 0) currentHP = 1; #endif + } else return; } @@ -4114,7 +4115,7 @@ u8 CountAliveMonsInBattle(u8 caseId) static bool8 ShouldGetStatBadgeBoost(u16 badgeFlag, u8 battlerId) { - if (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_EREADER_TRAINER | BATTLE_TYPE_x2000000 | BATTLE_TYPE_FRONTIER)) + if (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_EREADER_TRAINER | BATTLE_TYPE_RECORDED_LINK | BATTLE_TYPE_FRONTIER)) return FALSE; else if (GetBattlerSide(battlerId) != B_SIDE_PLAYER) return FALSE; @@ -5063,12 +5064,12 @@ void SetBoxMonData(struct BoxPokemon *boxMon, s32 field, const void *dataArg) case MON_DATA_IVS: { u32 ivs = data[0] | (data[1] << 8) | (data[2] << 16) | (data[3] << 24); - substruct3->hpIV = ivs & 0x1F; - substruct3->attackIV = (ivs >> 5) & 0x1F; - substruct3->defenseIV = (ivs >> 10) & 0x1F; - substruct3->speedIV = (ivs >> 15) & 0x1F; - substruct3->spAttackIV = (ivs >> 20) & 0x1F; - substruct3->spDefenseIV = (ivs >> 25) & 0x1F; + substruct3->hpIV = ivs & MAX_IV_MASK; + substruct3->attackIV = (ivs >> 5) & MAX_IV_MASK; + substruct3->defenseIV = (ivs >> 10) & MAX_IV_MASK; + substruct3->speedIV = (ivs >> 15) & MAX_IV_MASK; + substruct3->spAttackIV = (ivs >> 20) & MAX_IV_MASK; + substruct3->spDefenseIV = (ivs >> 25) & MAX_IV_MASK; break; } default: @@ -5407,7 +5408,6 @@ bool8 PokemonUseItemEffects(struct Pokemon *mon, u16 item, u8 partyIndex, u8 mov u32 var_28 = 0; u16 heldItem; u8 r10; - u32 r4; u32 r5; s8 r2; u16 evCount; @@ -7113,7 +7113,7 @@ u16 GetBattleBGM(void) return MUS_VS_KYOGRE_GROUDON; else if (gBattleTypeFlags & BATTLE_TYPE_REGI) return MUS_VS_REGI; - else if (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000)) + else if (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_RECORDED_LINK)) return MUS_VS_TRAINER; else if (gBattleTypeFlags & BATTLE_TYPE_TRAINER) { @@ -7493,7 +7493,7 @@ static void Task_PokemonSummaryAnimateAfterDelay(u8 taskId) void BattleAnimateFrontSprite(struct Sprite* sprite, u16 species, bool8 noCry, u8 arg3) { - if (gHitMarker & HITMARKER_NO_ANIMATIONS && !(gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000))) + if (gHitMarker & HITMARKER_NO_ANIMATIONS && !(gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_RECORDED_LINK))) DoMonFrontSpriteAnimation(sprite, species, noCry, arg3 | 0x80); else DoMonFrontSpriteAnimation(sprite, species, noCry, arg3); @@ -7571,7 +7571,7 @@ void StopPokemonAnimationDelayTask(void) void BattleAnimateBackSprite(struct Sprite* sprite, u16 species) { - if (gHitMarker & HITMARKER_NO_ANIMATIONS && !(gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000))) + if (gHitMarker & HITMARKER_NO_ANIMATIONS && !(gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_RECORDED_LINK))) { sprite->callback = SpriteCallbackDummy; } diff --git a/src/pokemon_animation.c b/src/pokemon_animation.c index 477cad135..2d1634ec8 100644 --- a/src/pokemon_animation.c +++ b/src/pokemon_animation.c @@ -6,6 +6,7 @@ #include "task.h" #include "trig.h" #include "util.h" +#include "data.h" #include "constants/battle_anim.h" #include "constants/rgb.h" diff --git a/src/pokemon_icon.c b/src/pokemon_icon.c index d3c75bb1b..534461733 100644 --- a/src/pokemon_icon.c +++ b/src/pokemon_icon.c @@ -147,7 +147,7 @@ const u8 *const gMonIconTable[] = [SPECIES_SEAKING] = gMonIcon_Seaking, [SPECIES_STARYU] = gMonIcon_Staryu, [SPECIES_STARMIE] = gMonIcon_Starmie, - [SPECIES_MR_MIME] = gMonIcon_Mrmime, + [SPECIES_MR_MIME] = gMonIcon_MrMime, [SPECIES_SCYTHER] = gMonIcon_Scyther, [SPECIES_JYNX] = gMonIcon_Jynx, [SPECIES_ELECTABUZZ] = gMonIcon_Electabuzz, @@ -464,7 +464,7 @@ const u8 *const gMonIconTable[] = [SPECIES_BRONZOR] = gMonIcon_Bronzor, [SPECIES_BRONZONG] = gMonIcon_Bronzong, [SPECIES_BONSLY] = gMonIcon_Bonsly, - [SPECIES_MIMEJR] = gMonIcon_Mimejr, + [SPECIES_MIME_JR] = gMonIcon_MimeJr, [SPECIES_HAPPINY] = gMonIcon_Happiny, [SPECIES_CHATOT] = gMonIcon_Chatot, [SPECIES_SPIRITOMB] = gMonIcon_Spiritomb, @@ -797,7 +797,7 @@ const u8 *const gMonIconTable[] = [SPECIES_SANDYGAST] = gMonIcon_Sandygast, [SPECIES_PALOSSAND] = gMonIcon_Palossand, [SPECIES_PYUKUMUKU] = gMonIcon_Pyukumuku, - [SPECIES_TYPE_NULL] = gMonIcon_Type_null, + [SPECIES_TYPE_NULL] = gMonIcon_TypeNull, [SPECIES_SILVALLY] = gMonIcon_Silvally, [SPECIES_MINIOR] = gMonIcon_Minior, [SPECIES_KOMALA] = gMonIcon_Komala, @@ -807,13 +807,13 @@ const u8 *const gMonIconTable[] = [SPECIES_BRUXISH] = gMonIcon_Bruxish, [SPECIES_DRAMPA] = gMonIcon_Drampa, [SPECIES_DHELMISE] = gMonIcon_Dhelmise, - [SPECIES_JANGMO_O] = gMonIcon_Jangmo_o, - [SPECIES_HAKAMO_O] = gMonIcon_Hakamo_o, - [SPECIES_KOMMO_O] = gMonIcon_Kommo_o, - [SPECIES_TAPU_KOKO] = gMonIcon_Tapu_koko, - [SPECIES_TAPU_LELE] = gMonIcon_Tapu_lele, - [SPECIES_TAPU_BULU] = gMonIcon_Tapu_bulu, - [SPECIES_TAPU_FINI] = gMonIcon_Tapu_fini, + [SPECIES_JANGMO_O] = gMonIcon_Jangmoo, + [SPECIES_HAKAMO_O] = gMonIcon_Hakamoo, + [SPECIES_KOMMO_O] = gMonIcon_Kommoo, + [SPECIES_TAPU_KOKO] = gMonIcon_TapuKoko, + [SPECIES_TAPU_LELE] = gMonIcon_TapuLele, + [SPECIES_TAPU_BULU] = gMonIcon_TapuBulu, + [SPECIES_TAPU_FINI] = gMonIcon_TapuFini, [SPECIES_COSMOG] = gMonIcon_Cosmog, [SPECIES_COSMOEM] = gMonIcon_Cosmoem, [SPECIES_SOLGALEO] = gMonIcon_Solgaleo, @@ -1168,7 +1168,7 @@ const u8 *const gMonIconTable[] = [SPECIES_ZYGARDE_COMPLETE] = gMonIcon_ZygardeComplete, [SPECIES_HOOPA_UNBOUND] = gMonIcon_HoopaUnbound, [SPECIES_ORICORIO_POM_POM] = gMonIcon_OricorioPomPom, - [SPECIES_ORICORIO_PA_U] = gMonIcon_OricorioPau, + [SPECIES_ORICORIO_PAU] = gMonIcon_OricorioPau, [SPECIES_ORICORIO_SENSU] = gMonIcon_OricorioSensu, [SPECIES_ROCKRUFF_OWN_TEMPO] = gMonIcon_Rockruff, [SPECIES_LYCANROC_MIDNIGHT] = gMonIcon_LycanrocMidnight, @@ -1680,7 +1680,7 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_BRONZOR] = 0, [SPECIES_BRONZONG] = 0, [SPECIES_BONSLY] = 1, - [SPECIES_MIMEJR] = 0, + [SPECIES_MIME_JR] = 0, [SPECIES_HAPPINY] = 0, [SPECIES_CHATOT] = 0, [SPECIES_SPIRITOMB] = 5, @@ -2355,7 +2355,7 @@ const u8 gMonIconPaletteIndices[] = [SPECIES_ZYGARDE_COMPLETE] = 1, [SPECIES_HOOPA_UNBOUND] = 0, [SPECIES_ORICORIO_POM_POM] = 1, - [SPECIES_ORICORIO_PA_U] = 1, + [SPECIES_ORICORIO_PAU] = 1, [SPECIES_ORICORIO_SENSU] = 0, [SPECIES_ROCKRUFF_OWN_TEMPO] = 2, [SPECIES_LYCANROC_MIDNIGHT] = 0, @@ -2604,7 +2604,7 @@ u16 GetUnownLetterByPersonality(u32 personality) if (!personality) return 0; else - return (((personality & 0x3000000) >> 18) | ((personality & 0x30000) >> 12) | ((personality & 0x300) >> 6) | (personality & 0x3)) % 0x1C; + return GET_UNOWN_LETTER(personality); } u16 sub_80D2E84(u16 species) diff --git a/src/pokemon_storage_system.c b/src/pokemon_storage_system.c index b619507a9..68fc391a4 100644 --- a/src/pokemon_storage_system.c +++ b/src/pokemon_storage_system.c @@ -8389,7 +8389,7 @@ static u8 sub_80D0894(void) static void sub_80D08CC(void) { - s32 i, j, r8, r9; + s32 i, j; s32 rowCount, columnCount; u8 boxId; u8 monArrayId; diff --git a/src/pokenav_conditions_3.c b/src/pokenav_conditions_3.c index d02d844d0..2a1dda1fa 100644 --- a/src/pokenav_conditions_3.c +++ b/src/pokenav_conditions_3.c @@ -419,7 +419,7 @@ static u32 LoopedTask_OpenConditionSearchResults(s32 state) switch (state) { case 0: - InitBgTemplates(sConditionSearchResultBgTemplates, NELEMS(sConditionSearchResultBgTemplates)); + InitBgTemplates(sConditionSearchResultBgTemplates, ARRAY_COUNT(sConditionSearchResultBgTemplates)); DecompressAndCopyTileDataToVram(1, sConditionSearchResultTiles, 0, 0, 0); SetBgTilemapBuffer(1, searchList->buff); CopyToBgTilemapBuffer(1, sConditionSearchResultTilemap, 0, 0); diff --git a/src/pokenav_main_menu.c b/src/pokenav_main_menu.c index 009cf783f..21bddf1cd 100644 --- a/src/pokenav_main_menu.c +++ b/src/pokenav_main_menu.c @@ -496,7 +496,7 @@ void PokenavCopyPalette(const u16 *src, const u16 *dest, int size, int a3, int a g1 = ((((GET_G(*dest) << 8) - (g << 8)) / a3) * a4) >> 8; b1 = ((((GET_B(*dest) << 8) - (b << 8)) / a3) * a4) >> 8; - r = (r + r1) & 0x1F; //_RGB(r + r1, g + g1, b + b1); doesn't match; I have to assign the value of ((r + r1) & 0x1F) to r1 + r = (r + r1) & 0x1F; //_RGB(r + r1, g + g1, b + b1); doesn't match; I have to assign the value of ((r + r1) & 0x1F) to r g = (g + g1) & 0x1F; //See above b = (b + b1) & 0x1F; //See above diff --git a/src/pokenav_menu_handler_2.c b/src/pokenav_menu_handler_2.c index 3fcd41dc9..eea8131a9 100644 --- a/src/pokenav_menu_handler_2.c +++ b/src/pokenav_menu_handler_2.c @@ -750,7 +750,7 @@ static void LoadPokenavOptionPalettes(void) { s32 i; - for (i = 0; i < NELEMS(sPokenavOptionsSpriteSheets); i++) + for (i = 0; i < ARRAY_COUNT(sPokenavOptionsSpriteSheets); i++) LoadCompressedSpriteSheet(&sPokenavOptionsSpriteSheets[i]); Pokenav_AllocAndLoadPalettes(sPokenavOptionsSpritePalettes); } diff --git a/src/pokenav_ribbons_1.c b/src/pokenav_ribbons_1.c index 9c171dd45..397e1e749 100644 --- a/src/pokenav_ribbons_1.c +++ b/src/pokenav_ribbons_1.c @@ -427,7 +427,7 @@ static u32 LoopedTask_OpenRibbonsMonList(s32 state) switch (state) { case 0: - InitBgTemplates(sMonRibbonListBgTemplates, NELEMS(sMonRibbonListBgTemplates)); + InitBgTemplates(sMonRibbonListBgTemplates, ARRAY_COUNT(sMonRibbonListBgTemplates)); DecompressAndCopyTileDataToVram(1, sMonRibbonListFrameTiles, 0, 0, 0); SetBgTilemapBuffer(1, monMenu->buff); CopyToBgTilemapBuffer(1, sMonRibbonListFrameTilemap, 0, 0); diff --git a/src/record_mixing.c b/src/record_mixing.c index 898459c0a..2028cc647 100644 --- a/src/record_mixing.c +++ b/src/record_mixing.c @@ -94,7 +94,6 @@ static void *sApprenticesSave; static void *sBattleTowerSave_Duplicate; static u32 sRecordStructSize; static u8 gUnknown_03001160; -static u32 filler_03001164; static struct PlayerHallRecords *gUnknown_03001168[3]; static EWRAM_DATA struct RecordMixingDayCareMail gUnknown_02039F9C = {0}; diff --git a/src/recorded_battle.c b/src/recorded_battle.c index 881c2d3ec..6fcbe04f1 100644 --- a/src/recorded_battle.c +++ b/src/recorded_battle.c @@ -55,7 +55,7 @@ struct RecordedBattleSave u16 opponentA; u16 opponentB; u16 partnerId; - u16 field_4FA; + u16 multiplayerId; u8 lvlMode; u8 frontierFacility; u8 frontierBrainSymbol; @@ -83,7 +83,7 @@ EWRAM_DATA static u8 sLvlMode = 0; EWRAM_DATA static u8 sFrontierFacility = 0; EWRAM_DATA static u8 sFrontierBrainSymbol = 0; EWRAM_DATA static MainCallback sCallback2_AfterRecordedBattle = NULL; -EWRAM_DATA u8 gUnknown_0203C7B4 = 0; +EWRAM_DATA u8 gRecordedBattleMultiplayerId = 0; EWRAM_DATA static u8 sUnknown_0203C7B5 = 0; EWRAM_DATA static u8 sBattleScene = 0; EWRAM_DATA static u8 sTextSpeed = 0; @@ -154,7 +154,7 @@ void sub_8184E58(void) u8 linkPlayersCount; u8 text[30]; - gUnknown_0203C7B4 = GetMultiplayerId(); + gRecordedBattleMultiplayerId = GetMultiplayerId(); linkPlayersCount = GetLinkPlayerCount(); for (i = 0; i < MAX_BATTLERS_COUNT; i++) @@ -362,11 +362,14 @@ bool32 MoveRecordedBattleToSaveData(void) if (sBattleFlags & BATTLE_TYPE_LINK) { - battleSave->battleFlags = (sBattleFlags & ~(BATTLE_TYPE_LINK | BATTLE_TYPE_20)) | BATTLE_TYPE_x2000000; + battleSave->battleFlags = (sBattleFlags & ~(BATTLE_TYPE_LINK | BATTLE_TYPE_LINK_IN_BATTLE)) | BATTLE_TYPE_RECORDED_LINK; + // BATTLE_TYPE_RECORDED_IS_MASTER set indicates battle will play + // out from player's perspective (i.e. player with back to camera) + // Otherwise player will appear on "opponent" side if (sBattleFlags & BATTLE_TYPE_IS_MASTER) { - battleSave->battleFlags |= BATTLE_TYPE_x80000000; + battleSave->battleFlags |= BATTLE_TYPE_RECORDED_IS_MASTER; } else if (sBattleFlags & BATTLE_TYPE_MULTI) { @@ -374,13 +377,13 @@ bool32 MoveRecordedBattleToSaveData(void) { case 0: case 2: - if (!(sPlayers[gUnknown_0203C7B4].battlerId & 1)) - battleSave->battleFlags |= BATTLE_TYPE_x80000000; + if (!(sPlayers[gRecordedBattleMultiplayerId].battlerId & 1)) + battleSave->battleFlags |= BATTLE_TYPE_RECORDED_IS_MASTER; break; case 1: case 3: - if ((sPlayers[gUnknown_0203C7B4].battlerId & 1)) - battleSave->battleFlags |= BATTLE_TYPE_x80000000; + if ((sPlayers[gRecordedBattleMultiplayerId].battlerId & 1)) + battleSave->battleFlags |= BATTLE_TYPE_RECORDED_IS_MASTER; break; } } @@ -393,7 +396,7 @@ bool32 MoveRecordedBattleToSaveData(void) battleSave->opponentA = gTrainerBattleOpponent_A; battleSave->opponentB = gTrainerBattleOpponent_B; battleSave->partnerId = gPartnerTrainerId; - battleSave->field_4FA = gUnknown_0203C7B4; + battleSave->multiplayerId = gRecordedBattleMultiplayerId; battleSave->lvlMode = gSaveBlock2Ptr->frontier.lvlMode; battleSave->frontierFacility = sFrontierFacility; battleSave->frontierBrainSymbol = sFrontierBrainSymbol; @@ -573,7 +576,7 @@ static void SetVariablesForRecordedBattle(struct RecordedBattleSave *src) gTrainerBattleOpponent_A = src->opponentA; gTrainerBattleOpponent_B = src->opponentB; gPartnerTrainerId = src->partnerId; - gUnknown_0203C7B4 = src->field_4FA; + gRecordedBattleMultiplayerId = src->multiplayerId; sLvlMode = gSaveBlock2Ptr->frontier.lvlMode; sFrontierFacility = src->frontierFacility; sFrontierBrainSymbol = src->frontierBrainSymbol; @@ -715,7 +718,7 @@ void RecordedBattle_CopyBattlerMoves(void) if (GetBattlerSide(gActiveBattler) == B_SIDE_OPPONENT) return; - if (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000)) + if (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_RECORDED_LINK)) return; if (sUnknown_0203C7AC == 2) return; @@ -732,7 +735,7 @@ void sub_818603C(u8 arg0) { s32 battlerId, j, k; - if (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000)) + if (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_RECORDED_LINK)) return; for (battlerId = 0; battlerId < gBattlersCount; battlerId++) diff --git a/src/region_map.c b/src/region_map.c index c2a5b4e9c..22b925a6f 100644 --- a/src/region_map.c +++ b/src/region_map.c @@ -1677,7 +1677,7 @@ void CB2_OpenFlyMap(void) break; case 1: ResetBgsAndClearDma3BusyFlags(0); - InitBgsFromTemplates(1, sFlyMapBgTemplates, 3); + InitBgsFromTemplates(1, sFlyMapBgTemplates, ARRAY_COUNT(sFlyMapBgTemplates)); gMain.state++; break; case 2: diff --git a/src/safari_zone.c b/src/safari_zone.c index e8827e124..3b86bc464 100644 --- a/src/safari_zone.c +++ b/src/safari_zone.c @@ -107,7 +107,7 @@ void CB2_EndSafariBattle(void) { ScriptContext2_RunNewScript(SafariZone_EventScript_OutOfBallsMidBattle); WarpIntoMap(); - gFieldCallback = sub_80AF6F0; + gFieldCallback = FieldCB_ReturnToFieldNoScriptCheckMusic; SetMainCallback2(CB2_LoadMap); } else if (gBattleOutcome == B_OUTCOME_CAUGHT) diff --git a/src/save_failed_screen.c b/src/save_failed_screen.c index 9bf0e7ed4..50ceeb74e 100644 --- a/src/save_failed_screen.c +++ b/src/save_failed_screen.c @@ -62,7 +62,7 @@ static const struct OamData sClockOamData = .affineParam = 0 }; -static const struct BgTemplate gUnknown_085EFD88[3] = +static const struct BgTemplate sBgTemplates[3] = { { .bg = 0, @@ -212,7 +212,7 @@ static void CB2_SaveFailedScreen(void) LZ77UnCompVram(gBirchGrassTilemap, (void *)(BG_SCREEN_ADDR(15))); LZ77UnCompVram(sSaveFailedClockGfx, (void *)(VRAM + 0x10020)); ResetBgsAndClearDma3BusyFlags(0); - InitBgsFromTemplates(0, gUnknown_085EFD88, 3); + InitBgsFromTemplates(0, sBgTemplates, ARRAY_COUNT(sBgTemplates)); SetBgTilemapBuffer(0, (void *)&gDecompressionBuffer[0x2000]); CpuFill32(0, &gDecompressionBuffer[0x2000], 0x800); LoadBgTiles(0, gTextWindowFrame1_Gfx, 0x120, 0x214); diff --git a/src/scrcmd.c b/src/scrcmd.c index ef0b3f86b..f36a44187 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -2235,7 +2235,9 @@ bool8 ScrCmd_gotoram(struct ScriptContext *ctx) return FALSE; } -bool8 ScrCmd_warpD1(struct ScriptContext *ctx) +// Unused +// For the warp used by the Aqua Hideout, see DoTeleportTileWarp +bool8 ScrCmd_warpspinenter(struct ScriptContext *ctx) { u8 mapGroup = ScriptReadByte(ctx); u8 mapNum = ScriptReadByte(ctx); @@ -2244,8 +2246,8 @@ bool8 ScrCmd_warpD1(struct ScriptContext *ctx) u16 y = VarGet(ScriptReadHalfword(ctx)); SetWarpDestination(mapGroup, mapNum, warpId, x, y); - sub_808D074(GetPlayerFacingDirection()); - sub_80B0244(); + SetSpinStartFacingDir(GetPlayerFacingDirection()); + DoSpinEnterWarp(); ResetInitialPlayerAvatarState(); return TRUE; } diff --git a/src/script.c b/src/script.c index 9ba1a7429..e6557aa75 100644 --- a/src/script.c +++ b/src/script.c @@ -11,9 +11,7 @@ extern const u8* gUnknown_020375C0; // ewram bss static u8 sScriptContext1Status; -static u32 sUnusedVariable1; static struct ScriptContext sScriptContext1; -static u32 sUnusedVariable2; static struct ScriptContext sScriptContext2; static bool8 sScriptContext2Enabled; diff --git a/src/script_pokemon_util.c b/src/script_pokemon_util.c index c9a2127ac..ad1a55230 100755 --- a/src/script_pokemon_util.c +++ b/src/script_pokemon_util.c @@ -66,7 +66,7 @@ u8 ScriptGiveMon(u16 species, u8 level, u16 item, u32 unused1, u32 unused2, u8 u u8 heldItem[2]; struct Pokemon mon; - CreateMon(&mon, species, level, 32, 0, 0, OT_ID_PLAYER_ID, 0); + CreateMon(&mon, species, level, USE_RANDOM_IVS, 0, 0, OT_ID_PLAYER_ID, 0); heldItem[0] = item; heldItem[1] = item >> 8; SetMonData(&mon, MON_DATA_HELD_ITEM, heldItem); @@ -139,7 +139,7 @@ void CreateScriptedWildMon(u16 species, u8 level, u16 item) u8 heldItem[2]; ZeroEnemyPartyMons(); - CreateMon(&gEnemyParty[0], species, level, 32, 0, 0, OT_ID_PLAYER_ID, 0); + CreateMon(&gEnemyParty[0], species, level, USE_RANDOM_IVS, 0, 0, OT_ID_PLAYER_ID, 0); if (item) { heldItem[0] = item; diff --git a/src/secret_base.c b/src/secret_base.c index 8e0929593..d49eef277 100644 --- a/src/secret_base.c +++ b/src/secret_base.c @@ -996,7 +996,7 @@ static void ShowRegistryMenuActions(u8 taskId) template.width = GetMaxWidthInMenuTable(sRegistryMenuActions, 2); data[7] = AddWindow(&template); SetStandardWindowBorderStyle(data[7], 0); - PrintMenuTable(data[7], 2, sRegistryMenuActions); + PrintMenuTable(data[7], ARRAY_COUNT(sRegistryMenuActions), sRegistryMenuActions); InitMenuInUpperLeftCornerPlaySoundWhenAPressed(data[7], 2, 0); ScheduleBgCopyTilemapToVram(0); gTasks[taskId].func = HandleRegistryMenuActionsInput; diff --git a/src/shop.c b/src/shop.c index 44ab0885c..a447982fc 100755 --- a/src/shop.c +++ b/src/shop.c @@ -489,7 +489,6 @@ static void BuyMenuFreeMemory(void) static void BuyMenuBuildListMenuTemplate(void) { u16 i; - u16 itemCount; gUnknown_02039F74 = Alloc((gMartInfo.itemCount + 1) * sizeof(*gUnknown_02039F74)); gUnknown_02039F78 = Alloc((gMartInfo.itemCount + 1) * sizeof(*gUnknown_02039F78)); diff --git a/src/start_menu.c b/src/start_menu.c index 35eb53475..bfced1858 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -138,7 +138,7 @@ static bool8 FieldCB_ReturnToFieldStartMenu(void); static const struct WindowTemplate sSafariBallsWindowTemplate = {0, 1, 1, 9, 4, 0xF, 8}; -static const u8* const sPyramindFloorNames[] = +static const u8* const sPyramidFloorNames[] = { gText_Floor1, gText_Floor2, @@ -383,7 +383,7 @@ static void ShowPyramidFloorWindow(void) PutWindowTilemap(sBattlePyramidFloorWindowId); DrawStdWindowFrame(sBattlePyramidFloorWindowId, FALSE); - StringCopy(gStringVar1, sPyramindFloorNames[gSaveBlock2Ptr->frontier.curChallengeBattleNum]); + StringCopy(gStringVar1, sPyramidFloorNames[gSaveBlock2Ptr->frontier.curChallengeBattleNum]); StringExpandPlaceholders(gStringVar4, gText_BattlePyramidFloor); AddTextPrinterParameterized(sBattlePyramidFloorWindowId, 1, gStringVar4, 0, 1, 0xFF, NULL); CopyWindowToVram(sBattlePyramidFloorWindowId, 2); diff --git a/src/starter_choose.c b/src/starter_choose.c index 771db961e..f7ffcfc2c 100644 --- a/src/starter_choose.c +++ b/src/starter_choose.c @@ -378,7 +378,6 @@ static void VblankCB_StarterChoose(void) void CB2_ChooseStarter(void) { - u16 savedIme; u8 taskId; u8 spriteId; diff --git a/src/task.c b/src/task.c index a97496009..3a3ddadfd 100644 --- a/src/task.c +++ b/src/task.c @@ -136,32 +136,20 @@ void TaskDummy(u8 taskId) { } -#define TASK_DATA_OP(taskId, offset, op) \ -{ \ - u32 tasksAddr = (u32)gTasks; \ - u32 addr = taskId * sizeof(struct Task) + offset; \ - u32 dataAddr = tasksAddr + offsetof(struct Task, data); \ - addr += dataAddr; \ - op; \ -} - void SetTaskFuncWithFollowupFunc(u8 taskId, TaskFunc func, TaskFunc followupFunc) { - TASK_DATA_OP(taskId, 28, *((u16 *)addr) = (u32)followupFunc) - TASK_DATA_OP(taskId, 30, *((u16 *)addr) = (u32)followupFunc >> 16) + u8 followupFuncIndex = NUM_TASK_DATA - 2; // Should be const. + + gTasks[taskId].data[followupFuncIndex] = (s16)((u32)followupFunc); + gTasks[taskId].data[followupFuncIndex + 1] = (s16)((u32)followupFunc >> 16); // Store followupFunc as two half-words in the data array. gTasks[taskId].func = func; } void SwitchTaskToFollowupFunc(u8 taskId) { - s32 func; + u8 followupFuncIndex = NUM_TASK_DATA - 2; // Should be const. - gTasks[taskId].func = NULL; - - TASK_DATA_OP(taskId, 28, func = *((u16 *)addr)) - TASK_DATA_OP(taskId, 30, func |= *((s16 *)addr) << 16) - - gTasks[taskId].func = (TaskFunc)func; + gTasks[taskId].func = (TaskFunc)((u16)(gTasks[taskId].data[followupFuncIndex]) | (gTasks[taskId].data[followupFuncIndex + 1] << 16)); } bool8 FuncIsActiveTask(TaskFunc func) @@ -183,7 +171,7 @@ u8 FindTaskIdByFunc(TaskFunc func) if (gTasks[i].isActive == TRUE && gTasks[i].func == func) return (u8)i; - return 0xFF; + return TAIL_SENTINEL; // No task was found. } u8 GetTaskCount(void) diff --git a/src/trade.c b/src/trade.c index 0013f912f..06ce47793 100644 --- a/src/trade.c +++ b/src/trade.c @@ -379,7 +379,7 @@ static void CB2_CreateTradeMenu(void) for (i = 0; i < PARTY_SIZE; i++) { - CreateMon(&gEnemyParty[i], SPECIES_NONE, 0, 32, FALSE, 0, OT_ID_PLAYER_ID, 0); + CreateMon(&gEnemyParty[i], SPECIES_NONE, 0, USE_RANDOM_IVS, FALSE, 0, OT_ID_PLAYER_ID, 0); } PrintTradeMessage(TRADE_MSG_STANDBY); @@ -4429,7 +4429,7 @@ static void _CreateInGameTradePokemon(u8 whichPlayerMon, u8 whichInGameTrade) u8 isMail; struct Pokemon *pokemon = &gEnemyParty[0]; - CreateMon(pokemon, inGameTrade->species, level, 32, TRUE, inGameTrade->personality, OT_ID_PRESET, inGameTrade->otId); + CreateMon(pokemon, inGameTrade->species, level, USE_RANDOM_IVS, TRUE, inGameTrade->personality, OT_ID_PRESET, inGameTrade->otId); SetMonData(pokemon, MON_DATA_HP_IV, &inGameTrade->ivs[0]); SetMonData(pokemon, MON_DATA_ATK_IV, &inGameTrade->ivs[1]); diff --git a/src/tv.c b/src/tv.c index 748915c7a..effd3e4b2 100644 --- a/src/tv.c +++ b/src/tv.c @@ -2085,7 +2085,6 @@ static void sub_80EDE98(TVShow *show) u16 k; u8 n; u8 deco; - u8 x; for (i = 0; i < DECOR_MAX_SECRET_BASE; i ++) { @@ -2307,7 +2306,7 @@ void TryPutLotteryWinnerReportOnAir(void) } } -void sub_80EE35C(u16 foeSpecies, u16 species, u8 moveIdx, const u16 *movePtr, u16 betterMove) +void TryPutBattleSeminarOnAir(u16 foeSpecies, u16 species, u8 moveIdx, const u16 *movePtr, u16 betterMove) { TVShow *show; u8 i; @@ -4095,7 +4094,6 @@ static void sub_80F0E58(PokeNews *dest[16], PokeNews *src[16]) static bool8 sub_80F0E84(PokeNews *dest, PokeNews *src, s8 slot) { u8 i; - u8 kind; if (src->kind == POKENEWS_NONE) { @@ -6602,7 +6600,6 @@ static void DoTVShowSpotTheCuties(void) { TVShow *show; u8 state; - u32 playerId; show = &gSaveBlock1Ptr->tvShows[gSpecialVar_0x8004]; gSpecialVar_Result = FALSE; @@ -6707,7 +6704,6 @@ static void DoTVShowPokemonNewsBattleFrontier(void) { TVShow *show; u8 state; - u32 playerId; show = &gSaveBlock1Ptr->tvShows[gSpecialVar_0x8004]; gSpecialVar_Result = FALSE; @@ -6856,7 +6852,6 @@ static void DoTVShowWhatsNo1InHoennToday(void) { TVShow *show; u8 state; - u32 playerId; show = &gSaveBlock1Ptr->tvShows[gSpecialVar_0x8004]; gSpecialVar_Result = FALSE; diff --git a/tools/aif2pcm/main.c b/tools/aif2pcm/main.c index cd5ac4a50..3dad6fcf8 100644 --- a/tools/aif2pcm/main.c +++ b/tools/aif2pcm/main.c @@ -351,6 +351,12 @@ const int gDeltaEncodingTable[] = { -64, -49, -36, -25, -16, -9, -4, -1, }; +#define POSITIVE_DELTAS_START 0 +#define POSITIVE_DELTAS_END 8 + +#define NEGATIVE_DELTAS_START 8 +#define NEGATIVE_DELTAS_END 16 + struct Bytes *delta_decompress(struct Bytes *delta, unsigned int expected_length) { struct Bytes *pcm = malloc(sizeof(struct Bytes)); @@ -418,15 +424,32 @@ struct Bytes *delta_decompress(struct Bytes *delta, unsigned int expected_length return pcm; } +#define U8_TO_S8(value) ((value) < 128 ? (value) : (value) - 256) +#define ABS(value) ((value) >= 0 ? (value) : -(value)) + int get_delta_index(uint8_t sample, uint8_t prev_sample) { int best_error = INT_MAX; int best_index = -1; + int delta_table_start_index; + int delta_table_end_index; + int sample_signed = U8_TO_S8(sample); + int prev_sample_signed = U8_TO_S8(prev_sample); - for (int i = 0; i < 16; i++) + // if we're going up (or equal), only choose positive deltas + if (prev_sample_signed <= sample_signed) { + delta_table_start_index = POSITIVE_DELTAS_START; + delta_table_end_index = POSITIVE_DELTAS_END; + } else { + delta_table_start_index = NEGATIVE_DELTAS_START; + delta_table_end_index = NEGATIVE_DELTAS_END; + } + + for (int i = delta_table_start_index; i < delta_table_end_index; i++) { uint8_t new_sample = prev_sample + gDeltaEncodingTable[i]; - int error = sample > new_sample ? sample - new_sample : new_sample - sample; + int new_sample_signed = U8_TO_S8(new_sample); + int error = ABS(new_sample_signed - sample_signed); if (error < best_error) {