summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/apprentice.c2
-rw-r--r--src/bard_music.c8
-rw-r--r--src/battle_setup.c12
-rw-r--r--src/berry.c27
-rw-r--r--src/bike.c5
-rw-r--r--src/data/bard_music/moves.h716
-rw-r--r--src/data/bard_music/pokemon.h828
-rw-r--r--src/data/bard_music/word_pitch.h216
-rwxr-xr-xsrc/data/object_events/movement_type_func_tables.h10
-rw-r--r--src/easy_chat.c6
-rw-r--r--src/event_object_lock.c99
-rw-r--r--src/event_object_movement.c168
-rw-r--r--src/field_camera.c2
-rw-r--r--src/field_player_avatar.c18
-rwxr-xr-xsrc/item_menu.c2
-rw-r--r--src/main.c2
-rw-r--r--src/match_call.c2
-rw-r--r--src/scrcmd.c110
-rw-r--r--src/script.c6
-rwxr-xr-xsrc/shop.c9
-rw-r--r--src/start_menu.c2
-rw-r--r--src/task.c26
-rw-r--r--src/trainer_see.c128
23 files changed, 1236 insertions, 1168 deletions
diff --git a/src/apprentice.c b/src/apprentice.c
index ad157f301..20c0cb9e3 100644
--- a/src/apprentice.c
+++ b/src/apprentice.c
@@ -923,7 +923,7 @@ static void Script_PrintApprenticeMessage(void)
{
ScriptContext2_Enable();
FreezeObjectEvents();
- sub_808B864();
+ PlayerFreeze();
sub_808BCF4();
DrawDialogueFrame(0, 1);
PrintApprenticeMessage();
diff --git a/src/bard_music.c b/src/bard_music.c
index 1a61c25ff..ad065249a 100644
--- a/src/bard_music.c
+++ b/src/bard_music.c
@@ -1,5 +1,3 @@
-
-// Includes
#include "global.h"
#include "bard_music.h"
#include "constants/easy_chat.h"
@@ -10,9 +8,9 @@
#include "data/bard_music/default_sound.h"
#include "data/bard_music/length_table.h"
-s16 CalcWordPitch(int arg0, int songPos)
+static s16 CalcWordPitch(int arg0, int songPos)
{
- return gBardSoundPitchTables[arg0][songPos];
+ return sBardSoundPitchTables[arg0][songPos];
}
const struct BardSound *GetWordSounds(u16 word)
@@ -21,7 +19,7 @@ const struct BardSound *GetWordSounds(u16 word)
u32 subword;
const struct BardSound (*ptr)[6];
- if (ECWord_CheckIfOutsideOfValidRange(word))
+ if (IsBardWordInvalid(word))
{
return gBardSound_InvalidWord;
}
diff --git a/src/battle_setup.c b/src/battle_setup.c
index 0a5e7e8b4..cb65d25d6 100644
--- a/src/battle_setup.c
+++ b/src/battle_setup.c
@@ -1197,7 +1197,7 @@ void ConfigureAndSetUpOneTrainerBattle(u8 trainerObjEventId, const u8 *trainerSc
gSelectedObjectEvent = trainerObjEventId;
gSpecialVar_LastTalked = gObjectEvents[trainerObjEventId].localId;
BattleSetup_ConfigureTrainerBattle(trainerScript + 1);
- ScriptContext1_SetupScript(EventScript_271354);
+ ScriptContext1_SetupScript(EventScript_StartTrainerApproach);
ScriptContext2_Enable();
}
@@ -1210,7 +1210,7 @@ void ConfigureTwoTrainersBattle(u8 trainerObjEventId, const u8 *trainerScript)
void SetUpTwoTrainersBattle(void)
{
- ScriptContext1_SetupScript(EventScript_271354);
+ ScriptContext1_SetupScript(EventScript_StartTrainerApproach);
ScriptContext2_Enable();
}
@@ -1220,10 +1220,12 @@ bool32 GetTrainerFlagFromScriptPointer(const u8 *data)
return FlagGet(TRAINER_FLAGS_START + flag);
}
-void SetUpTrainerMovement(void)
+// Set trainer's movement type so they stop and remain facing that direction
+// Note: Only for trainers who are spoken to directly
+// For trainers who spot the player this is handled by PlayerFaceApproachingTrainer
+void SetTrainerFacingDirection(void)
{
struct ObjectEvent *objectEvent = &gObjectEvents[gSelectedObjectEvent];
-
SetTrainerMovementType(objectEvent, GetTrainerFacingDirectionMovementType(objectEvent->facingDirection));
}
@@ -1437,7 +1439,7 @@ void ShowTrainerCantBattleSpeech(void)
ShowFieldMessage(GetTrainerCantBattleSpeech());
}
-void SetUpTrainerEncounterMusic(void)
+void PlayTrainerEncounterMusic(void)
{
u16 trainerId;
u16 music;
diff --git a/src/berry.c b/src/berry.c
index 98264f37b..022fdc934 100644
--- a/src/berry.c
+++ b/src/berry.c
@@ -1046,8 +1046,9 @@ void ClearBerryTrees(void)
static bool32 BerryTreeGrow(struct BerryTree *tree)
{
- if (tree->growthSparkle)
+ if (tree->stopGrowth)
return FALSE;
+
switch (tree->stage)
{
case BERRY_STAGE_NO_BERRY:
@@ -1082,7 +1083,7 @@ void BerryTreeTimeUpdate(s32 minutes)
{
tree = &gSaveBlock1Ptr->berryTrees[i];
- if (tree->berry && tree->stage && !tree->growthSparkle)
+ if (tree->berry && tree->stage && !tree->stopGrowth)
{
if (minutes >= GetStageDurationByBerryType(tree->berry) * 71)
{
@@ -1111,7 +1112,7 @@ void BerryTreeTimeUpdate(s32 minutes)
}
}
-void PlantBerryTree(u8 id, u8 berry, u8 stage, bool8 sparkle)
+void PlantBerryTree(u8 id, u8 berry, u8 stage, bool8 allowGrowth)
{
struct BerryTree *tree = GetBerryTreeInfo(id);
@@ -1125,8 +1126,10 @@ void PlantBerryTree(u8 id, u8 berry, u8 stage, bool8 sparkle)
tree->minutesUntilNextStage *= 4;
}
- if (!sparkle)
- tree->growthSparkle = TRUE;
+ // Stop growth, to keep tree at this stage until the player has seen it
+ // allowGrowth is always true for berry trees the player has planted
+ if (!allowGrowth)
+ tree->stopGrowth = TRUE;
}
void RemoveBerryTree(u8 id)
@@ -1175,9 +1178,9 @@ void GetBerryCountStringByBerryType(u8 berry, u8* dest, u32 berryCount)
GetBerryCountString(dest, GetBerryInfo(berry)->name, berryCount);
}
-void ResetBerryTreeSparkleFlag(u8 id)
+void AllowBerryTreeGrowth(u8 id)
{
- GetBerryTreeInfo(id)->growthSparkle = FALSE;
+ GetBerryTreeInfo(id)->stopGrowth = FALSE;
}
static u8 BerryTreeGetNumStagesWatered(struct BerryTree *tree)
@@ -1262,7 +1265,7 @@ void ObjectEventInteractionGetBerryTreeData(void)
id = GetObjectEventBerryTreeId(gSelectedObjectEvent);
berry = GetBerryTypeByBerryTreeId(id);
- ResetBerryTreeSparkleFlag(id);
+ AllowBerryTreeGrowth(id);
localId = gSpecialVar_LastTalked;
num = gSaveBlock1Ptr->location.mapNum;
group = gSaveBlock1Ptr->location.mapGroup;
@@ -1313,7 +1316,7 @@ void ObjectEventInteractionPickBerryTree(void)
void ObjectEventInteractionRemoveBerryTree(void)
{
RemoveBerryTree(GetObjectEventBerryTreeId(gSelectedObjectEvent));
- sub_8092EF0(gSpecialVar_LastTalked, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup);
+ SetBerryTreeJustPicked(gSpecialVar_LastTalked, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup);
}
bool8 PlayerHasBerries(void)
@@ -1321,7 +1324,9 @@ bool8 PlayerHasBerries(void)
return IsBagPocketNonEmpty(POCKET_BERRIES);
}
-void ResetBerryTreeSparkleFlags(void)
+// Berry tree growth is frozen at their initial stage (usually, fully grown) until the player has seen the tree
+// For all berry trees on screen, allow normal growth
+void SetBerryTreesSeen(void)
{
s16 cam_left;
s16 cam_top;
@@ -1343,7 +1348,7 @@ void ResetBerryTreeSparkleFlags(void)
cam_left = gObjectEvents[i].currentCoords.x;
cam_top = gObjectEvents[i].currentCoords.y;
if (left <= cam_left && cam_left <= right && top <= cam_top && cam_top <= bottom)
- ResetBerryTreeSparkleFlag(gObjectEvents[i].trainerRange_berryTreeId);
+ AllowBerryTreeGrowth(gObjectEvents[i].trainerRange_berryTreeId);
}
}
}
diff --git a/src/bike.c b/src/bike.c
index c4964b627..bbcda989c 100644
--- a/src/bike.c
+++ b/src/bike.c
@@ -963,9 +963,10 @@ bool8 IsBikingDisallowedByPlayer(void)
return TRUE;
}
-bool8 player_should_look_direction_be_enforced_upon_movement(void)
+bool8 IsPlayerNotUsingAcroBikeOnBumpySlope(void)
{
- if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_ACRO_BIKE) != FALSE && MetatileBehavior_IsBumpySlope(gObjectEvents[gPlayerAvatar.objectEventId].currentMetatileBehavior) != FALSE)
+ if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_ACRO_BIKE)
+ && MetatileBehavior_IsBumpySlope(gObjectEvents[gPlayerAvatar.objectEventId].currentMetatileBehavior))
return FALSE;
else
return TRUE;
diff --git a/src/data/bard_music/moves.h b/src/data/bard_music/moves.h
index 6bb350a7c..06cc68d53 100644
--- a/src/data/bard_music/moves.h
+++ b/src/data/bard_music/moves.h
@@ -1,12 +1,12 @@
#ifndef GUARD_DATA_BARD_MUSIC_MOVES_H
#define GUARD_DATA_BARD_MUSIC_MOVES_H
-#include "moves.h"
+#include "constants/moves.h"
-const u16 gUnknown_085FA1D4 = 0x163;
+const u16 gNumBardWords_Moves = MOVES_COUNT;
-const struct BardSound gBardSounds_Moves[][6] = {
- {
+const struct BardSound gBardSounds_Moves[MOVES_COUNT][6] = {
+ [MOVE_NONE] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
@@ -14,7 +14,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_POUND] = {
{ 0x21, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -22,7 +22,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_KARATE_CHOP] = {
{ 0x2c, 0x0, 0x0, 0x0, 0x0},
{ 0x1d, 0x0, 0x0, 0x0, 0x0},
{ 0xe, 0x0, 0x0, 0x0, 0x0},
@@ -30,7 +30,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_DOUBLE_SLAP] = {
{ 0x2a, 0x0, 0x0, 0x0, 0x0},
{ 0xa, 0x0, 0x0, 0x0, 0x0},
{ 0x2, 0x0, 0x0, 0x0, 0x0},
@@ -38,7 +38,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_COMET_PUNCH] = {
{ 0x1d, 0x0, 0x0, 0x0, 0x0},
{ 0xb, 0x0, 0x0, 0x0, 0x0},
{ 0x2c, 0x0, 0x0, 0x0, 0x0},
@@ -46,7 +46,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_MEGA_PUNCH] = {
{ 0x3, 0x0, 0x0, 0x0, 0x0},
{ 0x2a, 0x0, 0x0, 0x0, 0x0},
{ 0x2c, 0x0, 0x0, 0x0, 0x0},
@@ -54,7 +54,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_PAY_DAY] = {
{ 0x5, 0x0, 0x0, 0x0, 0x0},
{ 0x5, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -62,7 +62,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_FIRE_PUNCH] = {
{ 0x12, 0x0, 0x0, 0x0, 0x0},
{ 0x30, 0x0, 0x0, 0x0, 0x0},
{ 0x2a, 0x0, 0x0, 0x0, 0x0},
@@ -70,7 +70,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_ICE_PUNCH] = {
{ 0x2c, 0x0, 0x0, 0x0, 0x0},
{ 0x1d, 0x0, 0x0, 0x0, 0x0},
{ 0xe, 0x0, 0x0, 0x0, 0x0},
@@ -78,7 +78,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_THUNDER_PUNCH] = {
{ 0x2a, 0x0, 0x0, 0x0, 0x0},
{ 0x30, 0x0, 0x0, 0x0, 0x0},
{ 0x2c, 0x0, 0x0, 0x0, 0x0},
@@ -86,7 +86,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_SCRATCH] = {
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -94,7 +94,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_VICE_GRIP] = {
{ 0x14, 0x0, 0x0, 0x0, 0x0},
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -102,7 +102,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_GUILLOTINE] = {
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x2c, 0x0, 0x0, 0x0, 0x0},
{ 0xe, 0x0, 0x0, 0x0, 0x0},
@@ -110,7 +110,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_RAZOR_WIND] = {
{ 0x5, 0x0, 0x0, 0x0, 0x0},
{ 0x30, 0x0, 0x0, 0x0, 0x0},
{ 0xf, 0x0, 0x0, 0x0, 0x0},
@@ -118,7 +118,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_SWORDS_DANCE] = {
{ 0x1a, 0x0, 0x0, 0x0, 0x0},
{ 0x30, 0x0, 0x0, 0x0, 0x0},
{ 0x1, 0x0, 0x0, 0x0, 0x0},
@@ -126,7 +126,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_CUT] = {
{ 0x2a, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -134,7 +134,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_GUST] = {
{ 0x2c, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -142,7 +142,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_WING_ATTACK] = {
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x2a, 0x0, 0x0, 0x0, 0x0},
{ 0x0, 0x0, 0x0, 0x0, 0x0},
@@ -150,7 +150,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_WHIRLWIND] = {
{ 0x2c, 0x0, 0x0, 0x0, 0x0},
{ 0x1d, 0x0, 0x0, 0x0, 0x0},
{ 0xe, 0x0, 0x0, 0x0, 0x0},
@@ -158,7 +158,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_FLY] = {
{ 0x12, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -166,7 +166,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_BIND] = {
{ 0x14, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -174,7 +174,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_SLAM] = {
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -182,7 +182,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_VINE_WHIP] = {
{ 0x12, 0x0, 0x0, 0x0, 0x0},
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -190,7 +190,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_STOMP] = {
{ 0x1d, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -198,7 +198,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_DOUBLE_KICK] = {
{ 0x2a, 0x0, 0x0, 0x0, 0x0},
{ 0x2c, 0x0, 0x0, 0x0, 0x0},
{ 0x11, 0x0, 0x0, 0x0, 0x0},
@@ -206,7 +206,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_MEGA_KICK] = {
{ 0x3, 0x0, 0x0, 0x0, 0x0},
{ 0x2a, 0x0, 0x0, 0x0, 0x0},
{ 0x11, 0x0, 0x0, 0x0, 0x0},
@@ -214,7 +214,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_JUMP_KICK] = {
{ 0x2c, 0x0, 0x0, 0x0, 0x0},
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -222,7 +222,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_ROLLING_KICK] = {
{ 0x18, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x11, 0x0, 0x0, 0x0, 0x0},
@@ -230,7 +230,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_SAND_ATTACK] = {
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0x2a, 0x0, 0x0, 0x0, 0x0},
{ 0x0, 0x0, 0x0, 0x0, 0x0},
@@ -238,7 +238,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_HEADBUTT] = {
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0x2a, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -246,7 +246,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_HORN_ATTACK] = {
{ 0x18, 0x0, 0x0, 0x0, 0x0},
{ 0x2a, 0x0, 0x0, 0x0, 0x0},
{ 0x0, 0x0, 0x0, 0x0, 0x0},
@@ -254,7 +254,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_FURY_ATTACK] = {
{ 0x30, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x2a, 0x0, 0x0, 0x0, 0x0},
@@ -262,7 +262,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_HORN_DRILL] = {
{ 0x18, 0x0, 0x0, 0x0, 0x0},
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -270,7 +270,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_TACKLE] = {
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0x24, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -278,7 +278,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_BODY_SLAM] = {
{ 0x1d, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x2, 0x0, 0x0, 0x0, 0x0},
@@ -286,7 +286,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_WRAP] = {
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -294,7 +294,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_TAKE_DOWN] = {
{ 0x3, 0x0, 0x0, 0x0, 0x0},
{ 0x23, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -302,7 +302,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_THRASH] = {
{ 0x30, 0x0, 0x0, 0x0, 0x0},
{ 0x2, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -310,7 +310,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_DOUBLE_EDGE] = {
{ 0x2c, 0x0, 0x0, 0x0, 0x0},
{ 0x24, 0x0, 0x0, 0x0, 0x0},
{ 0xa, 0x0, 0x0, 0x0, 0x0},
@@ -318,7 +318,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_TAIL_WHIP] = {
{ 0x5, 0x0, 0x0, 0x0, 0x0},
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -326,7 +326,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_POISON_STING] = {
{ 0x1e, 0x0, 0x0, 0x0, 0x0},
{ 0x2c, 0x0, 0x0, 0x0, 0x0},
{ 0xe, 0x0, 0x0, 0x0, 0x0},
@@ -334,7 +334,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_TWINEEDLE] = {
{ 0xf, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x24, 0x0, 0x0, 0x0, 0x0},
@@ -342,7 +342,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_PIN_MISSILE] = {
{ 0xf, 0x0, 0x0, 0x0, 0x0},
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0x24, 0x0, 0x0, 0x0, 0x0},
@@ -350,7 +350,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_LEER] = {
{ 0xe, 0x0, 0x0, 0x0, 0x0},
{ 0x30, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -358,7 +358,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_BITE] = {
{ 0x12, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -366,7 +366,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_GROWL] = {
{ 0x21, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -374,7 +374,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_ROAR] = {
{ 0x1a, 0x0, 0x0, 0x0, 0x0},
{ 0x30, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -382,7 +382,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_SING] = {
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -390,7 +390,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_SUPERSONIC] = {
{ 0x27, 0x0, 0x0, 0x0, 0x0},
{ 0x30, 0x0, 0x0, 0x0, 0x0},
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
@@ -398,7 +398,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_SONIC_BOOM] = {
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0x27, 0x0, 0x0, 0x0, 0x0},
@@ -406,7 +406,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_DISABLE] = {
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0x3, 0x0, 0x0, 0x0, 0x0},
{ 0x24, 0x0, 0x0, 0x0, 0x0},
@@ -414,7 +414,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_ACID] = {
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -422,7 +422,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_EMBER] = {
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0x30, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -430,7 +430,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_FLAMETHROWER] = {
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0x1a, 0x0, 0x0, 0x0, 0x0},
{ 0x30, 0x0, 0x0, 0x0, 0x0},
@@ -438,7 +438,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_MIST] = {
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -446,7 +446,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_WATER_GUN] = {
{ 0x1d, 0x0, 0x0, 0x0, 0x0},
{ 0x32, 0x0, 0x0, 0x0, 0x0},
{ 0x2c, 0x0, 0x0, 0x0, 0x0},
@@ -454,7 +454,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_HYDRO_PUMP] = {
{ 0x12, 0x0, 0x0, 0x0, 0x0},
{ 0x18, 0x0, 0x0, 0x0, 0x0},
{ 0x2a, 0x0, 0x0, 0x0, 0x0},
@@ -462,7 +462,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_SURF] = {
{ 0x30, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -470,7 +470,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_ICE_BEAM] = {
{ 0x12, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -478,7 +478,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_BLIZZARD] = {
{ 0xf, 0x0, 0x0, 0x0, 0x0},
{ 0x32, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -486,7 +486,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_PSYBEAM] = {
{ 0x12, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -494,7 +494,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_BUBBLE_BEAM] = {
{ 0x2a, 0x0, 0x0, 0x0, 0x0},
{ 0x24, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
@@ -502,7 +502,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_AURORA_BEAM] = {
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
{ 0x1a, 0x0, 0x0, 0x0, 0x0},
{ 0x2c, 0x0, 0x0, 0x0, 0x0},
@@ -510,7 +510,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
{ 0x33, 0x0, 0x0, 0x0, 0x0},
NULL_BARD_SOUND
},
- {
+ [MOVE_HYPER_BEAM] = {
{ 0x12, 0x0, 0x0, 0x0, 0x0},
{ 0x30, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
@@ -518,7 +518,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_PECK] = {
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -526,7 +526,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_DRILL_PECK] = {
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0xb, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -534,7 +534,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_SUBMISSION] = {
{ 0x2a, 0x0, 0x0, 0x0, 0x0},
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0xb, 0x0, 0x0, 0x0, 0x0},
@@ -542,7 +542,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_LOW_KICK] = {
{ 0x18, 0x0, 0x0, 0x0, 0x0},
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -550,7 +550,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_COUNTER] = {
{ 0x21, 0x0, 0x0, 0x0, 0x0},
{ 0x30, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -558,7 +558,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_SEISMIC_TOSS] = {
{ 0x12, 0x0, 0x0, 0x0, 0x0},
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
@@ -566,7 +566,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_STRENGTH] = {
{ 0x32, 0x0, 0x0, 0x0, 0x0},
{ 0x3, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -574,7 +574,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_ABSORB] = {
{ 0x2a, 0x0, 0x0, 0x0, 0x0},
{ 0x1a, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -582,7 +582,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_MEGA_DRAIN] = {
{ 0x3, 0x0, 0x0, 0x0, 0x0},
{ 0x2c, 0x0, 0x0, 0x0, 0x0},
{ 0x3, 0x0, 0x0, 0x0, 0x0},
@@ -590,7 +590,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_LEECH_SEED] = {
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0xe, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -598,7 +598,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_GROWTH] = {
{ 0x30, 0x0, 0x0, 0x0, 0x0},
{ 0x18, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -606,7 +606,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_RAZOR_LEAF] = {
{ 0x5, 0x0, 0x0, 0x0, 0x0},
{ 0x30, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
@@ -614,7 +614,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_SOLAR_BEAM] = {
{ 0x18, 0x0, 0x0, 0x0, 0x0},
{ 0x30, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
@@ -622,7 +622,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_POISON_POWDER] = {
{ 0x1e, 0x0, 0x0, 0x0, 0x0},
{ 0x2c, 0x0, 0x0, 0x0, 0x0},
{ 0x21, 0x0, 0x0, 0x0, 0x0},
@@ -630,7 +630,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_STUN_SPORE] = {
{ 0x2c, 0x0, 0x0, 0x0, 0x0},
{ 0x1a, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -638,7 +638,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_SLEEP_POWDER] = {
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x21, 0x0, 0x0, 0x0, 0x0},
{ 0x30, 0x0, 0x0, 0x0, 0x0},
@@ -646,7 +646,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_PETAL_DANCE] = {
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0x2c, 0x0, 0x0, 0x0, 0x0},
{ 0x2, 0x0, 0x0, 0x0, 0x0},
@@ -654,7 +654,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_STRING_SHOT] = {
{ 0x32, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
@@ -662,7 +662,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_DRAGON_RAGE] = {
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
{ 0x5, 0x0, 0x0, 0x0, 0x0},
@@ -670,7 +670,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
{ 0x33, 0x0, 0x0, 0x0, 0x0},
NULL_BARD_SOUND
},
- {
+ [MOVE_FIRE_SPIN] = {
{ 0x12, 0x0, 0x0, 0x0, 0x0},
{ 0x30, 0x0, 0x0, 0x0, 0x0},
{ 0xf, 0x0, 0x0, 0x0, 0x0},
@@ -678,7 +678,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_THUNDER_SHOCK] = {
{ 0x2a, 0x0, 0x0, 0x0, 0x0},
{ 0x30, 0x0, 0x0, 0x0, 0x0},
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
@@ -686,7 +686,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_THUNDERBOLT] = {
{ 0x2a, 0x0, 0x0, 0x0, 0x0},
{ 0x30, 0x0, 0x0, 0x0, 0x0},
{ 0x1a, 0x0, 0x0, 0x0, 0x0},
@@ -694,7 +694,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_THUNDER_WAVE] = {
{ 0x2a, 0x0, 0x0, 0x0, 0x0},
{ 0x30, 0x0, 0x0, 0x0, 0x0},
{ 0x5, 0x0, 0x0, 0x0, 0x0},
@@ -702,7 +702,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_THUNDER] = {
{ 0x2a, 0x0, 0x0, 0x0, 0x0},
{ 0x30, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -710,7 +710,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_ROCK_THROW] = {
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
{ 0x18, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -718,7 +718,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_EARTHQUAKE] = {
{ 0x30, 0x0, 0x0, 0x0, 0x0},
{ 0x5, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -726,7 +726,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_FISSURE] = {
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0x32, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -734,7 +734,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_DIG] = {
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -742,7 +742,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_TOXIC] = {
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -750,7 +750,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_CONFUSION] = {
{ 0x2c, 0x0, 0x0, 0x0, 0x0},
{ 0x29, 0x0, 0x0, 0x0, 0x0},
{ 0x2c, 0x0, 0x0, 0x0, 0x0},
@@ -758,7 +758,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_PSYCHIC] = {
{ 0x12, 0x0, 0x0, 0x0, 0x0},
{ 0xf, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -766,7 +766,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_HYPNOSIS] = {
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0x18, 0x0, 0x0, 0x0, 0x0},
{ 0x11, 0x0, 0x0, 0x0, 0x0},
@@ -774,7 +774,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_MEDITATE] = {
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0x3, 0x0, 0x0, 0x0, 0x0},
@@ -782,7 +782,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_AGILITY] = {
{ 0x2a, 0x0, 0x0, 0x0, 0x0},
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0x11, 0x0, 0x0, 0x0, 0x0},
@@ -790,7 +790,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_QUICK_ATTACK] = {
{ 0x27, 0x0, 0x0, 0x0, 0x0},
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0x2a, 0x0, 0x0, 0x0, 0x0},
@@ -798,7 +798,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_RAGE] = {
{ 0x3, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -806,7 +806,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_TELEPORT] = {
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x1a, 0x0, 0x0, 0x0, 0x0},
@@ -814,7 +814,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_NIGHT_SHADE] = {
{ 0x12, 0x0, 0x0, 0x0, 0x0},
{ 0x5, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -822,7 +822,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_MIMIC] = {
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -830,7 +830,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_SCREECH] = {
{ 0x30, 0x0, 0x0, 0x0, 0x0},
{ 0xd, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -838,7 +838,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_DOUBLE_TEAM] = {
{ 0x2c, 0x0, 0x0, 0x0, 0x0},
{ 0x2c, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
@@ -846,7 +846,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_RECOVER] = {
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x2c, 0x0, 0x0, 0x0, 0x0},
{ 0x30, 0x0, 0x0, 0x0, 0x0},
@@ -854,7 +854,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_HARDEN] = {
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -862,7 +862,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_MINIMIZE] = {
{ 0xf, 0x0, 0x0, 0x0, 0x0},
{ 0xf, 0x0, 0x0, 0x0, 0x0},
{ 0x12, 0x0, 0x0, 0x0, 0x0},
@@ -870,7 +870,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_SMOKESCREEN] = {
{ 0x1a, 0x0, 0x0, 0x0, 0x0},
{ 0xe, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -878,7 +878,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_CONFUSE_RAY] = {
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
{ 0x2d, 0x0, 0x0, 0x0, 0x0},
{ 0x3, 0x0, 0x0, 0x0, 0x0},
@@ -886,7 +886,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_WITHDRAW] = {
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -894,7 +894,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_DEFENSE_CURL] = {
{ 0xe, 0x0, 0x0, 0x0, 0x0},
{ 0xb, 0x0, 0x0, 0x0, 0x0},
{ 0x32, 0x0, 0x0, 0x0, 0x0},
@@ -902,7 +902,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_BARRIER] = {
{ 0x5, 0x0, 0x0, 0x0, 0x0},
{ 0xe, 0x0, 0x0, 0x0, 0x0},
{ 0x30, 0x0, 0x0, 0x0, 0x0},
@@ -910,7 +910,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_LIGHT_SCREEN] = {
{ 0x12, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -918,7 +918,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_HAZE] = {
{ 0x3, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -926,7 +926,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_REFLECT] = {
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -934,7 +934,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_FOCUS_ENERGY] = {
{ 0x1a, 0x0, 0x0, 0x0, 0x0},
{ 0x2c, 0x0, 0x0, 0x0, 0x0},
{ 0xb, 0x0, 0x0, 0x0, 0x0},
@@ -942,7 +942,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
{ 0xc, 0x0, 0x0, 0x0, 0x0},
NULL_BARD_SOUND
},
- {
+ [MOVE_BIDE] = {
{ 0xb, 0x0, 0x0, 0x0, 0x0},
{ 0x32, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -950,7 +950,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_METRONOME] = {
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0x18, 0x0, 0x0, 0x0, 0x0},
{ 0x18, 0x0, 0x0, 0x0, 0x0},
@@ -958,7 +958,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_MIRROR_MOVE] = {
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x32, 0x0, 0x0, 0x0, 0x0},
{ 0x29, 0x0, 0x0, 0x0, 0x0},
@@ -966,7 +966,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_SELF_DESTRUCT] = {
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x2a, 0x0, 0x0, 0x0, 0x0},
@@ -974,7 +974,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_EGG_BOMB] = {
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -982,7 +982,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_LICK] = {
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -990,7 +990,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_SMOG] = {
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -998,7 +998,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_SLUDGE] = {
{ 0x2c, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1006,7 +1006,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_BONE_CLUB] = {
{ 0x18, 0x0, 0x0, 0x0, 0x0},
{ 0x2c, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1014,7 +1014,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_FIRE_BLAST] = {
{ 0x12, 0x0, 0x0, 0x0, 0x0},
{ 0x30, 0x0, 0x0, 0x0, 0x0},
{ 0x0, 0x0, 0x0, 0x0, 0x0},
@@ -1022,7 +1022,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_WATERFALL] = {
{ 0x1d, 0x0, 0x0, 0x0, 0x0},
{ 0x30, 0x0, 0x0, 0x0, 0x0},
{ 0x1d, 0x0, 0x0, 0x0, 0x0},
@@ -1030,7 +1030,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_CLAMP] = {
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1038,7 +1038,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_SWIFT] = {
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1046,7 +1046,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_SKULL_BASH] = {
{ 0x2a, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
{ 0x0, 0x0, 0x0, 0x0, 0x0},
@@ -1054,7 +1054,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_SPIKE_CANNON] = {
{ 0x14, 0x0, 0x0, 0x0, 0x0},
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0x1d, 0x0, 0x0, 0x0, 0x0},
@@ -1062,7 +1062,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_CONSTRICT] = {
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1070,7 +1070,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_AMNESIA] = {
{ 0x2, 0x0, 0x0, 0x0, 0x0},
{ 0xe, 0x0, 0x0, 0x0, 0x0},
{ 0x2c, 0x0, 0x0, 0x0, 0x0},
@@ -1078,7 +1078,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_KINESIS] = {
{ 0xf, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x11, 0x0, 0x0, 0x0, 0x0},
@@ -1086,7 +1086,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_SOFT_BOILED] = {
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
{ 0x1e, 0x0, 0x0, 0x0, 0x0},
{ 0xb, 0x0, 0x0, 0x0, 0x0},
@@ -1094,7 +1094,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_HI_JUMP_KICK] = {
{ 0x12, 0x0, 0x0, 0x0, 0x0},
{ 0x2c, 0x0, 0x0, 0x0, 0x0},
{ 0x11, 0x0, 0x0, 0x0, 0x0},
@@ -1102,7 +1102,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_GLARE] = {
{ 0x5, 0x0, 0x0, 0x0, 0x0},
{ 0x30, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1110,7 +1110,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_DREAM_EATER] = {
{ 0xe, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x30, 0x0, 0x0, 0x0, 0x0},
@@ -1118,7 +1118,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_POISON_GAS] = {
{ 0x1e, 0x0, 0x0, 0x0, 0x0},
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
{ 0x0, 0x0, 0x0, 0x0, 0x0},
@@ -1126,7 +1126,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_BARRAGE] = {
{ 0x30, 0x0, 0x0, 0x0, 0x0},
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1134,7 +1134,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_LEECH_LIFE] = {
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x12, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1142,7 +1142,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_LOVELY_KISS] = {
{ 0x2c, 0x0, 0x0, 0x0, 0x0},
{ 0x2c, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
@@ -1150,7 +1150,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
{ 0x33, 0x0, 0x0, 0x0, 0x0},
NULL_BARD_SOUND
},
- {
+ [MOVE_SKY_ATTACK] = {
{ 0x12, 0x0, 0x0, 0x0, 0x0},
{ 0x2a, 0x0, 0x0, 0x0, 0x0},
{ 0x0, 0x0, 0x0, 0x0, 0x0},
@@ -1158,7 +1158,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_TRANSFORM] = {
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0x1a, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1166,7 +1166,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_BUBBLE] = {
{ 0x2c, 0x0, 0x0, 0x0, 0x0},
{ 0x24, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1174,7 +1174,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_DIZZY_PUNCH] = {
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0xe, 0x0, 0x0, 0x0, 0x0},
{ 0x2c, 0x0, 0x0, 0x0, 0x0},
@@ -1182,7 +1182,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_SPORE] = {
{ 0x1a, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1190,7 +1190,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_FLASH] = {
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1198,7 +1198,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_PSYWAVE] = {
{ 0x12, 0x0, 0x0, 0x0, 0x0},
{ 0x3, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1206,7 +1206,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_SPLASH] = {
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1214,7 +1214,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_ACID_ARMOR] = {
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
@@ -1222,7 +1222,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_CRABHAMMER] = {
{ 0x2, 0x0, 0x0, 0x0, 0x0},
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0x30, 0x0, 0x0, 0x0, 0x0},
@@ -1230,7 +1230,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_EXPLOSION] = {
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0x18, 0x0, 0x0, 0x0, 0x0},
{ 0x2c, 0x0, 0x0, 0x0, 0x0},
@@ -1238,7 +1238,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
{ 0x33, 0x0, 0x0, 0x0, 0x0},
NULL_BARD_SOUND
},
- {
+ [MOVE_FURY_SWIPES] = {
{ 0x30, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x12, 0x0, 0x0, 0x0, 0x0},
@@ -1246,7 +1246,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_BONEMERANG] = {
{ 0x18, 0x0, 0x0, 0x0, 0x0},
{ 0x30, 0x0, 0x0, 0x0, 0x0},
{ 0x0, 0x0, 0x0, 0x0, 0x0},
@@ -1254,7 +1254,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_REST] = {
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1262,7 +1262,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_ROCK_SLIDE] = {
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
{ 0x12, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1270,7 +1270,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_HYPER_FANG] = {
{ 0x12, 0x0, 0x0, 0x0, 0x0},
{ 0x30, 0x0, 0x0, 0x0, 0x0},
{ 0x0, 0x0, 0x0, 0x0, 0x0},
@@ -1278,7 +1278,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_SHARPEN] = {
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1286,7 +1286,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_CONVERSION] = {
{ 0x2a, 0x0, 0x0, 0x0, 0x0},
{ 0x30, 0x0, 0x0, 0x0, 0x0},
{ 0x2c, 0x0, 0x0, 0x0, 0x0},
@@ -1294,7 +1294,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_TRI_ATTACK] = {
{ 0x12, 0x0, 0x0, 0x0, 0x0},
{ 0x2a, 0x0, 0x0, 0x0, 0x0},
{ 0x0, 0x0, 0x0, 0x0, 0x0},
@@ -1302,7 +1302,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_SUPER_FANG] = {
{ 0x27, 0x0, 0x0, 0x0, 0x0},
{ 0x30, 0x0, 0x0, 0x0, 0x0},
{ 0x1, 0x0, 0x0, 0x0, 0x0},
@@ -1310,7 +1310,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_SLASH] = {
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1318,7 +1318,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_SUBSTITUTE] = {
{ 0x2a, 0x0, 0x0, 0x0, 0x0},
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0x27, 0x0, 0x0, 0x0, 0x0},
@@ -1326,7 +1326,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_STRUGGLE] = {
{ 0x2a, 0x0, 0x0, 0x0, 0x0},
{ 0x24, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1334,7 +1334,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_SKETCH] = {
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1342,7 +1342,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_TRIPLE_KICK] = {
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0x24, 0x0, 0x0, 0x0, 0x0},
{ 0x11, 0x0, 0x0, 0x0, 0x0},
@@ -1350,7 +1350,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_THIEF] = {
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1358,7 +1358,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_SPIDER_WEB] = {
{ 0x12, 0x0, 0x0, 0x0, 0x0},
{ 0x30, 0x0, 0x0, 0x0, 0x0},
{ 0x9, 0x0, 0x0, 0x0, 0x0},
@@ -1366,7 +1366,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_MIND_READER] = {
{ 0x12, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x30, 0x0, 0x0, 0x0, 0x0},
@@ -1374,7 +1374,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_NIGHTMARE] = {
{ 0x12, 0x0, 0x0, 0x0, 0x0},
{ 0x5, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1382,7 +1382,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_FLAME_WHEEL] = {
{ 0x3, 0x0, 0x0, 0x0, 0x0},
{ 0xe, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1390,7 +1390,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_SNORE] = {
{ 0x18, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1398,7 +1398,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_CURSE] = {
{ 0x30, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1406,7 +1406,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_FLAIL] = {
{ 0x5, 0x0, 0x0, 0x0, 0x0},
{ 0x2a, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1414,7 +1414,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_CONVERSION_2] = {
{ 0x2a, 0x0, 0x0, 0x0, 0x0},
{ 0x30, 0x0, 0x0, 0x0, 0x0},
{ 0x2c, 0x0, 0x0, 0x0, 0x0},
@@ -1422,7 +1422,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
{ 0x33, 0x0, 0x0, 0x0, 0x0},
NULL_BARD_SOUND
},
- {
+ [MOVE_AEROBLAST] = {
{ 0x5, 0x0, 0x0, 0x0, 0x0},
{ 0x18, 0x0, 0x0, 0x0, 0x0},
{ 0x0, 0x0, 0x0, 0x0, 0x0},
@@ -1430,7 +1430,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_COTTON_SPORE] = {
{ 0x1d, 0x0, 0x0, 0x0, 0x0},
{ 0x1d, 0x0, 0x0, 0x0, 0x0},
{ 0x1a, 0x0, 0x0, 0x0, 0x0},
@@ -1438,7 +1438,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_REVERSAL] = {
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x30, 0x0, 0x0, 0x0, 0x0},
{ 0x24, 0x0, 0x0, 0x0, 0x0},
@@ -1446,7 +1446,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_SPITE] = {
{ 0x12, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1454,7 +1454,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_POWDER_SNOW] = {
{ 0x21, 0x0, 0x0, 0x0, 0x0},
{ 0x30, 0x0, 0x0, 0x0, 0x0},
{ 0x18, 0x0, 0x0, 0x0, 0x0},
@@ -1462,7 +1462,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_PROTECT] = {
{ 0x18, 0x0, 0x0, 0x0, 0x0},
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1470,7 +1470,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_MACH_PUNCH] = {
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
{ 0x2c, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1478,7 +1478,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_SCARY_FACE] = {
{ 0x3, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x3, 0x0, 0x0, 0x0, 0x0},
@@ -1486,7 +1486,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_FAINT_ATTACK] = {
{ 0x3, 0x0, 0x0, 0x0, 0x0},
{ 0x2a, 0x0, 0x0, 0x0, 0x0},
{ 0x0, 0x0, 0x0, 0x0, 0x0},
@@ -1494,7 +1494,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_SWEET_KISS] = {
{ 0xe, 0x0, 0x0, 0x0, 0x0},
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1502,7 +1502,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_BELLY_DRUM] = {
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x2a, 0x0, 0x0, 0x0, 0x0},
@@ -1510,7 +1510,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_SLUDGE_BOMB] = {
{ 0x2b, 0x0, 0x0, 0x0, 0x0},
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1518,7 +1518,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_MUD_SLAP] = {
{ 0x2c, 0x0, 0x0, 0x0, 0x0},
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1526,7 +1526,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_OCTAZOOKA] = {
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
{ 0x2c, 0x0, 0x0, 0x0, 0x0},
{ 0x28, 0x0, 0x0, 0x0, 0x0},
@@ -1534,7 +1534,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_SPIKES] = {
{ 0x12, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1542,7 +1542,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_ZAP_CANNON] = {
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0x1, 0x0, 0x0, 0x0, 0x0},
{ 0x2c, 0x0, 0x0, 0x0, 0x0},
@@ -1550,7 +1550,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_FORESIGHT] = {
{ 0x1a, 0x0, 0x0, 0x0, 0x0},
{ 0x14, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1558,7 +1558,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_DESTINY_BOND] = {
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0xf, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
@@ -1566,7 +1566,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_PERISH_SONG] = {
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
@@ -1574,7 +1574,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_ICY_WIND] = {
{ 0x12, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0xf, 0x0, 0x0, 0x0, 0x0},
@@ -1582,7 +1582,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_DETECT] = {
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1590,7 +1590,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_BONE_RUSH] = {
{ 0x18, 0x0, 0x0, 0x0, 0x0},
{ 0x2c, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1598,7 +1598,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_LOCK_ON] = {
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
{ 0x1d, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1606,7 +1606,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_OUTRAGE] = {
{ 0x21, 0x0, 0x0, 0x0, 0x0},
{ 0x3, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1614,7 +1614,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_SANDSTORM] = {
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0x1a, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1622,7 +1622,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_GIGA_DRAIN] = {
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0x2a, 0x0, 0x0, 0x0, 0x0},
{ 0x3, 0x0, 0x0, 0x0, 0x0},
@@ -1630,7 +1630,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_ENDURE] = {
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0x30, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1638,7 +1638,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_CHARM] = {
{ 0x15, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1646,7 +1646,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_ROLLOUT] = {
{ 0x1a, 0x0, 0x0, 0x0, 0x0},
{ 0x21, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1654,7 +1654,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_FALSE_SWIPE] = {
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
{ 0x12, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1662,7 +1662,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_SWAGGER] = {
{ 0x2, 0x0, 0x0, 0x0, 0x0},
{ 0x30, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1670,7 +1670,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_MILK_DRINK] = {
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0xe, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1678,7 +1678,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_SPARK] = {
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1686,7 +1686,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_FURY_CUTTER] = {
{ 0x30, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x2a, 0x0, 0x0, 0x0, 0x0},
@@ -1694,7 +1694,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_STEEL_WING] = {
{ 0xe, 0x0, 0x0, 0x0, 0x0},
{ 0xd, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1702,7 +1702,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_MEAN_LOOK] = {
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x24, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1710,7 +1710,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_ATTRACT] = {
{ 0x2a, 0x0, 0x0, 0x0, 0x0},
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1718,7 +1718,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_SLEEP_TALK] = {
{ 0xe, 0x0, 0x0, 0x0, 0x0},
{ 0x1d, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1726,7 +1726,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_HEAL_BELL] = {
{ 0xe, 0x0, 0x0, 0x0, 0x0},
{ 0xa, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1734,7 +1734,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_RETURN] = {
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x30, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1742,7 +1742,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_PRESENT] = {
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1750,7 +1750,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_FRUSTRATION] = {
{ 0x2c, 0x0, 0x0, 0x0, 0x0},
{ 0x3, 0x0, 0x0, 0x0, 0x0},
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
@@ -1758,7 +1758,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_SAFEGUARD] = {
{ 0x3, 0x0, 0x0, 0x0, 0x0},
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1766,7 +1766,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_PAIN_SPLIT] = {
{ 0x3, 0x0, 0x0, 0x0, 0x0},
{ 0xf, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1774,7 +1774,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_SACRED_FIRE] = {
{ 0x3, 0x0, 0x0, 0x0, 0x0},
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0x12, 0x0, 0x0, 0x0, 0x0},
@@ -1782,7 +1782,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
{ 0x33, 0x0, 0x0, 0x0, 0x0},
NULL_BARD_SOUND
},
- {
+ [MOVE_MAGNITUDE] = {
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0xf, 0x0, 0x0, 0x0, 0x0},
{ 0x27, 0x0, 0x0, 0x0, 0x0},
@@ -1790,7 +1790,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_DYNAMIC_PUNCH] = {
{ 0x12, 0x0, 0x0, 0x0, 0x0},
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0x11, 0x0, 0x0, 0x0, 0x0},
@@ -1798,7 +1798,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_MEGAHORN] = {
{ 0x3, 0x0, 0x0, 0x0, 0x0},
{ 0x2a, 0x0, 0x0, 0x0, 0x0},
{ 0x1a, 0x0, 0x0, 0x0, 0x0},
@@ -1806,7 +1806,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_DRAGON_BREATH] = {
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
{ 0xb, 0x0, 0x0, 0x0, 0x0},
@@ -1814,7 +1814,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
{ 0x33, 0x0, 0x0, 0x0, 0x0},
NULL_BARD_SOUND
},
- {
+ [MOVE_BATON_PASS] = {
{ 0x2a, 0x0, 0x0, 0x0, 0x0},
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
{ 0x0, 0x0, 0x0, 0x0, 0x0},
@@ -1822,7 +1822,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_ENCORE] = {
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
{ 0x18, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1830,7 +1830,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_PURSUIT] = {
{ 0x30, 0x0, 0x0, 0x0, 0x0},
{ 0x27, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1838,7 +1838,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_RAPID_SPIN] = {
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0xf, 0x0, 0x0, 0x0, 0x0},
{ 0xf, 0x0, 0x0, 0x0, 0x0},
@@ -1846,7 +1846,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_SWEET_SCENT] = {
{ 0xe, 0x0, 0x0, 0x0, 0x0},
{ 0xb, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1854,7 +1854,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_IRON_TAIL] = {
{ 0x12, 0x0, 0x0, 0x0, 0x0},
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
{ 0x5, 0x0, 0x0, 0x0, 0x0},
@@ -1862,7 +1862,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_METAL_CLAW] = {
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0x24, 0x0, 0x0, 0x0, 0x0},
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
@@ -1870,7 +1870,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_VITAL_THROW] = {
{ 0x12, 0x0, 0x0, 0x0, 0x0},
{ 0x24, 0x0, 0x0, 0x0, 0x0},
{ 0x18, 0x0, 0x0, 0x0, 0x0},
@@ -1878,7 +1878,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_MORNING_SUN] = {
{ 0x1a, 0x0, 0x0, 0x0, 0x0},
{ 0xe, 0x0, 0x0, 0x0, 0x0},
{ 0x2c, 0x0, 0x0, 0x0, 0x0},
@@ -1886,7 +1886,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_SYNTHESIS] = {
{ 0xf, 0x0, 0x0, 0x0, 0x0},
{ 0x2a, 0x0, 0x0, 0x0, 0x0},
{ 0xf, 0x0, 0x0, 0x0, 0x0},
@@ -1894,7 +1894,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_MOONLIGHT] = {
{ 0x27, 0x0, 0x0, 0x0, 0x0},
{ 0x12, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1902,7 +1902,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_HIDDEN_POWER] = {
{ 0xf, 0x0, 0x0, 0x0, 0x0},
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0x21, 0x0, 0x0, 0x0, 0x0},
@@ -1910,7 +1910,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_CROSS_CHOP] = {
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
{ 0x1d, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1918,7 +1918,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_TWISTER] = {
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0x30, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1926,7 +1926,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_RAIN_DANCE] = {
{ 0x3, 0x0, 0x0, 0x0, 0x0},
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1934,7 +1934,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_SUNNY_DAY] = {
{ 0x2a, 0x0, 0x0, 0x0, 0x0},
{ 0xe, 0x0, 0x0, 0x0, 0x0},
{ 0x5, 0x0, 0x0, 0x0, 0x0},
@@ -1942,7 +1942,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_CRUNCH] = {
{ 0x30, 0x0, 0x0, 0x0, 0x0},
{ 0x2a, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1950,7 +1950,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_MIRROR_COAT] = {
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0x30, 0x0, 0x0, 0x0, 0x0},
{ 0x18, 0x0, 0x0, 0x0, 0x0},
@@ -1958,7 +1958,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_PSYCH_UP] = {
{ 0x12, 0x0, 0x0, 0x0, 0x0},
{ 0x2a, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1966,7 +1966,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_EXTREME_SPEED] = {
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
@@ -1974,7 +1974,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_ANCIENT_POWER] = {
{ 0x3, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x21, 0x0, 0x0, 0x0, 0x0},
@@ -1982,7 +1982,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
{ 0x33, 0x0, 0x0, 0x0, 0x0},
NULL_BARD_SOUND
},
- {
+ [MOVE_SHADOW_BALL] = {
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0x18, 0x0, 0x0, 0x0, 0x0},
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
@@ -1990,7 +1990,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_FUTURE_SIGHT] = {
{ 0x27, 0x0, 0x0, 0x0, 0x0},
{ 0x30, 0x0, 0x0, 0x0, 0x0},
{ 0x12, 0x0, 0x0, 0x0, 0x0},
@@ -1998,7 +1998,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_ROCK_SMASH] = {
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2006,7 +2006,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_WHIRLPOOL] = {
{ 0x30, 0x0, 0x0, 0x0, 0x0},
{ 0x27, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2014,7 +2014,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_BEAT_UP] = {
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x2c, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2022,7 +2022,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_FAKE_OUT] = {
{ 0x3, 0x0, 0x0, 0x0, 0x0},
{ 0x21, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2030,7 +2030,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_UPROAR] = {
{ 0x2c, 0x0, 0x0, 0x0, 0x0},
{ 0x1a, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2038,7 +2038,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_STOCKPILE] = {
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
{ 0x14, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2046,7 +2046,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_SPIT_UP] = {
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0x2a, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2054,7 +2054,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_SWALLOW] = {
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
{ 0x18, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2062,7 +2062,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_HEAT_WAVE] = {
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x3, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2070,7 +2070,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_HAIL] = {
{ 0x5, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2078,7 +2078,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_TORMENT] = {
{ 0x18, 0x0, 0x0, 0x0, 0x0},
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2086,7 +2086,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_FLATTER] = {
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0x30, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2094,7 +2094,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_WILL_O_WISP] = {
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0x18, 0x0, 0x0, 0x0, 0x0},
{ 0x11, 0x0, 0x0, 0x0, 0x0},
@@ -2102,7 +2102,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_MEMENTO] = {
{ 0x2a, 0x0, 0x0, 0x0, 0x0},
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0x18, 0x0, 0x0, 0x0, 0x0},
@@ -2110,7 +2110,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_FACADE] = {
{ 0x2c, 0x0, 0x0, 0x0, 0x0},
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2118,7 +2118,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_FOCUS_PUNCH] = {
{ 0x18, 0x0, 0x0, 0x0, 0x0},
{ 0x2c, 0x0, 0x0, 0x0, 0x0},
{ 0x2c, 0x0, 0x0, 0x0, 0x0},
@@ -2126,7 +2126,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_SMELLING_SALT] = {
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
@@ -2134,7 +2134,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_FOLLOW_ME] = {
{ 0x15, 0x0, 0x0, 0x0, 0x0},
{ 0x18, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
@@ -2142,7 +2142,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_NATURE_POWER] = {
{ 0x3, 0x0, 0x0, 0x0, 0x0},
{ 0x30, 0x0, 0x0, 0x0, 0x0},
{ 0x21, 0x0, 0x0, 0x0, 0x0},
@@ -2150,7 +2150,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_CHARGE] = {
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2158,7 +2158,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_TAUNT] = {
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2166,7 +2166,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_HELPING_HAND] = {
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x0, 0x0, 0x0, 0x0, 0x0},
@@ -2174,7 +2174,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_TRICK] = {
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2182,7 +2182,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_ROLE_PLAY] = {
{ 0x18, 0x0, 0x0, 0x0, 0x0},
{ 0x3, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2190,7 +2190,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_WISH] = {
{ 0xf, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2198,7 +2198,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_ASSIST] = {
{ 0x2a, 0x0, 0x0, 0x0, 0x0},
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2206,7 +2206,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_INGRAIN] = {
{ 0xf, 0x0, 0x0, 0x0, 0x0},
{ 0x3, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2214,7 +2214,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_SUPERPOWER] = {
{ 0x27, 0x0, 0x0, 0x0, 0x0},
{ 0x30, 0x0, 0x0, 0x0, 0x0},
{ 0x21, 0x0, 0x0, 0x0, 0x0},
@@ -2222,7 +2222,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_MAGIC_COAT] = {
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0x18, 0x0, 0x0, 0x0, 0x0},
@@ -2230,7 +2230,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_RECYCLE] = {
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x12, 0x0, 0x0, 0x0, 0x0},
{ 0x24, 0x0, 0x0, 0x0, 0x0},
@@ -2238,7 +2238,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_REVENGE] = {
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2246,7 +2246,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_BRICK_BREAK] = {
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0x5, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2254,7 +2254,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_YAWN] = {
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2262,7 +2262,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_KNOCK_OFF] = {
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
{ 0x1d, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2270,7 +2270,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_ENDEAVOR] = {
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0x30, 0x0, 0x0, 0x0, 0x0},
@@ -2278,7 +2278,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_ERUPTION] = {
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x2c, 0x0, 0x0, 0x0, 0x0},
{ 0x1d, 0x0, 0x0, 0x0, 0x0},
@@ -2286,7 +2286,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_SKILL_SWAP] = {
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2294,7 +2294,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_IMPRISON] = {
{ 0xf, 0x0, 0x0, 0x0, 0x0},
{ 0xf, 0x0, 0x0, 0x0, 0x0},
{ 0x2c, 0x0, 0x0, 0x0, 0x0},
@@ -2302,7 +2302,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_REFRESH] = {
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2310,7 +2310,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_GRUDGE] = {
{ 0x2b, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2318,7 +2318,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_SNATCH] = {
{ 0x0, 0x0, 0x0, 0x0, 0x0},
NULL_BARD_SOUND,
NULL_BARD_SOUND,
@@ -2326,7 +2326,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_SECRET_POWER] = {
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0x21, 0x0, 0x0, 0x0, 0x0},
@@ -2334,7 +2334,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_DIVE] = {
{ 0x12, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2342,7 +2342,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_ARM_THRUST] = {
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
{ 0x2c, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2350,7 +2350,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_CAMOUFLAGE] = {
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0x18, 0x0, 0x0, 0x0, 0x0},
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
@@ -2358,7 +2358,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_TAIL_GLOW] = {
{ 0x4, 0x0, 0x0, 0x0, 0x0},
{ 0x1a, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2366,7 +2366,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_LUSTER_PURGE] = {
{ 0x2a, 0x0, 0x0, 0x0, 0x0},
{ 0x30, 0x0, 0x0, 0x0, 0x0},
{ 0x32, 0x0, 0x0, 0x0, 0x0},
@@ -2374,7 +2374,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_MIST_BALL] = {
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2382,7 +2382,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_FEATHER_DANCE] = {
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0x30, 0x0, 0x0, 0x0, 0x0},
{ 0x0, 0x0, 0x0, 0x0, 0x0},
@@ -2390,7 +2390,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_TEETER_DANCE] = {
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x30, 0x0, 0x0, 0x0, 0x0},
{ 0x0, 0x0, 0x0, 0x0, 0x0},
@@ -2398,7 +2398,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_BLAZE_KICK] = {
{ 0x5, 0x0, 0x0, 0x0, 0x0},
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2406,7 +2406,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_MUD_SPORT] = {
{ 0x2a, 0x0, 0x0, 0x0, 0x0},
{ 0x18, 0x0, 0x0, 0x0, 0x0},
{ 0x30, 0x0, 0x0, 0x0, 0x0},
@@ -2414,7 +2414,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_ICE_BALL] = {
{ 0x12, 0x0, 0x0, 0x0, 0x0},
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2422,7 +2422,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_NEEDLE_ARM] = {
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x2a, 0x0, 0x0, 0x0, 0x0},
{ 0x1d, 0x0, 0x0, 0x0, 0x0},
@@ -2430,7 +2430,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_SLACK_OFF] = {
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2438,7 +2438,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_HYPER_VOICE] = {
{ 0x12, 0x0, 0x0, 0x0, 0x0},
{ 0x30, 0x0, 0x0, 0x0, 0x0},
{ 0x1e, 0x0, 0x0, 0x0, 0x0},
@@ -2446,7 +2446,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_POISON_FANG] = {
{ 0x1e, 0x0, 0x0, 0x0, 0x0},
{ 0x2a, 0x0, 0x0, 0x0, 0x0},
{ 0x0, 0x0, 0x0, 0x0, 0x0},
@@ -2454,7 +2454,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_CRUSH_CLAW] = {
{ 0x2c, 0x0, 0x0, 0x0, 0x0},
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2462,7 +2462,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_BLAST_BURN] = {
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
{ 0x30, 0x0, 0x0, 0x0, 0x0},
@@ -2470,7 +2470,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_HYDRO_CANNON] = {
{ 0x12, 0x0, 0x0, 0x0, 0x0},
{ 0x18, 0x0, 0x0, 0x0, 0x0},
{ 0x0, 0x0, 0x0, 0x0, 0x0},
@@ -2478,7 +2478,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
{ 0x33, 0x0, 0x0, 0x0, 0x0},
NULL_BARD_SOUND
},
- {
+ [MOVE_METEOR_MASH] = {
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x18, 0x0, 0x0, 0x0, 0x0},
@@ -2486,7 +2486,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
{ 0x33, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0}
},
- {
+ [MOVE_ASTONISH] = {
{ 0x2a, 0x0, 0x0, 0x0, 0x0},
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
{ 0x11, 0x0, 0x0, 0x0, 0x0},
@@ -2494,7 +2494,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_WEATHER_BALL] = {
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0x30, 0x0, 0x0, 0x0, 0x0},
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
@@ -2502,7 +2502,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_AROMATHERAPY] = {
{ 0x2a, 0x0, 0x0, 0x0, 0x0},
{ 0x18, 0x0, 0x0, 0x0, 0x0},
{ 0x2c, 0x0, 0x0, 0x0, 0x0},
@@ -2510,7 +2510,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
{ 0xe, 0x0, 0x0, 0x0, 0x0}
},
- {
+ [MOVE_FAKE_TEARS] = {
{ 0x3, 0x0, 0x0, 0x0, 0x0},
{ 0xe, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2518,7 +2518,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_AIR_CUTTER] = {
{ 0x5, 0x0, 0x0, 0x0, 0x0},
{ 0x2a, 0x0, 0x0, 0x0, 0x0},
{ 0x30, 0x0, 0x0, 0x0, 0x0},
@@ -2526,7 +2526,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_OVERHEAT] = {
{ 0x18, 0x0, 0x0, 0x0, 0x0},
{ 0x30, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
@@ -2534,7 +2534,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_ODOR_SLEUTH] = {
{ 0x18, 0x0, 0x0, 0x0, 0x0},
{ 0x30, 0x0, 0x0, 0x0, 0x0},
{ 0x27, 0x0, 0x0, 0x0, 0x0},
@@ -2542,7 +2542,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_ROCK_TOMB] = {
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
{ 0x27, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2550,7 +2550,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_SILVER_WIND] = {
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0x30, 0x0, 0x0, 0x0, 0x0},
{ 0xf, 0x0, 0x0, 0x0, 0x0},
@@ -2558,7 +2558,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_METAL_SOUND] = {
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
{ 0x21, 0x0, 0x0, 0x0, 0x0},
@@ -2566,7 +2566,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_GRASS_WHISTLE] = {
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0x24, 0x0, 0x0, 0x0, 0x0},
@@ -2574,7 +2574,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_TICKLE] = {
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0x24, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2582,7 +2582,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_COSMIC_POWER] = {
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0x21, 0x0, 0x0, 0x0, 0x0},
@@ -2590,7 +2590,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_WATER_SPOUT] = {
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
{ 0x30, 0x0, 0x0, 0x0, 0x0},
{ 0x21, 0x0, 0x0, 0x0, 0x0},
@@ -2598,7 +2598,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_SIGNAL_BEAM] = {
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
@@ -2606,7 +2606,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_SHADOW_PUNCH] = {
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0x18, 0x0, 0x0, 0x0, 0x0},
{ 0x2c, 0x0, 0x0, 0x0, 0x0},
@@ -2614,7 +2614,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_EXTRASENSORY] = {
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0x2a, 0x0, 0x0, 0x0, 0x0},
{ 0x9, 0x0, 0x0, 0x0, 0x0},
@@ -2622,7 +2622,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
{ 0xc, 0x0, 0x0, 0x0, 0x0},
NULL_BARD_SOUND
},
- {
+ [MOVE_SKY_UPPERCUT] = {
{ 0x12, 0x0, 0x0, 0x0, 0x0},
{ 0x2c, 0x0, 0x0, 0x0, 0x0},
{ 0x30, 0x0, 0x0, 0x0, 0x0},
@@ -2630,7 +2630,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_SAND_TOMB] = {
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0x27, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2638,7 +2638,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_SHEER_COLD] = {
{ 0xe, 0x0, 0x0, 0x0, 0x0},
{ 0x30, 0x0, 0x0, 0x0, 0x0},
{ 0x18, 0x0, 0x0, 0x0, 0x0},
@@ -2646,7 +2646,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_MUDDY_WATER] = {
{ 0x2a, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
@@ -2654,7 +2654,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_BULLET_SEED] = {
{ 0x2a, 0x0, 0x0, 0x0, 0x0},
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
@@ -2662,7 +2662,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_AERIAL_ACE] = {
{ 0x3, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x2a, 0x0, 0x0, 0x0, 0x0},
@@ -2670,7 +2670,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_ICICLE_SPEAR] = {
{ 0x12, 0x0, 0x0, 0x0, 0x0},
{ 0xf, 0x0, 0x0, 0x0, 0x0},
{ 0x2a, 0x0, 0x0, 0x0, 0x0},
@@ -2678,7 +2678,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
{ 0x30, 0x0, 0x0, 0x0, 0x0},
NULL_BARD_SOUND
},
- {
+ [MOVE_IRON_DEFENSE] = {
{ 0x12, 0x0, 0x0, 0x0, 0x0},
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
@@ -2686,7 +2686,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_BLOCK] = {
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2694,7 +2694,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_HOWL] = {
{ 0x21, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2702,7 +2702,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_DRAGON_CLAW] = {
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
{ 0x1d, 0x0, 0x0, 0x0, 0x0},
@@ -2710,7 +2710,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_FRENZY_PLANT] = {
{ 0x30, 0x0, 0x0, 0x0, 0x0},
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
@@ -2718,7 +2718,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_BULK_UP] = {
{ 0x2c, 0x0, 0x0, 0x0, 0x0},
{ 0x2c, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2726,7 +2726,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_BOUNCE] = {
{ 0x21, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2734,7 +2734,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_MUD_SHOT] = {
{ 0x2c, 0x0, 0x0, 0x0, 0x0},
{ 0x1d, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2742,7 +2742,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_POISON_TAIL] = {
{ 0x1e, 0x0, 0x0, 0x0, 0x0},
{ 0x2c, 0x0, 0x0, 0x0, 0x0},
{ 0x5, 0x0, 0x0, 0x0, 0x0},
@@ -2750,7 +2750,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_COVET] = {
{ 0x2a, 0x0, 0x0, 0x0, 0x0},
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2758,7 +2758,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_VOLT_TACKLE] = {
{ 0x18, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
{ 0x0, 0x0, 0x0, 0x0, 0x0},
@@ -2766,7 +2766,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_MAGICAL_LEAF] = {
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0x24, 0x0, 0x0, 0x0, 0x0},
@@ -2774,7 +2774,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
{ 0x33, 0x0, 0x0, 0x0, 0x0},
NULL_BARD_SOUND
},
- {
+ [MOVE_WATER_SPORT] = {
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
{ 0x30, 0x0, 0x0, 0x0, 0x0},
{ 0x1a, 0x0, 0x0, 0x0, 0x0},
@@ -2782,7 +2782,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_CALM_MIND] = {
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
{ 0x12, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2790,7 +2790,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_LEAF_BLADE] = {
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x5, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2798,7 +2798,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_DRAGON_DANCE] = {
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
{ 0x0, 0x0, 0x0, 0x0, 0x0},
@@ -2806,7 +2806,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_ROCK_BLAST] = {
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2814,7 +2814,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_SHOCK_WAVE] = {
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
{ 0x3, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2822,7 +2822,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_WATER_PULSE] = {
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
{ 0x30, 0x0, 0x0, 0x0, 0x0},
{ 0x2c, 0x0, 0x0, 0x0, 0x0},
@@ -2830,7 +2830,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [MOVE_DOOM_DESIRE] = {
{ 0x27, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
@@ -2838,7 +2838,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
{ 0x30, 0x0, 0x0, 0x0, 0x0},
NULL_BARD_SOUND
},
- {
+ [MOVE_PSYCHO_BOOST] = {
{ 0x12, 0x0, 0x0, 0x0, 0x0},
{ 0xf, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
diff --git a/src/data/bard_music/pokemon.h b/src/data/bard_music/pokemon.h
index 5ccf2f830..294cd4078 100644
--- a/src/data/bard_music/pokemon.h
+++ b/src/data/bard_music/pokemon.h
@@ -1,10 +1,10 @@
#ifndef GUARD_DATA_BARD_MUSIC_POKEMON_H
#define GUARD_DATA_BARD_MUSIC_POKEMON_H
-const u16 gNumSpeciesNames = NUM_SPECIES;
+const u16 gNumBardWords_Species = NUM_SPECIES;
-const struct BardSound gBardSounds_Pokemon[][6] = {
- {
+const struct BardSound gBardSounds_Pokemon[NUM_SPECIES][6] = {
+ [SPECIES_NONE] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
@@ -12,7 +12,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_BULBASAUR] = {
{ 0x24, 0x0, 0x0, 0x0, 0x0},
{ 0x2a, 0x0, 0x0, 0x0, 0x0},
{ 0x30, 0x0, 0x0, 0x0, 0x0},
@@ -20,7 +20,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_IVYSAUR] = {
{ 0x14, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x32, 0x0, 0x0, 0x0, 0x0},
@@ -28,7 +28,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_VENUSAUR] = {
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x2c, 0x0, 0x0, 0x0, 0x0},
{ 0x30, 0x0, 0x0, 0x0, 0x0},
@@ -36,7 +36,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_CHARMANDER] = {
{ 0x6, 0x0, 0x0, 0x0, 0x0},
{ 0x2, 0x0, 0x0, 0x0, 0x0},
{ 0x32, 0x0, 0x0, 0x0, 0x0},
@@ -44,7 +44,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_CHARMELEON] = {
{ 0x6, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
@@ -52,7 +52,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
{ 0x33, 0x0, 0x0, 0x0, 0x0},
NULL_BARD_SOUND
},
- {
+ [SPECIES_CHARIZARD] = {
{ 0x6, 0x0, 0x0, 0x0, 0x0},
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0x32, 0x0, 0x0, 0x0, 0x0},
@@ -60,7 +60,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
{ 0x33, 0x0, 0x0, 0x0, 0x0},
NULL_BARD_SOUND
},
- {
+ [SPECIES_SQUIRTLE] = {
{ 0x30, 0x0, 0x0, 0x0, 0x0},
{ 0x24, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -68,7 +68,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_WARTORTLE] = {
{ 0x8, 0x0, 0x0, 0x0, 0x0},
{ 0x30, 0x0, 0x0, 0x0, 0x0},
{ 0x24, 0x0, 0x0, 0x0, 0x0},
@@ -76,7 +76,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_BLASTOISE] = {
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0x1e, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -84,7 +84,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_CATERPIE] = {
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0x30, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
@@ -92,7 +92,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_METAPOD] = {
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0x2a, 0x0, 0x0, 0x0, 0x0},
{ 0x15, 0x0, 0x0, 0x0, 0x0},
@@ -100,7 +100,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_BUTTERFREE] = {
{ 0x2a, 0x0, 0x0, 0x0, 0x0},
{ 0x30, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
@@ -108,7 +108,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_WEEDLE] = {
{ 0xe, 0x0, 0x0, 0x0, 0x0},
{ 0x26, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -116,7 +116,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_KAKUNA] = {
{ 0x2a, 0x0, 0x0, 0x0, 0x0},
{ 0x27, 0x0, 0x0, 0x0, 0x0},
{ 0x2a, 0x0, 0x0, 0x0, 0x0},
@@ -124,7 +124,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_BEEDRILL] = {
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -132,7 +132,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_PIDGEY] = {
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -140,7 +140,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_PIDGEOTTO] = {
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x18, 0x0, 0x0, 0x0, 0x0},
@@ -148,7 +148,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_PIDGEOT] = {
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x15, 0x0, 0x0, 0x0, 0x0},
@@ -156,7 +156,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_RATTATA] = {
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0x2c, 0x0, 0x0, 0x0, 0x0},
@@ -164,7 +164,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_RATICATE] = {
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x3, 0x0, 0x0, 0x0, 0x0},
@@ -172,7 +172,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_SPEAROW] = {
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x18, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -180,7 +180,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_FEAROW] = {
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x18, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -188,7 +188,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_EKANS] = {
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -196,7 +196,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_ARBOK] = {
{ 0x6, 0x0, 0x0, 0x0, 0x0},
{ 0x17, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -204,7 +204,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_PIKACHU] = {
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x2a, 0x0, 0x0, 0x0, 0x0},
{ 0x27, 0x0, 0x0, 0x0, 0x0},
@@ -212,7 +212,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_RAICHU] = {
{ 0x12, 0x0, 0x0, 0x0, 0x0},
{ 0x27, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -220,7 +220,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_SANDSHREW] = {
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0x27, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -228,7 +228,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_SANDSLASH] = {
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -236,7 +236,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_NIDORAN_F] = {
{ 0x12, 0x0, 0x0, 0x0, 0x0},
{ 0x18, 0x0, 0x0, 0x0, 0x0},
{ 0x0, 0x0, 0x0, 0x0, 0x0},
@@ -244,7 +244,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_NIDORINA] = {
{ 0x12, 0x0, 0x0, 0x0, 0x0},
{ 0x18, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
@@ -252,7 +252,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_NIDOQUEEN] = {
{ 0x12, 0x0, 0x0, 0x0, 0x0},
{ 0x18, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
@@ -260,7 +260,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_NIDORAN_M] = {
{ 0x12, 0x0, 0x0, 0x0, 0x0},
{ 0x18, 0x0, 0x0, 0x0, 0x0},
{ 0x0, 0x0, 0x0, 0x0, 0x0},
@@ -268,7 +268,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_NIDORINO] = {
{ 0x12, 0x0, 0x0, 0x0, 0x0},
{ 0x18, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
@@ -276,7 +276,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_NIDOKING] = {
{ 0x12, 0x0, 0x0, 0x0, 0x0},
{ 0x18, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
@@ -284,7 +284,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_CLEFAIRY] = {
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0xb, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
@@ -292,7 +292,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_CLEFABLE] = {
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0x2a, 0x0, 0x0, 0x0, 0x0},
{ 0x24, 0x0, 0x0, 0x0, 0x0},
@@ -300,7 +300,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_VULPIX] = {
{ 0x24, 0x0, 0x0, 0x0, 0x0},
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -308,7 +308,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_NINETALES] = {
{ 0x12, 0x0, 0x0, 0x0, 0x0},
{ 0x5, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -316,7 +316,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_JIGGLYPUFF] = {
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0x27, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
@@ -324,7 +324,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
{ 0x33, 0x0, 0x0, 0x0, 0x0},
NULL_BARD_SOUND
},
- {
+ [SPECIES_WIGGLYTUFF] = {
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0x27, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
@@ -332,7 +332,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
{ 0x33, 0x0, 0x0, 0x0, 0x0},
NULL_BARD_SOUND
},
- {
+ [SPECIES_ZUBAT] = {
{ 0x27, 0x0, 0x0, 0x0, 0x0},
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -340,7 +340,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_GOLBAT] = {
{ 0x1a, 0x0, 0x0, 0x0, 0x0},
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -348,7 +348,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_ODDISH] = {
{ 0x15, 0x0, 0x0, 0x0, 0x0},
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -356,7 +356,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_GLOOM] = {
{ 0x27, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -364,7 +364,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_VILEPLUME] = {
{ 0x14, 0x0, 0x0, 0x0, 0x0},
{ 0x27, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -372,7 +372,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_PARAS] = {
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -380,7 +380,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_PARASECT] = {
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0x9, 0x0, 0x0, 0x0, 0x0},
@@ -388,7 +388,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_VENONAT] = {
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0x1a, 0x0, 0x0, 0x0, 0x0},
{ 0x0, 0x0, 0x0, 0x0, 0x0},
@@ -396,7 +396,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_VENOMOTH] = {
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0x1a, 0x0, 0x0, 0x0, 0x0},
{ 0x15, 0x0, 0x0, 0x0, 0x0},
@@ -404,7 +404,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_DIGLETT] = {
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -412,7 +412,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_DUGTRIO] = {
{ 0x2c, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x18, 0x0, 0x0, 0x0, 0x0},
@@ -420,7 +420,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_MEOWTH] = {
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x21, 0x0, 0x0, 0x0, 0x0},
{ 0x11, 0x0, 0x0, 0x0, 0x0},
@@ -428,7 +428,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_PERSIAN] = {
{ 0x32, 0x0, 0x0, 0x0, 0x0},
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0x0, 0x0, 0x0, 0x0, 0x0},
@@ -436,7 +436,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_PSYDUCK] = {
{ 0x12, 0x0, 0x0, 0x0, 0x0},
{ 0x2a, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -444,7 +444,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_GOLDUCK] = {
{ 0x18, 0x0, 0x0, 0x0, 0x0},
{ 0x2a, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -452,7 +452,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_MANKEY] = {
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -460,7 +460,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_PRIMEAPE] = {
{ 0x12, 0x0, 0x0, 0x0, 0x0},
{ 0x3, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -468,7 +468,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_GROWLITHE] = {
{ 0x21, 0x0, 0x0, 0x0, 0x0},
{ 0xf, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -476,7 +476,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_ARCANINE] = {
{ 0x6, 0x0, 0x0, 0x0, 0x0},
{ 0x3, 0x0, 0x0, 0x0, 0x0},
{ 0x12, 0x0, 0x0, 0x0, 0x0},
@@ -484,7 +484,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_POLIWAG] = {
{ 0x15, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x0, 0x0, 0x0, 0x0, 0x0},
@@ -492,7 +492,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_POLIWHIRL] = {
{ 0x15, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x30, 0x0, 0x0, 0x0, 0x0},
@@ -500,7 +500,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_POLIWRATH] = {
{ 0x15, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x0, 0x0, 0x0, 0x0, 0x0},
@@ -508,7 +508,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_ABRA] = {
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0x2a, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -516,7 +516,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_KADABRA] = {
{ 0x2c, 0x0, 0x0, 0x0, 0x0},
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0x2c, 0x0, 0x0, 0x0, 0x0},
@@ -524,7 +524,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_ALAKAZAM] = {
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0x2c, 0x0, 0x0, 0x0, 0x0},
{ 0x2c, 0x0, 0x0, 0x0, 0x0},
@@ -532,7 +532,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_MACHOP] = {
{ 0x2a, 0x0, 0x0, 0x0, 0x0},
{ 0x15, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -540,7 +540,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_MACHOKE] = {
{ 0x2a, 0x0, 0x0, 0x0, 0x0},
{ 0x1a, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -548,7 +548,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_MACHAMP] = {
{ 0x2a, 0x0, 0x0, 0x0, 0x0},
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -556,7 +556,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_BELLSPROUT] = {
{ 0xb, 0x0, 0x0, 0x0, 0x0},
{ 0x21, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -564,7 +564,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_WEEPINBELL] = {
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0xf, 0x0, 0x0, 0x0, 0x0},
{ 0xb, 0x0, 0x0, 0x0, 0x0},
@@ -572,7 +572,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_VICTREEBEL] = {
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x9, 0x0, 0x0, 0x0, 0x0},
@@ -580,7 +580,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_TENTACOOL] = {
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0x2a, 0x0, 0x0, 0x0, 0x0},
{ 0x27, 0x0, 0x0, 0x0, 0x0},
@@ -588,7 +588,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_TENTACRUEL] = {
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0x2a, 0x0, 0x0, 0x0, 0x0},
{ 0x27, 0x0, 0x0, 0x0, 0x0},
@@ -596,7 +596,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_GEODUDE] = {
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x18, 0x0, 0x0, 0x0, 0x0},
{ 0x27, 0x0, 0x0, 0x0, 0x0},
@@ -604,7 +604,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_GRAVELER] = {
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0x30, 0x0, 0x0, 0x0, 0x0},
@@ -612,7 +612,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_GOLEM] = {
{ 0x18, 0x0, 0x0, 0x0, 0x0},
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -620,7 +620,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_PONYTA] = {
{ 0x1a, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x2a, 0x0, 0x0, 0x0, 0x0},
@@ -628,7 +628,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_RAPIDASH] = {
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0x0, 0x0, 0x0, 0x0, 0x0},
@@ -636,7 +636,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_SLOWPOKE] = {
{ 0x18, 0x0, 0x0, 0x0, 0x0},
{ 0x18, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -644,7 +644,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_SLOWBRO] = {
{ 0x18, 0x0, 0x0, 0x0, 0x0},
{ 0x18, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -652,7 +652,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_MAGNEMITE] = {
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0x12, 0x0, 0x0, 0x0, 0x0},
@@ -660,7 +660,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_MAGNETON] = {
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0x2a, 0x0, 0x0, 0x0, 0x0},
@@ -668,7 +668,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_FARFETCHD] = {
{ 0x6, 0x0, 0x0, 0x0, 0x0},
{ 0xb, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -676,7 +676,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_DODUO] = {
{ 0x1a, 0x0, 0x0, 0x0, 0x0},
{ 0x27, 0x0, 0x0, 0x0, 0x0},
{ 0x18, 0x0, 0x0, 0x0, 0x0},
@@ -684,7 +684,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_DODRIO] = {
{ 0x1a, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x18, 0x0, 0x0, 0x0, 0x0},
@@ -692,7 +692,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_SEEL] = {
{ 0xe, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -700,7 +700,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_DEWGONG] = {
{ 0x27, 0x0, 0x0, 0x0, 0x0},
{ 0x15, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -708,7 +708,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_GRIMER] = {
{ 0x12, 0x0, 0x0, 0x0, 0x0},
{ 0x30, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -716,7 +716,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_MUK] = {
{ 0x2a, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -724,7 +724,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_SHELLDER] = {
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0x30, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -732,7 +732,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_CLOYSTER] = {
{ 0x1e, 0x0, 0x0, 0x0, 0x0},
{ 0x30, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -740,7 +740,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_GASTLY] = {
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0xe, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -748,7 +748,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_HAUNTER] = {
{ 0x15, 0x0, 0x0, 0x0, 0x0},
{ 0x30, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -756,7 +756,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_GENGAR] = {
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0x8, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -764,7 +764,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_ONIX] = {
{ 0x15, 0x0, 0x0, 0x0, 0x0},
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -772,7 +772,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_DROWZEE] = {
{ 0x21, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -780,7 +780,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_HYPNO] = {
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0x18, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -788,7 +788,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_KRABBY] = {
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -796,7 +796,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_KINGLER] = {
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x30, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -804,7 +804,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_VOLTORB] = {
{ 0x1a, 0x0, 0x0, 0x0, 0x0},
{ 0x18, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -812,7 +812,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_ELECTRODE] = {
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0x18, 0x0, 0x0, 0x0, 0x0},
@@ -820,7 +820,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_EXEGGCUTE] = {
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0x2c, 0x0, 0x0, 0x0, 0x0},
{ 0x27, 0x0, 0x0, 0x0, 0x0},
@@ -828,7 +828,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_EXEGGUTOR] = {
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0x2c, 0x0, 0x0, 0x0, 0x0},
{ 0x9, 0x0, 0x0, 0x0, 0x0},
@@ -836,7 +836,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
{ 0x33, 0x0, 0x0, 0x0, 0x0},
NULL_BARD_SOUND
},
- {
+ [SPECIES_CUBONE] = {
{ 0x2d, 0x0, 0x0, 0x0, 0x0},
{ 0x18, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -844,7 +844,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_MAROWAK] = {
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0x1a, 0x0, 0x0, 0x0, 0x0},
{ 0x0, 0x0, 0x0, 0x0, 0x0},
@@ -852,7 +852,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_HITMONLEE] = {
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0x15, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
@@ -860,7 +860,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_HITMONCHAN] = {
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0x15, 0x0, 0x0, 0x0, 0x0},
{ 0x0, 0x0, 0x0, 0x0, 0x0},
@@ -868,7 +868,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_LICKITUNG] = {
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x2a, 0x0, 0x0, 0x0, 0x0},
@@ -876,7 +876,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_KOFFING] = {
{ 0x15, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -884,7 +884,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_WEEZING] = {
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -892,7 +892,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_RHYHORN] = {
{ 0x14, 0x0, 0x0, 0x0, 0x0},
{ 0x1a, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -900,7 +900,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_RHYDON] = {
{ 0x12, 0x0, 0x0, 0x0, 0x0},
{ 0x15, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -908,7 +908,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_CHANSEY] = {
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -916,7 +916,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_TANGELA] = {
{ 0x2, 0x0, 0x0, 0x0, 0x0},
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0x2a, 0x0, 0x0, 0x0, 0x0},
@@ -924,7 +924,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_KANGASKHAN] = {
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
@@ -932,7 +932,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_HORSEA] = {
{ 0x1a, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -940,7 +940,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_SEADRA] = {
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x2a, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -948,7 +948,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_GOLDEEN] = {
{ 0x1a, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -956,7 +956,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_SEAKING] = {
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -964,7 +964,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_STARYU] = {
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
{ 0x27, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -972,7 +972,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_STARMIE] = {
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -980,7 +980,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_MR_MIME] = {
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0x30, 0x0, 0x0, 0x0, 0x0},
{ 0x12, 0x0, 0x0, 0x0, 0x0},
@@ -988,7 +988,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_SCYTHER] = {
{ 0x12, 0x0, 0x0, 0x0, 0x0},
{ 0x30, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -996,7 +996,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_JYNX] = {
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1004,7 +1004,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_ELECTABUZZ] = {
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0x2c, 0x0, 0x0, 0x0, 0x0},
@@ -1012,7 +1012,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_MAGMAR] = {
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0x1d, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1020,7 +1020,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_PINSIR] = {
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0x30, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1028,7 +1028,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_TAUROS] = {
{ 0x1d, 0x0, 0x0, 0x0, 0x0},
{ 0x1a, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1036,7 +1036,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_MAGIKARP] = {
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
@@ -1044,7 +1044,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_GYARADOS] = {
{ 0x1d, 0x0, 0x0, 0x0, 0x0},
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0x11, 0x0, 0x0, 0x0, 0x0},
@@ -1052,7 +1052,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_LAPRAS] = {
{ 0x2c, 0x0, 0x0, 0x0, 0x0},
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1060,7 +1060,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_DITTO] = {
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0x18, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1068,7 +1068,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_EEVEE] = {
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1076,7 +1076,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_VAPOREON] = {
{ 0x3, 0x0, 0x0, 0x0, 0x0},
{ 0x18, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
@@ -1084,7 +1084,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_JOLTEON] = {
{ 0x1a, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x15, 0x0, 0x0, 0x0, 0x0},
@@ -1092,7 +1092,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_FLAREON] = {
{ 0x3, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x15, 0x0, 0x0, 0x0, 0x0},
@@ -1100,7 +1100,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_PORYGON] = {
{ 0x18, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x15, 0x0, 0x0, 0x0, 0x0},
@@ -1108,7 +1108,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_OMANYTE] = {
{ 0x18, 0x0, 0x0, 0x0, 0x0},
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0x12, 0x0, 0x0, 0x0, 0x0},
@@ -1116,7 +1116,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_OMASTAR] = {
{ 0x18, 0x0, 0x0, 0x0, 0x0},
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0x15, 0x0, 0x0, 0x0, 0x0},
@@ -1124,7 +1124,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_KABUTO] = {
{ 0x2a, 0x0, 0x0, 0x0, 0x0},
{ 0x27, 0x0, 0x0, 0x0, 0x0},
{ 0x1a, 0x0, 0x0, 0x0, 0x0},
@@ -1132,7 +1132,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_KABUTOPS] = {
{ 0x2a, 0x0, 0x0, 0x0, 0x0},
{ 0x27, 0x0, 0x0, 0x0, 0x0},
{ 0x15, 0x0, 0x0, 0x0, 0x0},
@@ -1140,7 +1140,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_AERODACTYL] = {
{ 0x3, 0x0, 0x0, 0x0, 0x0},
{ 0x18, 0x0, 0x0, 0x0, 0x0},
{ 0x0, 0x0, 0x0, 0x0, 0x0},
@@ -1148,7 +1148,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_SNORLAX] = {
{ 0x18, 0x0, 0x0, 0x0, 0x0},
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1156,7 +1156,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_ARTICUNO] = {
{ 0x6, 0x0, 0x0, 0x0, 0x0},
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0x27, 0x0, 0x0, 0x0, 0x0},
@@ -1164,7 +1164,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_ZAPDOS] = {
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0x18, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1172,7 +1172,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_MOLTRES] = {
{ 0x1a, 0x0, 0x0, 0x0, 0x0},
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1180,7 +1180,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_DRATINI] = {
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
@@ -1188,7 +1188,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_DRAGONAIR] = {
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0x15, 0x0, 0x0, 0x0, 0x0},
{ 0xb, 0x0, 0x0, 0x0, 0x0},
@@ -1196,7 +1196,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_DRAGONITE] = {
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0x15, 0x0, 0x0, 0x0, 0x0},
{ 0x12, 0x0, 0x0, 0x0, 0x0},
@@ -1204,7 +1204,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_MEWTWO] = {
{ 0x2d, 0x0, 0x0, 0x0, 0x0},
{ 0x27, 0x0, 0x0, 0x0, 0x0},
NULL_BARD_SOUND,
@@ -1212,7 +1212,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_MEW] = {
{ 0x2d, 0x0, 0x0, 0x0, 0x0},
NULL_BARD_SOUND,
NULL_BARD_SOUND,
@@ -1220,7 +1220,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_CHIKORITA] = {
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0x18, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
@@ -1228,7 +1228,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_BAYLEEF] = {
{ 0x3, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1236,7 +1236,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_MEGANIUM] = {
{ 0x3, 0x0, 0x0, 0x0, 0x0},
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
@@ -1244,7 +1244,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_CYNDAQUIL] = {
{ 0xf, 0x0, 0x0, 0x0, 0x0},
{ 0x2a, 0x0, 0x0, 0x0, 0x0},
{ 0x9, 0x0, 0x0, 0x0, 0x0},
@@ -1252,7 +1252,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_QUILAVA] = {
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0x6, 0x0, 0x0, 0x0, 0x0},
{ 0x8, 0x0, 0x0, 0x0, 0x0},
@@ -1260,7 +1260,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_TYPHLOSION] = {
{ 0x12, 0x0, 0x0, 0x0, 0x0},
{ 0x18, 0x0, 0x0, 0x0, 0x0},
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
@@ -1268,7 +1268,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
{ 0x33, 0x0, 0x0, 0x0, 0x0},
NULL_BARD_SOUND
},
- {
+ [SPECIES_TOTODILE] = {
{ 0x18, 0x0, 0x0, 0x0, 0x0},
{ 0x18, 0x0, 0x0, 0x0, 0x0},
{ 0x12, 0x0, 0x0, 0x0, 0x0},
@@ -1276,7 +1276,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_CROCONAW] = {
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
{ 0x18, 0x0, 0x0, 0x0, 0x0},
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
@@ -1284,7 +1284,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_FERALIGATR] = {
{ 0x30, 0x0, 0x0, 0x0, 0x0},
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0xf, 0x0, 0x0, 0x0, 0x0},
@@ -1292,7 +1292,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
{ 0x30, 0x0, 0x0, 0x0, 0x0},
NULL_BARD_SOUND
},
- {
+ [SPECIES_SENTRET] = {
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1300,7 +1300,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_FURRET] = {
{ 0x30, 0x0, 0x0, 0x0, 0x0},
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1308,7 +1308,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_HOOTHOOT] = {
{ 0x27, 0x0, 0x0, 0x0, 0x0},
{ 0x27, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1316,7 +1316,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_NOCTOWL] = {
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
{ 0x21, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1324,7 +1324,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_LEDYBA] = {
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x2a, 0x0, 0x0, 0x0, 0x0},
@@ -1332,7 +1332,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_LEDIAN] = {
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x0, 0x0, 0x0, 0x0, 0x0},
@@ -1340,7 +1340,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_SPINARAK] = {
{ 0xf, 0x0, 0x0, 0x0, 0x0},
{ 0x30, 0x0, 0x0, 0x0, 0x0},
{ 0x0, 0x0, 0x0, 0x0, 0x0},
@@ -1348,7 +1348,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_ARIADOS] = {
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x2a, 0x0, 0x0, 0x0, 0x0},
@@ -1356,7 +1356,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_CROBAT] = {
{ 0x18, 0x0, 0x0, 0x0, 0x0},
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1364,7 +1364,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_CHINCHOU] = {
{ 0xf, 0x0, 0x0, 0x0, 0x0},
{ 0x21, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1372,7 +1372,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_LANTURN] = {
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0x30, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1380,7 +1380,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_PICHU] = {
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x27, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1388,7 +1388,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_CLEFFA] = {
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0x2a, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1396,7 +1396,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_IGGLYBUFF] = {
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0x2a, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
@@ -1404,7 +1404,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_TOGEPI] = {
{ 0x18, 0x0, 0x0, 0x0, 0x0},
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
@@ -1412,7 +1412,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_TOGETIC] = {
{ 0x18, 0x0, 0x0, 0x0, 0x0},
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0x11, 0x0, 0x0, 0x0, 0x0},
@@ -1420,7 +1420,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_NATU] = {
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0x27, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1428,7 +1428,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_XATU] = {
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0x27, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1436,7 +1436,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_MAREEP] = {
{ 0x1d, 0x0, 0x0, 0x0, 0x0},
{ 0xe, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1444,7 +1444,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_FLAAFFY] = {
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1452,7 +1452,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_AMPHAROS] = {
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0x6, 0x0, 0x0, 0x0, 0x0},
{ 0x18, 0x0, 0x0, 0x0, 0x0},
@@ -1460,7 +1460,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_BELLOSSOM] = {
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
{ 0x2c, 0x0, 0x0, 0x0, 0x0},
@@ -1468,7 +1468,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_MARILL] = {
{ 0x8, 0x0, 0x0, 0x0, 0x0},
{ 0x10, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1476,7 +1476,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_AZUMARILL] = {
{ 0x8, 0x0, 0x0, 0x0, 0x0},
{ 0x27, 0x0, 0x0, 0x0, 0x0},
{ 0x2c, 0x0, 0x0, 0x0, 0x0},
@@ -1484,7 +1484,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_SUDOWOODO] = {
{ 0x27, 0x0, 0x0, 0x0, 0x0},
{ 0x18, 0x0, 0x0, 0x0, 0x0},
{ 0x27, 0x0, 0x0, 0x0, 0x0},
@@ -1492,7 +1492,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_POLITOED] = {
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x18, 0x0, 0x0, 0x0, 0x0},
@@ -1500,7 +1500,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_HOPPIP] = {
{ 0x1d, 0x0, 0x0, 0x0, 0x0},
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1508,7 +1508,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_SKIPLOOM] = {
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0x27, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1516,7 +1516,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_JUMPLUFF] = {
{ 0x2c, 0x0, 0x0, 0x0, 0x0},
{ 0x2c, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1524,7 +1524,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_AIPOM] = {
{ 0x3, 0x0, 0x0, 0x0, 0x0},
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1532,7 +1532,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_SUNKERN] = {
{ 0x2c, 0x0, 0x0, 0x0, 0x0},
{ 0x30, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1540,7 +1540,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_SUNFLORA] = {
{ 0x2c, 0x0, 0x0, 0x0, 0x0},
{ 0x18, 0x0, 0x0, 0x0, 0x0},
{ 0x2c, 0x0, 0x0, 0x0, 0x0},
@@ -1548,7 +1548,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_YANMA] = {
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0x2a, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1556,7 +1556,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_WOOPER] = {
{ 0x27, 0x0, 0x0, 0x0, 0x0},
{ 0x30, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1564,7 +1564,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_QUAGSIRE] = {
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0x12, 0x0, 0x0, 0x0, 0x0},
{ 0x32, 0x0, 0x0, 0x0, 0x0},
@@ -1572,7 +1572,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_ESPEON] = {
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
@@ -1580,7 +1580,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_UMBREON] = {
{ 0x2a, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
@@ -1588,7 +1588,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_MURKROW] = {
{ 0x30, 0x0, 0x0, 0x0, 0x0},
{ 0x18, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1596,7 +1596,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_SLOWKING] = {
{ 0x18, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1604,7 +1604,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_MISDREAVUS] = {
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x2c, 0x0, 0x0, 0x0, 0x0},
@@ -1612,7 +1612,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_UNOWN] = {
{ 0x2a, 0x0, 0x0, 0x0, 0x0},
{ 0x1a, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1620,7 +1620,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_WOBBUFFET] = {
{ 0x1d, 0x0, 0x0, 0x0, 0x0},
{ 0x2c, 0x0, 0x0, 0x0, 0x0},
{ 0x9, 0x0, 0x0, 0x0, 0x0},
@@ -1628,7 +1628,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_GIRAFARIG] = {
{ 0x30, 0x0, 0x0, 0x0, 0x0},
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0x2a, 0x0, 0x0, 0x0, 0x0},
@@ -1636,7 +1636,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_PINECO] = {
{ 0x12, 0x0, 0x0, 0x0, 0x0},
{ 0x18, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1644,7 +1644,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_FORRETRESS] = {
{ 0x1a, 0x0, 0x0, 0x0, 0x0},
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0x9, 0x0, 0x0, 0x0, 0x0},
@@ -1652,7 +1652,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_DUNSPARCE] = {
{ 0x2a, 0x0, 0x0, 0x0, 0x0},
{ 0x1c, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1660,7 +1660,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_GLIGAR] = {
{ 0x12, 0x0, 0x0, 0x0, 0x0},
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1668,7 +1668,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_STEELIX] = {
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1676,7 +1676,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_SNUBBULL] = {
{ 0x2c, 0x0, 0x0, 0x0, 0x0},
{ 0x2c, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1684,7 +1684,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_GRANBULL] = {
{ 0x2, 0x0, 0x0, 0x0, 0x0},
{ 0x2c, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1692,7 +1692,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_QWILFISH] = {
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1700,7 +1700,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_SCIZOR] = {
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0x32, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1708,7 +1708,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_SHUCKLE] = {
{ 0x2a, 0x0, 0x0, 0x0, 0x0},
{ 0x26, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1716,7 +1716,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_HERACROSS] = {
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0x2a, 0x0, 0x0, 0x0, 0x0},
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
@@ -1724,7 +1724,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_SNEASEL] = {
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x26, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1732,7 +1732,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_TEDDIURSA] = {
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x30, 0x0, 0x0, 0x0, 0x0},
@@ -1740,7 +1740,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_URSARING] = {
{ 0x30, 0x0, 0x0, 0x0, 0x0},
{ 0x2c, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
@@ -1748,7 +1748,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_SLUGMA] = {
{ 0x2c, 0x0, 0x0, 0x0, 0x0},
{ 0x2c, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1756,7 +1756,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_MAGCARGO] = {
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
{ 0x18, 0x0, 0x0, 0x0, 0x0},
@@ -1764,7 +1764,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_SWINUB] = {
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0x2c, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1772,7 +1772,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_PILOSWINE] = {
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0x1a, 0x0, 0x0, 0x0, 0x0},
{ 0x12, 0x0, 0x0, 0x0, 0x0},
@@ -1780,7 +1780,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_CORSOLA] = {
{ 0x18, 0x0, 0x0, 0x0, 0x0},
{ 0x18, 0x0, 0x0, 0x0, 0x0},
{ 0x2a, 0x0, 0x0, 0x0, 0x0},
@@ -1788,7 +1788,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_REMORAID] = {
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0x18, 0x0, 0x0, 0x0, 0x0},
{ 0x3, 0x0, 0x0, 0x0, 0x0},
@@ -1796,7 +1796,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_OCTILLERY] = {
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0x30, 0x0, 0x0, 0x0, 0x0},
@@ -1804,7 +1804,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_DELIBIRD] = {
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x30, 0x0, 0x0, 0x0, 0x0},
@@ -1812,7 +1812,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_MANTINE] = {
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1820,7 +1820,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_SKARMORY] = {
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
{ 0x1a, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
@@ -1828,7 +1828,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_HOUNDOUR] = {
{ 0x23, 0x0, 0x0, 0x0, 0x0},
{ 0x1a, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1836,7 +1836,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_HOUNDOOM] = {
{ 0x21, 0x0, 0x0, 0x0, 0x0},
{ 0x27, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1844,7 +1844,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_KINGDRA] = {
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x2a, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1852,7 +1852,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_PHANPY] = {
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1860,7 +1860,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_DONPHAN] = {
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1868,7 +1868,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_PORYGON2] = {
{ 0x1a, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
@@ -1876,7 +1876,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_STANTLER] = {
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0x30, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1884,7 +1884,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_SMEARGLE] = {
{ 0x30, 0x0, 0x0, 0x0, 0x0},
{ 0x26, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1892,7 +1892,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_TYROGUE] = {
{ 0x12, 0x0, 0x0, 0x0, 0x0},
{ 0x18, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1900,7 +1900,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_HITMONTOP] = {
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0x15, 0x0, 0x0, 0x0, 0x0},
{ 0x1d, 0x0, 0x0, 0x0, 0x0},
@@ -1908,7 +1908,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_SMOOCHUM] = {
{ 0x27, 0x0, 0x0, 0x0, 0x0},
{ 0x2c, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1916,7 +1916,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_ELEKID] = {
{ 0xb, 0x0, 0x0, 0x0, 0x0},
{ 0xb, 0x0, 0x0, 0x0, 0x0},
{ 0x11, 0x0, 0x0, 0x0, 0x0},
@@ -1924,7 +1924,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_MAGBY] = {
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1932,7 +1932,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_MILTANK] = {
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0x3, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1940,7 +1940,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_BLISSEY] = {
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0xe, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1948,7 +1948,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_RAIKOU] = {
{ 0x12, 0x0, 0x0, 0x0, 0x0},
{ 0x27, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1956,7 +1956,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_ENTEI] = {
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0x3, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1964,7 +1964,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_SUICUNE] = {
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x27, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1972,7 +1972,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_LARVITAR] = {
{ 0x15, 0x0, 0x0, 0x0, 0x0},
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0x15, 0x0, 0x0, 0x0, 0x0},
@@ -1980,7 +1980,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_PUPITAR] = {
{ 0x27, 0x0, 0x0, 0x0, 0x0},
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
@@ -1988,7 +1988,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_TYRANITAR] = {
{ 0x12, 0x0, 0x0, 0x0, 0x0},
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0x11, 0x0, 0x0, 0x0, 0x0},
@@ -1996,7 +1996,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_LUGIA] = {
{ 0x27, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x2a, 0x0, 0x0, 0x0, 0x0},
@@ -2004,7 +2004,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_HO_OH] = {
{ 0x18, 0x0, 0x0, 0x0, 0x0},
{ 0x18, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2012,7 +2012,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_CELEBI] = {
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
@@ -2020,7 +2020,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_OLD_UNOWN_B] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
@@ -2028,7 +2028,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_OLD_UNOWN_C] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
@@ -2036,7 +2036,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_OLD_UNOWN_D] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
@@ -2044,7 +2044,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_OLD_UNOWN_E] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
@@ -2052,7 +2052,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_OLD_UNOWN_F] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
@@ -2060,7 +2060,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_OLD_UNOWN_G] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
@@ -2068,7 +2068,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_OLD_UNOWN_H] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
@@ -2076,7 +2076,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_OLD_UNOWN_I] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
@@ -2084,7 +2084,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_OLD_UNOWN_J] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
@@ -2092,7 +2092,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_OLD_UNOWN_K] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
@@ -2100,7 +2100,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_OLD_UNOWN_L] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
@@ -2108,7 +2108,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_OLD_UNOWN_M] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
@@ -2116,7 +2116,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_OLD_UNOWN_N] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
@@ -2124,7 +2124,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_OLD_UNOWN_O] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
@@ -2132,7 +2132,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_OLD_UNOWN_P] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
@@ -2140,7 +2140,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_OLD_UNOWN_Q] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
@@ -2148,7 +2148,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_OLD_UNOWN_R] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
@@ -2156,7 +2156,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_OLD_UNOWN_S] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
@@ -2164,7 +2164,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_OLD_UNOWN_T] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
@@ -2172,7 +2172,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_OLD_UNOWN_U] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
@@ -2180,7 +2180,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_OLD_UNOWN_V] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
@@ -2188,7 +2188,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_OLD_UNOWN_W] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
@@ -2196,7 +2196,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_OLD_UNOWN_X] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
@@ -2204,7 +2204,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_OLD_UNOWN_Y] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
@@ -2212,7 +2212,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_OLD_UNOWN_Z] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
@@ -2220,7 +2220,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_TREECKO] = {
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x18, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2228,7 +2228,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_GROVYLE] = {
{ 0x18, 0x0, 0x0, 0x0, 0x0},
{ 0x12, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2236,7 +2236,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_SCEPTILE] = {
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0x12, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2244,7 +2244,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_TORCHIC] = {
{ 0x18, 0x0, 0x0, 0x0, 0x0},
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2252,7 +2252,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_COMBUSKEN] = {
{ 0x2c, 0x0, 0x0, 0x0, 0x0},
{ 0x2c, 0x0, 0x0, 0x0, 0x0},
{ 0xf, 0x0, 0x0, 0x0, 0x0},
@@ -2260,7 +2260,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_BLAZIKEN] = {
{ 0x3, 0x0, 0x0, 0x0, 0x0},
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0xf, 0x0, 0x0, 0x0, 0x0},
@@ -2268,7 +2268,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_MUDKIP] = {
{ 0x2c, 0x0, 0x0, 0x0, 0x0},
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2276,7 +2276,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_MARSHTOMP] = {
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
{ 0x1d, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2284,7 +2284,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_SWAMPERT] = {
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
{ 0x30, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2292,7 +2292,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_POOCHYENA] = {
{ 0x27, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x9, 0x0, 0x0, 0x0, 0x0},
@@ -2300,7 +2300,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_MIGHTYENA] = {
{ 0x12, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x9, 0x0, 0x0, 0x0, 0x0},
@@ -2308,7 +2308,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_ZIGZAGOON] = {
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0x27, 0x0, 0x0, 0x0, 0x0},
@@ -2316,7 +2316,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_LINOONE] = {
{ 0x14, 0x0, 0x0, 0x0, 0x0},
{ 0x27, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2324,7 +2324,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_WURMPLE] = {
{ 0x30, 0x0, 0x0, 0x0, 0x0},
{ 0x24, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2332,7 +2332,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_SILCOON] = {
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0x28, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2340,7 +2340,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_BEAUTIFLY] = {
{ 0x2d, 0x0, 0x0, 0x0, 0x0},
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0x12, 0x0, 0x0, 0x0, 0x0},
@@ -2348,7 +2348,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_CASCOON] = {
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0x27, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2356,7 +2356,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_DUSTOX] = {
{ 0x2c, 0x0, 0x0, 0x0, 0x0},
{ 0x17, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2364,7 +2364,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_LOTAD] = {
{ 0x18, 0x0, 0x0, 0x0, 0x0},
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2372,7 +2372,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_LOMBRE] = {
{ 0x18, 0x0, 0x0, 0x0, 0x0},
{ 0x3, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2380,7 +2380,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_LUDICOLO] = {
{ 0x27, 0x0, 0x0, 0x0, 0x0},
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0x1a, 0x0, 0x0, 0x0, 0x0},
@@ -2388,7 +2388,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_SEEDOT] = {
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2396,7 +2396,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_NUZLEAF] = {
{ 0x2c, 0x0, 0x0, 0x0, 0x0},
{ 0xe, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2404,7 +2404,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_SHIFTRY] = {
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2412,7 +2412,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_NINCADA] = {
{ 0xf, 0x0, 0x0, 0x0, 0x0},
{ 0x6, 0x0, 0x0, 0x0, 0x0},
{ 0x6, 0x0, 0x0, 0x0, 0x0},
@@ -2420,7 +2420,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_NINJASK] = {
{ 0xf, 0x0, 0x0, 0x0, 0x0},
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2428,7 +2428,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_SHEDINJA] = {
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0xf, 0x0, 0x0, 0x0, 0x0},
{ 0x2a, 0x0, 0x0, 0x0, 0x0},
@@ -2436,7 +2436,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_TAILLOW] = {
{ 0x3, 0x0, 0x0, 0x0, 0x0},
{ 0x1a, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2444,7 +2444,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_SWELLOW] = {
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0x18, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2452,7 +2452,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_SHROOMISH] = {
{ 0x27, 0x0, 0x0, 0x0, 0x0},
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2460,7 +2460,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_BRELOOM] = {
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0x27, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2468,7 +2468,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_SPINDA] = {
{ 0xf, 0x0, 0x0, 0x0, 0x0},
{ 0x2a, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2476,7 +2476,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_WINGULL] = {
{ 0xf, 0x0, 0x0, 0x0, 0x0},
{ 0x24, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2484,7 +2484,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_PELIPPER] = {
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x30, 0x0, 0x0, 0x0, 0x0},
@@ -2492,7 +2492,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_SURSKIT] = {
{ 0x30, 0x0, 0x0, 0x0, 0x0},
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2500,7 +2500,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_MASQUERAIN] = {
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0x30, 0x0, 0x0, 0x0, 0x0},
{ 0x3, 0x0, 0x0, 0x0, 0x0},
@@ -2508,7 +2508,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_WAILMER] = {
{ 0x5, 0x0, 0x0, 0x0, 0x0},
{ 0x30, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2516,7 +2516,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_WAILORD] = {
{ 0x3, 0x0, 0x0, 0x0, 0x0},
{ 0x1a, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2524,7 +2524,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_SKITTY] = {
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2532,7 +2532,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_DELCATTY] = {
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
@@ -2540,7 +2540,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_KECLEON] = {
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
@@ -2548,7 +2548,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_BALTOY] = {
{ 0x1, 0x0, 0x0, 0x0, 0x0},
{ 0x1e, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2556,7 +2556,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_CLAYDOL] = {
{ 0x3, 0x0, 0x0, 0x0, 0x0},
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2564,7 +2564,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_NOSEPASS] = {
{ 0x18, 0x0, 0x0, 0x0, 0x0},
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2572,7 +2572,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_TORKOAL] = {
{ 0x18, 0x0, 0x0, 0x0, 0x0},
{ 0x1a, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2580,7 +2580,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_SABLEYE] = {
{ 0x3, 0x0, 0x0, 0x0, 0x0},
{ 0xb, 0x0, 0x0, 0x0, 0x0},
{ 0x12, 0x0, 0x0, 0x0, 0x0},
@@ -2588,7 +2588,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_BARBOACH] = {
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
{ 0x18, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2596,7 +2596,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_WHISCASH] = {
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2604,7 +2604,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_LUVDISC] = {
{ 0x2c, 0x0, 0x0, 0x0, 0x0},
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2612,7 +2612,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_CORPHISH] = {
{ 0x18, 0x0, 0x0, 0x0, 0x0},
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2620,7 +2620,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_CRAWDAUNT] = {
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2628,7 +2628,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_FEEBAS] = {
{ 0xe, 0x0, 0x0, 0x0, 0x0},
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2636,7 +2636,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_MILOTIC] = {
{ 0x12, 0x0, 0x0, 0x0, 0x0},
{ 0x18, 0x0, 0x0, 0x0, 0x0},
{ 0x11, 0x0, 0x0, 0x0, 0x0},
@@ -2644,7 +2644,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_CARVANHA] = {
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
{ 0x1, 0x0, 0x0, 0x0, 0x0},
{ 0x2a, 0x0, 0x0, 0x0, 0x0},
@@ -2652,7 +2652,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_SHARPEDO] = {
{ 0x1d, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x18, 0x0, 0x0, 0x0, 0x0},
@@ -2660,7 +2660,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_TRAPINCH] = {
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0xf, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2668,7 +2668,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_VIBRAVA] = {
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
{ 0x2a, 0x0, 0x0, 0x0, 0x0},
@@ -2676,7 +2676,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_FLYGON] = {
{ 0x12, 0x0, 0x0, 0x0, 0x0},
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2684,7 +2684,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_MAKUHITA] = {
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
{ 0x27, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
@@ -2692,7 +2692,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_HARIYAMA] = {
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
@@ -2700,7 +2700,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_ELECTRIKE] = {
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0x12, 0x0, 0x0, 0x0, 0x0},
@@ -2708,7 +2708,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_MANECTRIC] = {
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0x11, 0x0, 0x0, 0x0, 0x0},
@@ -2716,7 +2716,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_NUMEL] = {
{ 0x2c, 0x0, 0x0, 0x0, 0x0},
{ 0xb, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2724,7 +2724,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_CAMERUPT] = {
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0x30, 0x0, 0x0, 0x0, 0x0},
{ 0x2a, 0x0, 0x0, 0x0, 0x0},
@@ -2732,7 +2732,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_SPHEAL] = {
{ 0xe, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2740,7 +2740,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_SEALEO] = {
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x18, 0x0, 0x0, 0x0, 0x0},
@@ -2748,7 +2748,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_WALREIN] = {
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
{ 0x3, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2756,7 +2756,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_CACNEA] = {
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x2a, 0x0, 0x0, 0x0, 0x0},
@@ -2764,7 +2764,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_CACTURNE] = {
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0x30, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2772,7 +2772,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_SNORUNT] = {
{ 0x18, 0x0, 0x0, 0x0, 0x0},
{ 0x2c, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2780,7 +2780,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_GLALIE] = {
{ 0x5, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2788,7 +2788,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_LUNATONE] = {
{ 0x27, 0x0, 0x0, 0x0, 0x0},
{ 0x2c, 0x0, 0x0, 0x0, 0x0},
{ 0x18, 0x0, 0x0, 0x0, 0x0},
@@ -2796,7 +2796,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_SOLROCK] = {
{ 0x18, 0x0, 0x0, 0x0, 0x0},
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2804,7 +2804,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_AZURILL] = {
{ 0x6, 0x0, 0x0, 0x0, 0x0},
{ 0x27, 0x0, 0x0, 0x0, 0x0},
{ 0xf, 0x0, 0x0, 0x0, 0x0},
@@ -2812,7 +2812,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_SPOINK] = {
{ 0x1e, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2820,7 +2820,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_GRUMPIG] = {
{ 0x2c, 0x0, 0x0, 0x0, 0x0},
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2828,7 +2828,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_PLUSLE] = {
{ 0x2a, 0x0, 0x0, 0x0, 0x0},
{ 0x24, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2836,7 +2836,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_MINUN] = {
{ 0x12, 0x0, 0x0, 0x0, 0x0},
{ 0x2a, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2844,7 +2844,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_MAWILE] = {
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
{ 0x12, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2852,7 +2852,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_MEDITITE] = {
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0x12, 0x0, 0x0, 0x0, 0x0},
@@ -2860,7 +2860,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_MEDICHAM] = {
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0x0, 0x0, 0x0, 0x0, 0x0},
@@ -2868,7 +2868,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_SWABLU] = {
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
{ 0x27, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2876,7 +2876,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_ALTARIA] = {
{ 0x6, 0x0, 0x0, 0x0, 0x0},
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
@@ -2884,7 +2884,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_WYNAUT] = {
{ 0x12, 0x0, 0x0, 0x0, 0x0},
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2892,7 +2892,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_DUSKULL] = {
{ 0x2a, 0x0, 0x0, 0x0, 0x0},
{ 0x26, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2900,7 +2900,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_DUSCLOPS] = {
{ 0x2a, 0x0, 0x0, 0x0, 0x0},
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2908,7 +2908,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_ROSELIA] = {
{ 0x18, 0x0, 0x0, 0x0, 0x0},
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
@@ -2916,7 +2916,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_SLAKOTH] = {
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2924,7 +2924,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_VIGOROTH] = {
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0x30, 0x0, 0x0, 0x0, 0x0},
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
@@ -2932,7 +2932,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_SLAKING] = {
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2940,7 +2940,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_GULPIN] = {
{ 0x24, 0x0, 0x0, 0x0, 0x0},
{ 0xf, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2948,7 +2948,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_SWALOT] = {
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2956,7 +2956,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_TROPIUS] = {
{ 0x18, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x2a, 0x0, 0x0, 0x0, 0x0},
@@ -2964,7 +2964,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_WHISMUR] = {
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0x30, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2972,7 +2972,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_LOUDRED] = {
{ 0x21, 0x0, 0x0, 0x0, 0x0},
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2980,7 +2980,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_EXPLOUD] = {
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0x21, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2988,7 +2988,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_CLAMPERL] = {
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0x32, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2996,7 +2996,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_HUNTAIL] = {
{ 0x2a, 0x0, 0x0, 0x0, 0x0},
{ 0x5, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -3004,7 +3004,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_GOREBYSS] = {
{ 0x1a, 0x0, 0x0, 0x0, 0x0},
{ 0x2c, 0x0, 0x0, 0x0, 0x0},
{ 0x11, 0x0, 0x0, 0x0, 0x0},
@@ -3012,7 +3012,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_ABSOL] = {
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0x18, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -3020,7 +3020,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_SHUPPET] = {
{ 0x2a, 0x0, 0x0, 0x0, 0x0},
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -3028,7 +3028,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_BANETTE] = {
{ 0x3, 0x0, 0x0, 0x0, 0x0},
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -3036,7 +3036,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_SEVIPER] = {
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0x12, 0x0, 0x0, 0x0, 0x0},
{ 0x30, 0x0, 0x0, 0x0, 0x0},
@@ -3044,7 +3044,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_ZANGOOSE] = {
{ 0x3, 0x0, 0x0, 0x0, 0x0},
{ 0x27, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -3052,7 +3052,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_RELICANTH] = {
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0x0, 0x0, 0x0, 0x0, 0x0},
@@ -3060,7 +3060,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_ARON] = {
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
{ 0x1d, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -3068,7 +3068,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_LAIRON] = {
{ 0x5, 0x0, 0x0, 0x0, 0x0},
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -3076,7 +3076,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_AGGRON] = {
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -3084,7 +3084,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_CASTFORM] = {
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0x1a, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -3092,7 +3092,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_VOLBEAT] = {
{ 0x18, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -3100,7 +3100,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_ILLUMISE] = {
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x27, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
@@ -3108,7 +3108,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_LILEEP] = {
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -3116,7 +3116,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_CRADILY] = {
{ 0x3, 0x0, 0x0, 0x0, 0x0},
{ 0x11, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
@@ -3124,7 +3124,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_ANORITH] = {
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0x18, 0x0, 0x0, 0x0, 0x0},
{ 0x11, 0x0, 0x0, 0x0, 0x0},
@@ -3132,7 +3132,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_ARMALDO] = {
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
{ 0x18, 0x0, 0x0, 0x0, 0x0},
@@ -3140,7 +3140,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_RALTS] = {
{ 0x7, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -3148,7 +3148,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_KIRLIA] = {
{ 0x30, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x2a, 0x0, 0x0, 0x0, 0x0},
@@ -3156,7 +3156,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_GARDEVOIR] = {
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
@@ -3164,7 +3164,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_BAGON] = {
{ 0x5, 0x0, 0x0, 0x0, 0x0},
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -3172,7 +3172,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_SHELGON] = {
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -3180,7 +3180,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_SALAMENCE] = {
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0x9, 0x0, 0x0, 0x0, 0x0},
@@ -3188,7 +3188,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_BELDUM] = {
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0x2a, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -3196,7 +3196,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_METANG] = {
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -3204,7 +3204,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_METAGROSS] = {
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0x2a, 0x0, 0x0, 0x0, 0x0},
{ 0x18, 0x0, 0x0, 0x0, 0x0},
@@ -3212,7 +3212,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_REGIROCK] = {
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
@@ -3220,7 +3220,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_REGICE] = {
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x12, 0x0, 0x0, 0x0, 0x0},
@@ -3228,7 +3228,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_REGISTEEL] = {
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0xe, 0x0, 0x0, 0x0, 0x0},
@@ -3236,7 +3236,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_KYOGRE] = {
{ 0x12, 0x0, 0x0, 0x0, 0x0},
{ 0x18, 0x0, 0x0, 0x0, 0x0},
{ 0x30, 0x0, 0x0, 0x0, 0x0},
@@ -3244,7 +3244,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_GROUDON] = {
{ 0x21, 0x0, 0x0, 0x0, 0x0},
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
{ 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -3252,7 +3252,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_RAYQUAZA] = {
{ 0x3, 0x0, 0x0, 0x0, 0x0},
{ 0x3, 0x0, 0x0, 0x0, 0x0},
{ 0x2a, 0x0, 0x0, 0x0, 0x0},
@@ -3260,7 +3260,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_LATIAS] = {
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x0, 0x0, 0x0, 0x0, 0x0},
@@ -3268,7 +3268,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_LATIOS] = {
{ 0x0, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x18, 0x0, 0x0, 0x0, 0x0},
@@ -3276,7 +3276,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_JIRACHI] = {
{ 0x30, 0x0, 0x0, 0x0, 0x0},
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
{ 0xc, 0x0, 0x0, 0x0, 0x0},
@@ -3284,7 +3284,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_DEOXYS] = {
{ 0xc, 0x0, 0x0, 0x0, 0x0},
{ 0x1b, 0x0, 0x0, 0x0, 0x0},
{ 0x11, 0x0, 0x0, 0x0, 0x0},
@@ -3292,7 +3292,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
- {
+ [SPECIES_CHIMECHO] = {
{ 0x12, 0x0, 0x0, 0x0, 0x0},
{ 0x9, 0x0, 0x0, 0x0, 0x0},
{ 0x18, 0x0, 0x0, 0x0, 0x0},
diff --git a/src/data/bard_music/word_pitch.h b/src/data/bard_music/word_pitch.h
index 54a87acc9..35527017c 100644
--- a/src/data/bard_music/word_pitch.h
+++ b/src/data/bard_music/word_pitch.h
@@ -1,182 +1,186 @@
#ifndef GUARD_WORD_PITCH_H
#define GUARD_WORD_PITCH_H
-const s16 gUnknown_0860A1C0[] = {
- -0x300, 0x1800
+#define PITCH_END 0x1800
+
+static const s16 sPitch1_0[] = {
+ -0x300, PITCH_END
};
-const s16 gUnknown_0860A1C4[] = {
- 0x0900, 0x1800
+static const s16 sPitch1_1[] = {
+ 0x0900, PITCH_END
};
-const s16 gUnknown_0860A1C8[] = {
- 0x0100, 0x1800
+static const s16 sPitch1_2[] = {
+ 0x0100, PITCH_END
};
-const s16 gUnknown_0860A1CC[] = {
- 0x0400, 0x1800
+static const s16 sPitch1_3[] = {
+ 0x0400, PITCH_END
};
-const s16 gUnknown_0860A1D0[] = {
- 0x0b00, 0x1800
+static const s16 sPitch1_4[] = {
+ 0x0b00, PITCH_END
};
-const s16 gUnknown_0860A1D4[] = {
- -0x300, -0x100, 0x1800
+static const s16 sPitch2_0[] = {
+ -0x300, -0x100, PITCH_END
};
-const s16 gUnknown_0860A1DA[] = {
- -0x300, 0x0200, 0x1800
+static const s16 sPitch2_1[] = {
+ -0x300, 0x0200, PITCH_END
};
-const s16 gUnknown_0860A1E0[] = {
- 0x0200, 0x0400, 0x1800
+static const s16 sPitch2_2[] = {
+ 0x0200, 0x0400, PITCH_END
};
-const s16 gUnknown_0860A1E6[] = {
- 0x0600, 0x0800, 0x1800
+static const s16 sPitch2_3[] = {
+ 0x0600, 0x0800, PITCH_END
};
-const s16 gUnknown_0860A1EC[] = {
- 0x0900, 0x0800, 0x1800
+static const s16 sPitch2_4[] = {
+ 0x0900, 0x0800, PITCH_END
};
-const s16 gUnknown_0860A1F2[] = {
- -0x300, -0x100, -0x300, 0x1800
+static const s16 sPitch3_0[] = {
+ -0x300, -0x100, -0x300, PITCH_END
};
-const s16 gUnknown_0860A1FA[] = {
- 0x0400, -0x300, 0x0400, 0x1800
+static const s16 sPitch3_1[] = {
+ 0x0400, -0x300, 0x0400, PITCH_END
};
-const s16 gUnknown_0860A202[] = {
- 0x0900, 0x0800, 0x0600, 0x1800
+static const s16 sPitch3_2[] = {
+ 0x0900, 0x0800, 0x0600, PITCH_END
};
-const s16 gUnknown_0860A20A[] = {
- 0x0100, 0x0200, 0x0400, 0x1800
+static const s16 sPitch3_3[] = {
+ 0x0100, 0x0200, 0x0400, PITCH_END
};
-const s16 gUnknown_0860A212[] = {
- 0x0600, 0x1000, 0x0d00, 0x1800
+static const s16 sPitch3_4[] = {
+ 0x0600, 0x1000, 0x0d00, PITCH_END
};
-const s16 gUnknown_0860A21A[] = {
- 0x0400, 0x0900, 0x0400, 0x0900, 0x1800
+static const s16 sPitch4_0[] = {
+ 0x0400, 0x0900, 0x0400, 0x0900, PITCH_END
};
-const s16 gUnknown_0860A224[] = {
- 0x0900, 0x0400, 0x0d00, 0x0400, 0x1800
+static const s16 sPitch4_1[] = {
+ 0x0900, 0x0400, 0x0d00, 0x0400, PITCH_END
};
-const s16 gUnknown_0860A22E[] = {
- 0x0100, 0x0200, 0x0400, 0x0600, 0x1800
+static const s16 sPitch4_2[] = {
+ 0x0100, 0x0200, 0x0400, 0x0600, PITCH_END
};
-const s16 gUnknown_0860A238[] = {
- 0x0800, 0x0600, 0x0400, 0x0200, 0x1800
+static const s16 sPitch4_3[] = {
+ 0x0800, 0x0600, 0x0400, 0x0200, PITCH_END
};
-const s16 gUnknown_0860A242[] = {
- 0x0f00, 0x0d00, 0x0b00, 0x0a00, 0x1800
+static const s16 sPitch4_4[] = {
+ 0x0f00, 0x0d00, 0x0b00, 0x0a00, PITCH_END
};
-const s16 gUnknown_0860A24C[] = {
- -0x300, -0x100, 0x0100, 0x0200, 0x0400, 0x1800
+static const s16 sPitch5_0[] = {
+ -0x300, -0x100, 0x0100, 0x0200, 0x0400, PITCH_END
};
-const s16 gUnknown_0860A258[] = {
- 0x0900, 0x0800, 0x0600, 0x0400, 0x0200, 0x1800
+static const s16 sPitch5_1[] = {
+ 0x0900, 0x0800, 0x0600, 0x0400, 0x0200, PITCH_END
};
-const s16 gUnknown_0860A264[] = {
- 0x0100, 0x0400, 0x0900, 0x0400, 0x0100, 0x1800
+static const s16 sPitch5_2[] = {
+ 0x0100, 0x0400, 0x0900, 0x0400, 0x0100, PITCH_END
};
-const s16 gUnknown_0860A270[] = {
- 0x0900, 0x0400, 0x0900, 0x0400, -0x300, 0x1800
+static const s16 sPitch5_3[] = {
+ 0x0900, 0x0400, 0x0900, 0x0400, -0x300, PITCH_END
};
-const s16 gUnknown_0860A27C[] = {
- 0x0b00, 0x0800, 0x0400, 0x0400, 0x0600, 0x1800
+static const s16 sPitch5_4[] = {
+ 0x0b00, 0x0800, 0x0400, 0x0400, 0x0600, PITCH_END
};
-const s16 gUnknown_0860A288[] = {
- -0x300, -0x100, 0x0100, 0x0200, 0x0400, 0x0600, 0x1800
+static const s16 sPitch6_0[] = {
+ -0x300, -0x100, 0x0100, 0x0200, 0x0400, 0x0600, PITCH_END
};
-const s16 gUnknown_0860A296[] = {
- 0x0800, 0x0600, 0x0400, 0x0200, 0x0100, -0x100, 0x1800
+static const s16 sPitch6_1[] = {
+ 0x0800, 0x0600, 0x0400, 0x0200, 0x0100, -0x100, PITCH_END
};
-const s16 gUnknown_0860A2A4[] = {
- 0x0100, 0x0200, 0x0400, 0x0100, 0x0200, 0x1000, 0x1800
+static const s16 sPitch6_2[] = {
+ 0x0100, 0x0200, 0x0400, 0x0100, 0x0200, 0x1000, PITCH_END
};
-const s16 gUnknown_0860A2B2[] = {
- 0x0400, -0x300, 0x0900, 0x0400, 0x0900, 0x0400, 0x1800
+static const s16 sPitch6_3[] = {
+ 0x0400, -0x300, 0x0900, 0x0400, 0x0900, 0x0400, PITCH_END
};
-const s16 gUnknown_0860A2C0[] = {
- 0x0800, 0x0900, 0x0800, 0x0900, 0x0800, 0x0900, 0x1800
+static const s16 sPitch6_4[] = {
+ 0x0800, 0x0900, 0x0800, 0x0900, 0x0800, 0x0900, PITCH_END
};
-const s16 gUnknown_0860A2CE[] = {
- 0x0200, 0x0100, 0x0200, 0x0100, 0x0200, 0x0400, 0x0200, 0x1800
+static const s16 sPitch7_0[] = {
+ 0x0200, 0x0100, 0x0200, 0x0100, 0x0200, 0x0400, 0x0200, PITCH_END
};
-const s16 gUnknown_0860A2DE[] = {
- 0x0100, 0x0100, -0x100, -0x100, -0x300, 0x0400, -0x300, 0x1800
+static const s16 sPitch7_1[] = {
+ 0x0100, 0x0100, -0x100, -0x100, -0x300, 0x0400, -0x300, PITCH_END
};
-const s16 gUnknown_0860A2EE[] = {
- 0x0800, 0x0900, 0x0b00, 0x0d00, 0x0e00, 0x0d00, 0x0b00, 0x1800
+static const s16 sPitch7_2[] = {
+ 0x0800, 0x0900, 0x0b00, 0x0d00, 0x0e00, 0x0d00, 0x0b00, PITCH_END
};
-const s16 gUnknown_0860A2FE[] = {
- 0x0800, 0x0600, 0x0400, 0x0200, 0x0d00, 0x0b00, 0x0900, 0x1800
+static const s16 sPitch7_3[] = {
+ 0x0800, 0x0600, 0x0400, 0x0200, 0x0d00, 0x0b00, 0x0900, PITCH_END
};
-const s16 gUnknown_0860A30E[] = {
- 0x0300, 0x0400, 0x0600, 0x0800, 0x0700, 0x0800, 0x0400, 0x1800
+static const s16 sPitch7_4[] = {
+ 0x0300, 0x0400, 0x0600, 0x0800, 0x0700, 0x0800, 0x0400, PITCH_END
};
-const s16 *const gBardSoundPitchTables[] = {
- gUnknown_0860A1C0,
- gUnknown_0860A1C4,
- gUnknown_0860A1C8,
- gUnknown_0860A1CC,
- gUnknown_0860A1D0,
- gUnknown_0860A1D4,
- gUnknown_0860A1DA,
- gUnknown_0860A1E0,
- gUnknown_0860A1E6,
- gUnknown_0860A1EC,
- gUnknown_0860A1F2,
- gUnknown_0860A1FA,
- gUnknown_0860A202,
- gUnknown_0860A20A,
- gUnknown_0860A212,
- gUnknown_0860A21A,
- gUnknown_0860A224,
- gUnknown_0860A22E,
- gUnknown_0860A238,
- gUnknown_0860A242,
- gUnknown_0860A24C,
- gUnknown_0860A258,
- gUnknown_0860A264,
- gUnknown_0860A270,
- gUnknown_0860A27C,
- gUnknown_0860A288,
- gUnknown_0860A296,
- gUnknown_0860A2A4,
- gUnknown_0860A2B2,
- gUnknown_0860A2C0,
- gUnknown_0860A2CE,
- gUnknown_0860A2DE,
- gUnknown_0860A2EE,
- gUnknown_0860A2FE,
- gUnknown_0860A30E
+// Only sPitch7_# are used below
+// This table is always indexed with (x + 30), where x is some value 0 - 4
+static const s16 *const sBardSoundPitchTables[] = {
+ sPitch1_0,
+ sPitch1_1,
+ sPitch1_2,
+ sPitch1_3,
+ sPitch1_4,
+ sPitch2_0,
+ sPitch2_1,
+ sPitch2_2,
+ sPitch2_3,
+ sPitch2_4,
+ sPitch3_0,
+ sPitch3_1,
+ sPitch3_2,
+ sPitch3_3,
+ sPitch3_4,
+ sPitch4_0,
+ sPitch4_1,
+ sPitch4_2,
+ sPitch4_3,
+ sPitch4_4,
+ sPitch5_0,
+ sPitch5_1,
+ sPitch5_2,
+ sPitch5_3,
+ sPitch5_4,
+ sPitch6_0,
+ sPitch6_1,
+ sPitch6_2,
+ sPitch6_3,
+ sPitch6_4,
+ sPitch7_0,
+ sPitch7_1,
+ sPitch7_2,
+ sPitch7_3,
+ sPitch7_4
};
diff --git a/src/data/object_events/movement_type_func_tables.h b/src/data/object_events/movement_type_func_tables.h
index 7d149a628..68dfeb730 100755
--- a/src/data/object_events/movement_type_func_tables.h
+++ b/src/data/object_events/movement_type_func_tables.h
@@ -63,11 +63,11 @@ u8 (*const gMovementTypeFuncs_FaceDirection[])(struct ObjectEvent *, struct Spri
};
u8 (*const gMovementTypeFuncs_BerryTreeGrowth[])(struct ObjectEvent *, struct Sprite *) = {
- MovementType_BerryTreeGrowth_Step0,
- MovementType_BerryTreeGrowth_Step1,
- MovementType_BerryTreeGrowth_Step2,
- MovementType_BerryTreeGrowth_Step3,
- MovementType_BerryTreeGrowth_Step4,
+ MovementType_BerryTreeGrowth_Normal,
+ MovementType_BerryTreeGrowth_Move,
+ MovementType_BerryTreeGrowth_SparkleStart,
+ MovementType_BerryTreeGrowth_Sparkle,
+ MovementType_BerryTreeGrowth_SparkleEnd,
};
u8 (*const gMovementTypeFuncs_FaceDownAndUp[])(struct ObjectEvent *, struct Sprite *) = {
diff --git a/src/easy_chat.c b/src/easy_chat.c
index 6bb77bc84..fa3d4472a 100644
--- a/src/easy_chat.c
+++ b/src/easy_chat.c
@@ -4876,7 +4876,7 @@ bool8 sub_811EAA4(u16 easyChatWord)
}
}
-bool8 ECWord_CheckIfOutsideOfValidRange(u16 easyChatWord)
+bool8 IsBardWordInvalid(u16 easyChatWord)
{
int numWordsInGroup;
u8 groupId = EC_GROUP(easyChatWord);
@@ -4888,11 +4888,11 @@ bool8 ECWord_CheckIfOutsideOfValidRange(u16 easyChatWord)
{
case EC_GROUP_POKEMON:
case EC_GROUP_POKEMON_2:
- numWordsInGroup = gNumSpeciesNames;
+ numWordsInGroup = gNumBardWords_Species;
break;
case EC_GROUP_MOVE_1:
case EC_GROUP_MOVE_2:
- numWordsInGroup = gUnknown_085FA1D4;
+ numWordsInGroup = gNumBardWords_Moves;
break;
default:
numWordsInGroup = gEasyChatGroups[groupId].numWords;
diff --git a/src/event_object_lock.c b/src/event_object_lock.c
index 67652a99b..dec2d7906 100644
--- a/src/event_object_lock.c
+++ b/src/event_object_lock.c
@@ -16,18 +16,19 @@ bool8 IsPlayerStandingStill(void)
return TRUE;
}
-static void sub_80983A4(u8 taskId)
+// Freeze player once their movement is finished
+static void Task_FreezePlayer(u8 taskId)
{
if (IsPlayerStandingStill())
{
- sub_808B864();
+ PlayerFreeze();
DestroyTask(taskId);
}
}
-bool8 sub_80983C4(void)
+bool8 IsFreezePlayerFinished(void)
{
- if (FuncIsActiveTask(sub_80983A4))
+ if (FuncIsActiveTask(Task_FreezePlayer))
{
return FALSE;
}
@@ -42,30 +43,35 @@ bool8 sub_80983C4(void)
void ScriptFreezeObjectEvents(void)
{
FreezeObjectEvents();
- CreateTask(sub_80983A4, 80);
+ CreateTask(Task_FreezePlayer, 80);
}
-static void sub_8098400(u8 taskId)
+#define tPlayerFrozen data[0]
+#define tObjectFrozen data[1]
+#define tObjectId data[2]
+
+// Freeze selected object and player once their movement is finished
+static void Task_FreezeSelectedObjectAndPlayer(u8 taskId)
{
struct Task *task = &gTasks[taskId];
- if (!task->data[0] && IsPlayerStandingStill() == TRUE)
+ if (!task->tPlayerFrozen && IsPlayerStandingStill() == TRUE)
{
- sub_808B864();
- task->data[0] = 1;
+ PlayerFreeze();
+ task->tPlayerFrozen = TRUE;
}
- if (!task->data[1] && !gObjectEvents[gSelectedObjectEvent].singleMovementActive)
+ if (!task->tObjectFrozen && !gObjectEvents[gSelectedObjectEvent].singleMovementActive)
{
FreezeObjectEvent(&gObjectEvents[gSelectedObjectEvent]);
- task->data[1] = 1;
+ task->tObjectFrozen = TRUE;
}
- if (task->data[0] && task->data[1])
+ if (task->tPlayerFrozen && task->tObjectFrozen)
DestroyTask(taskId);
}
-bool8 sub_809847C(void)
+bool8 IsFreezeSelectedObjectAndPlayerFinished(void)
{
- if (FuncIsActiveTask(sub_8098400))
+ if (FuncIsActiveTask(Task_FreezeSelectedObjectAndPlayer))
{
return FALSE;
}
@@ -80,11 +86,11 @@ void LockSelectedObjectEvent(void)
{
u8 taskId;
FreezeObjectEventsExceptOne(gSelectedObjectEvent);
- taskId = CreateTask(sub_8098400, 80);
+ taskId = CreateTask(Task_FreezeSelectedObjectAndPlayer, 80);
if (!gObjectEvents[gSelectedObjectEvent].singleMovementActive)
{
FreezeObjectEvent(&gObjectEvents[gSelectedObjectEvent]);
- gTasks[taskId].data[1] = 1;
+ gTasks[taskId].tObjectFrozen = TRUE;
}
}
@@ -118,64 +124,71 @@ void Script_ClearHeldMovement(void)
ObjectEventClearHeldMovementIfActive(&gObjectEvents[gSelectedObjectEvent]);
}
-static void sub_80985BC(u8 taskId)
+// Freeze designated object and player once their movement is finished
+static void Task_FreezeObjectAndPlayer(u8 taskId)
{
struct Task *task = &gTasks[taskId];
- u8 objectEventId = task->data[2];
+ u8 objectEventId = task->tObjectId;
- if (!task->data[0] && IsPlayerStandingStill() == TRUE)
+ if (!task->tPlayerFrozen && IsPlayerStandingStill() == TRUE)
{
- sub_808B864();
- task->data[0] = 1;
+ PlayerFreeze();
+ task->tPlayerFrozen = TRUE;
}
- if (!task->data[1] && !gObjectEvents[objectEventId].singleMovementActive)
+ if (!task->tObjectFrozen && !gObjectEvents[objectEventId].singleMovementActive)
{
FreezeObjectEvent(&gObjectEvents[objectEventId]);
- task->data[1] = 1;
+ task->tObjectFrozen = TRUE;
}
- if (task->data[0] && task->data[1])
+ if (task->tPlayerFrozen && task->tObjectFrozen)
DestroyTask(taskId);
}
-void sub_8098630(void)
+void FreezeForApproachingTrainers(void)
{
u8 trainerObjectId1, trainerObjectId2, taskId;
trainerObjectId1 = GetChosenApproachingTrainerObjectEventId(0);
- if(gNoOfApproachingTrainers == 2)
+
+ if (gNoOfApproachingTrainers == 2)
{
+ // Get second trainer, freeze all other objects
trainerObjectId2 = GetChosenApproachingTrainerObjectEventId(1);
- sub_8098074(trainerObjectId1, trainerObjectId2);
- taskId = CreateTask(sub_80985BC, 80);
- gTasks[taskId].data[2] = trainerObjectId1;
- if(!gObjectEvents[trainerObjectId1].singleMovementActive)
+ FreezeObjectEventsExceptTwo(trainerObjectId1, trainerObjectId2);
+
+ // Start task to freeze trainer 1 (and player) after movement
+ taskId = CreateTask(Task_FreezeObjectAndPlayer, 80);
+ gTasks[taskId].tObjectId = trainerObjectId1;
+ if (!gObjectEvents[trainerObjectId1].singleMovementActive)
{
FreezeObjectEvent(&gObjectEvents[trainerObjectId1]);
- gTasks[taskId].data[1] = 1;
+ gTasks[taskId].tObjectFrozen = TRUE;
}
- taskId = CreateTask(sub_80985BC, 81);
- gTasks[taskId].data[2] = trainerObjectId2;
- if(!gObjectEvents[trainerObjectId2].singleMovementActive)
+
+ // Start task to freeze trainer 2 after movement
+ taskId = CreateTask(Task_FreezeObjectAndPlayer, 81);
+ gTasks[taskId].tObjectId = trainerObjectId2;
+ if (!gObjectEvents[trainerObjectId2].singleMovementActive)
{
FreezeObjectEvent(&gObjectEvents[trainerObjectId2]);
- gTasks[taskId].data[1] = 1;
+ gTasks[taskId].tObjectFrozen = TRUE;
}
}
else
{
FreezeObjectEventsExceptOne(trainerObjectId1);
- taskId = CreateTask(sub_80985BC, 80);
- gTasks[taskId].data[2] = trainerObjectId1;
- if(!gObjectEvents[trainerObjectId1].singleMovementActive)
+ taskId = CreateTask(Task_FreezeObjectAndPlayer, 80);
+ gTasks[taskId].tObjectId = trainerObjectId1;
+ if (!gObjectEvents[trainerObjectId1].singleMovementActive)
{
FreezeObjectEvent(&gObjectEvents[trainerObjectId1]);
- gTasks[taskId].data[1] = 1;
+ gTasks[taskId].tObjectFrozen = TRUE;
}
}
}
-bool8 sub_8098734(void)
+bool8 IsFreezeObjectAndPlayerFinished(void)
{
- if (FuncIsActiveTask(sub_80985BC))
+ if (FuncIsActiveTask(Task_FreezeObjectAndPlayer))
{
return FALSE;
}
@@ -185,3 +198,7 @@ bool8 sub_8098734(void)
return TRUE;
}
}
+
+#undef tPlayerFrozen
+#undef tObjectFrozen
+#undef tObjectId
diff --git a/src/event_object_movement.c b/src/event_object_movement.c
index d9c06eb10..f6e638f31 100644
--- a/src/event_object_movement.c
+++ b/src/event_object_movement.c
@@ -1834,7 +1834,7 @@ void PlayerObjectTurn(struct PlayerAvatar *playerAvatar, u8 direction)
ObjectEventTurn(&gObjectEvents[playerAvatar->objectEventId], direction);
}
-static void get_berry_tree_graphics(struct ObjectEvent *objectEvent, struct Sprite *sprite)
+static void SetBerryTreeGraphics(struct ObjectEvent *objectEvent, struct Sprite *sprite)
{
u8 berryStage;
u8 berryId;
@@ -1842,7 +1842,7 @@ static void get_berry_tree_graphics(struct ObjectEvent *objectEvent, struct Spri
objectEvent->invisible = TRUE;
sprite->invisible = TRUE;
berryStage = GetStageByBerryTreeId(objectEvent->trainerRange_berryTreeId);
- if (berryStage != 0)
+ if (berryStage != BERRY_STAGE_NO_BERRY)
{
objectEvent->invisible = FALSE;
sprite->invisible = FALSE;
@@ -1888,13 +1888,13 @@ static void SetObjectEventDynamicGraphicsId(struct ObjectEvent *objectEvent)
}
}
-void npc_by_local_id_and_map_set_field_1_bit_x20(u8 localId, u8 mapNum, u8 mapGroup, u8 state)
+void SetObjectInvisibility(u8 localId, u8 mapNum, u8 mapGroup, bool8 invisible)
{
u8 objectEventId;
if (!TryGetObjectEventIdByLocalIdAndMap(localId, mapNum, mapGroup, &objectEventId))
{
- gObjectEvents[objectEventId].invisible = state;
+ gObjectEvents[objectEventId].invisible = invisible;
}
}
@@ -1918,7 +1918,7 @@ void sub_808E75C(s16 x, s16 y)
}
}
-void sub_808E78C(u8 localId, u8 mapNum, u8 mapGroup, u8 subpriority)
+void SetObjectPriority(u8 localId, u8 mapNum, u8 mapGroup, u8 subpriority)
{
u8 objectEventId;
struct ObjectEvent *objectEvent;
@@ -1933,7 +1933,7 @@ void sub_808E78C(u8 localId, u8 mapNum, u8 mapGroup, u8 subpriority)
}
}
-void sub_808E7E4(u8 localId, u8 mapNum, u8 mapGroup)
+void ResetObjectPriority(u8 localId, u8 mapNum, u8 mapGroup)
{
u8 objectEventId;
struct ObjectEvent *objectEvent;
@@ -2595,7 +2595,7 @@ bool8 MovementType_WanderAround_Step4(struct ObjectEvent *objectEvent, struct Sp
bool8 MovementType_WanderAround_Step5(struct ObjectEvent *objectEvent, struct Sprite *sprite)
{
ObjectEventSetSingleMovement(objectEvent, sprite, GetWalkNormalMovementAction(objectEvent->movementDirection));
- objectEvent->singleMovementActive = 1;
+ objectEvent->singleMovementActive = TRUE;
sprite->data[1] = 6;
return TRUE;
}
@@ -2604,7 +2604,7 @@ bool8 MovementType_WanderAround_Step6(struct ObjectEvent *objectEvent, struct Sp
{
if (ObjectEventExecSingleMovementAction(objectEvent, sprite))
{
- objectEvent->singleMovementActive = 0;
+ objectEvent->singleMovementActive = FALSE;
sprite->data[1] = 1;
}
return FALSE;
@@ -2880,7 +2880,7 @@ bool8 MovementType_LookAround_Step2(struct ObjectEvent *objectEvent, struct Spri
if (ObjectEventExecSingleMovementAction(objectEvent, sprite))
{
SetMovementDelay(sprite, gMovementDelaysMedium[Random() & 3]);
- objectEvent->singleMovementActive = 0;
+ objectEvent->singleMovementActive = FALSE;
sprite->data[1] = 3;
}
return FALSE;
@@ -2964,7 +2964,7 @@ bool8 MovementType_WanderUpAndDown_Step4(struct ObjectEvent *objectEvent, struct
bool8 MovementType_WanderUpAndDown_Step5(struct ObjectEvent *objectEvent, struct Sprite *sprite)
{
ObjectEventSetSingleMovement(objectEvent, sprite, GetWalkNormalMovementAction(objectEvent->movementDirection));
- objectEvent->singleMovementActive = 1;
+ objectEvent->singleMovementActive = TRUE;
sprite->data[1] = 6;
return TRUE;
}
@@ -2973,7 +2973,7 @@ bool8 MovementType_WanderUpAndDown_Step6(struct ObjectEvent *objectEvent, struct
{
if (ObjectEventExecSingleMovementAction(objectEvent, sprite))
{
- objectEvent->singleMovementActive = 0;
+ objectEvent->singleMovementActive = FALSE;
sprite->data[1] = 1;
}
return FALSE;
@@ -3033,7 +3033,7 @@ bool8 MovementType_WanderLeftAndRight_Step4(struct ObjectEvent *objectEvent, str
bool8 MovementType_WanderLeftAndRight_Step5(struct ObjectEvent *objectEvent, struct Sprite *sprite)
{
ObjectEventSetSingleMovement(objectEvent, sprite, GetWalkNormalMovementAction(objectEvent->movementDirection));
- objectEvent->singleMovementActive = 1;
+ objectEvent->singleMovementActive = TRUE;
sprite->data[1] = 6;
return TRUE;
}
@@ -3042,7 +3042,7 @@ bool8 MovementType_WanderLeftAndRight_Step6(struct ObjectEvent *objectEvent, str
{
if (ObjectEventExecSingleMovementAction(objectEvent, sprite))
{
- objectEvent->singleMovementActive = 0;
+ objectEvent->singleMovementActive = FALSE;
sprite->data[1] = 1;
}
return FALSE;
@@ -3070,39 +3070,58 @@ bool8 MovementType_FaceDirection_Step1(struct ObjectEvent *objectEvent, struct S
bool8 MovementType_FaceDirection_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite)
{
- objectEvent->singleMovementActive = 0;
+ objectEvent->singleMovementActive = FALSE;
return FALSE;
}
static bool8 ObjectEventCB2_BerryTree(struct ObjectEvent *objectEvent, struct Sprite *sprite);
extern bool8 (*const gMovementTypeFuncs_BerryTreeGrowth[])(struct ObjectEvent *objectEvent, struct Sprite *sprite);
+
+enum {
+ BERRYTREEFUNC_NORMAL,
+ BERRYTREEFUNC_MOVE,
+ BERRYTREEFUNC_SPARKLE_START,
+ BERRYTREEFUNC_SPARKLE,
+ BERRYTREEFUNC_SPARKLE_END,
+};
+
+#define sObjEventId data[0]
+#define sFuncId data[1]
+#define sTimer data[2]
+#define sBerryTreeFlags data[7]
+
+#define BERRY_FLAG_SET_GFX (1 << 0)
+#define BERRY_FLAG_SPARKLING (1 << 1)
+#define BERRY_FLAG_JUST_PICKED (1 << 2)
+
void MovementType_BerryTreeGrowth(struct Sprite *sprite)
{
struct ObjectEvent *objectEvent;
- objectEvent = &gObjectEvents[sprite->data[0]];
- if (!(sprite->data[7] & 1))
+ objectEvent = &gObjectEvents[sprite->sObjEventId];
+ if (!(sprite->sBerryTreeFlags & BERRY_FLAG_SET_GFX))
{
- get_berry_tree_graphics(objectEvent, sprite);
- sprite->data[7] |= 1;
+ SetBerryTreeGraphics(objectEvent, sprite);
+ sprite->sBerryTreeFlags |= BERRY_FLAG_SET_GFX;
}
UpdateObjectEventCurrentMovement(objectEvent, sprite, ObjectEventCB2_BerryTree);
}
static bool8 ObjectEventCB2_BerryTree(struct ObjectEvent *objectEvent, struct Sprite *sprite)
{
- return gMovementTypeFuncs_BerryTreeGrowth[sprite->data[1]](objectEvent, sprite);
+ return gMovementTypeFuncs_BerryTreeGrowth[sprite->sFuncId](objectEvent, sprite);
}
-bool8 MovementType_BerryTreeGrowth_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite)
+// BERRYTREEFUNC_NORMAL
+bool8 MovementType_BerryTreeGrowth_Normal(struct ObjectEvent *objectEvent, struct Sprite *sprite)
{
u8 berryStage;
ClearObjectEventMovement(objectEvent, sprite);
objectEvent->invisible = TRUE;
sprite->invisible = TRUE;
berryStage = GetStageByBerryTreeId(objectEvent->trainerRange_berryTreeId);
- if (berryStage == 0)
+ if (berryStage == BERRY_STAGE_NO_BERRY)
{
- if (!(sprite->data[7] & 4) && sprite->animNum == 4)
+ if (!(sprite->sBerryTreeFlags & BERRY_FLAG_JUST_PICKED) && sprite->animNum == BERRY_STAGE_FLOWERING)
{
gFieldEffectArguments[0] = objectEvent->currentCoords.x;
gFieldEffectArguments[1] = objectEvent->currentCoords.y;
@@ -3115,34 +3134,36 @@ bool8 MovementType_BerryTreeGrowth_Step0(struct ObjectEvent *objectEvent, struct
}
objectEvent->invisible = FALSE;
sprite->invisible = FALSE;
- berryStage --;
+ berryStage--;
if (sprite->animNum != berryStage)
{
- sprite->data[1] = 2;
+ sprite->sFuncId = BERRYTREEFUNC_SPARKLE_START;
return TRUE;
}
- get_berry_tree_graphics(objectEvent, sprite);
+ SetBerryTreeGraphics(objectEvent, sprite);
ObjectEventSetSingleMovement(objectEvent, sprite, MOVEMENT_ACTION_START_ANIM_IN_DIRECTION);
- sprite->data[1] = 1;
+ sprite->sFuncId = BERRYTREEFUNC_MOVE;
return TRUE;
}
-bool8 MovementType_BerryTreeGrowth_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite)
+// BERRYTREEFUNC_MOVE
+bool8 MovementType_BerryTreeGrowth_Move(struct ObjectEvent *objectEvent, struct Sprite *sprite)
{
if (ObjectEventExecSingleMovementAction(objectEvent, sprite))
{
- sprite->data[1] = 0;
+ sprite->sFuncId = BERRYTREEFUNC_NORMAL;
return TRUE;
}
return FALSE;
}
-bool8 MovementType_BerryTreeGrowth_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite)
+// BERRYTREEFUNC_SPARKLE_START
+bool8 MovementType_BerryTreeGrowth_SparkleStart(struct ObjectEvent *objectEvent, struct Sprite *sprite)
{
- objectEvent->singleMovementActive = 1;
- sprite->data[1] = 3;
- sprite->data[2] = 0;
- sprite->data[7] |= 2;
+ objectEvent->singleMovementActive = TRUE;
+ sprite->sFuncId = BERRYTREEFUNC_SPARKLE;
+ sprite->sTimer = 0;
+ sprite->sBerryTreeFlags |= BERRY_FLAG_SPARKLING;
gFieldEffectArguments[0] = objectEvent->currentCoords.x;
gFieldEffectArguments[1] = objectEvent->currentCoords.y;
gFieldEffectArguments[2] = sprite->subpriority - 1;
@@ -3151,30 +3172,32 @@ bool8 MovementType_BerryTreeGrowth_Step2(struct ObjectEvent *objectEvent, struct
return TRUE;
}
-bool8 MovementType_BerryTreeGrowth_Step3(struct ObjectEvent *objectEvent, struct Sprite *sprite)
+// BERRYTREEFUNC_SPARKLE
+bool8 MovementType_BerryTreeGrowth_Sparkle(struct ObjectEvent *objectEvent, struct Sprite *sprite)
{
- sprite->data[2]++;
- objectEvent->invisible = (sprite->data[2] & 0x02) >> 1;
+ sprite->sTimer++;
+ objectEvent->invisible = (sprite->sTimer & 2) >> 1;
sprite->animPaused = TRUE;
- if (sprite->data[2] > 64)
+ if (sprite->sTimer > 64)
{
- get_berry_tree_graphics(objectEvent, sprite);
- sprite->data[1] = 4;
- sprite->data[2] = 0;
+ SetBerryTreeGraphics(objectEvent, sprite);
+ sprite->sFuncId = BERRYTREEFUNC_SPARKLE_END;
+ sprite->sTimer = 0;
return TRUE;
}
return FALSE;
}
-bool8 MovementType_BerryTreeGrowth_Step4(struct ObjectEvent *objectEvent, struct Sprite *sprite)
+// BERRYTREEFUNC_SPARKLE_END
+bool8 MovementType_BerryTreeGrowth_SparkleEnd(struct ObjectEvent *objectEvent, struct Sprite *sprite)
{
- sprite->data[2]++;
- objectEvent->invisible = (sprite->data[2] & 0x02) >> 1;
+ sprite->sTimer++;
+ objectEvent->invisible = (sprite->sTimer & 2) >> 1;
sprite->animPaused = TRUE;
- if (sprite->data[2] > 64)
+ if (sprite->sTimer > 64)
{
- sprite->data[1] = 0;
- sprite->data[7] &= ~0x0002;
+ sprite->sFuncId = BERRYTREEFUNC_NORMAL;
+ sprite->sBerryTreeFlags &= ~BERRY_FLAG_SPARKLING;
return TRUE;
}
return FALSE;
@@ -3201,7 +3224,7 @@ bool8 MovementType_FaceDownAndUp_Step2(struct ObjectEvent *objectEvent, struct S
if (ObjectEventExecSingleMovementAction(objectEvent, sprite))
{
SetMovementDelay(sprite, gMovementDelaysMedium[Random() & 3]);
- objectEvent->singleMovementActive = 0;
+ objectEvent->singleMovementActive = FALSE;
sprite->data[1] = 3;
}
return FALSE;
@@ -3253,7 +3276,7 @@ bool8 MovementType_FaceLeftAndRight_Step2(struct ObjectEvent *objectEvent, struc
if (ObjectEventExecSingleMovementAction(objectEvent, sprite))
{
SetMovementDelay(sprite, gMovementDelaysMedium[Random() & 3]);
- objectEvent->singleMovementActive = 0;
+ objectEvent->singleMovementActive = FALSE;
sprite->data[1] = 3;
}
return FALSE;
@@ -3305,7 +3328,7 @@ bool8 MovementType_FaceUpAndLeft_Step2(struct ObjectEvent *objectEvent, struct S
if (ObjectEventExecSingleMovementAction(objectEvent, sprite))
{
SetMovementDelay(sprite, gMovementDelaysShort[Random() & 3]);
- objectEvent->singleMovementActive = 0;
+ objectEvent->singleMovementActive = FALSE;
sprite->data[1] = 3;
}
return FALSE;
@@ -3357,7 +3380,7 @@ bool8 MovementType_FaceUpAndRight_Step2(struct ObjectEvent *objectEvent, struct
if (ObjectEventExecSingleMovementAction(objectEvent, sprite))
{
SetMovementDelay(sprite, gMovementDelaysShort[Random() & 3]);
- objectEvent->singleMovementActive = 0;
+ objectEvent->singleMovementActive = FALSE;
sprite->data[1] = 3;
}
return FALSE;
@@ -3409,7 +3432,7 @@ bool8 MovementType_FaceDownAndLeft_Step2(struct ObjectEvent *objectEvent, struct
if (ObjectEventExecSingleMovementAction(objectEvent, sprite))
{
SetMovementDelay(sprite, gMovementDelaysShort[Random() & 3]);
- objectEvent->singleMovementActive = 0;
+ objectEvent->singleMovementActive = FALSE;
sprite->data[1] = 3;
}
return FALSE;
@@ -3461,7 +3484,7 @@ bool8 MovementType_FaceDownAndRight_Step2(struct ObjectEvent *objectEvent, struc
if (ObjectEventExecSingleMovementAction(objectEvent, sprite))
{
SetMovementDelay(sprite, gMovementDelaysShort[Random() & 3]);
- objectEvent->singleMovementActive = 0;
+ objectEvent->singleMovementActive = FALSE;
sprite->data[1] = 3;
}
return FALSE;
@@ -3513,7 +3536,7 @@ bool8 MovementType_FaceDownUpAndLeft_Step2(struct ObjectEvent *objectEvent, stru
if (ObjectEventExecSingleMovementAction(objectEvent, sprite))
{
SetMovementDelay(sprite, gMovementDelaysShort[Random() & 3]);
- objectEvent->singleMovementActive = 0;
+ objectEvent->singleMovementActive = FALSE;
sprite->data[1] = 3;
}
return FALSE;
@@ -3565,7 +3588,7 @@ bool8 MovementType_FaceDownUpAndRight_Step2(struct ObjectEvent *objectEvent, str
if (ObjectEventExecSingleMovementAction(objectEvent, sprite))
{
SetMovementDelay(sprite, gMovementDelaysShort[Random() & 3]);
- objectEvent->singleMovementActive = 0;
+ objectEvent->singleMovementActive = FALSE;
sprite->data[1] = 3;
}
return FALSE;
@@ -3617,7 +3640,7 @@ bool8 MovementType_FaceUpLeftAndRight_Step2(struct ObjectEvent *objectEvent, str
if (ObjectEventExecSingleMovementAction(objectEvent, sprite))
{
SetMovementDelay(sprite, gMovementDelaysShort[Random() & 3]);
- objectEvent->singleMovementActive = 0;
+ objectEvent->singleMovementActive = FALSE;
sprite->data[1] = 3;
}
return FALSE;
@@ -3669,7 +3692,7 @@ bool8 MovementType_FaceDownLeftAndRight_Step2(struct ObjectEvent *objectEvent, s
if (ObjectEventExecSingleMovementAction(objectEvent, sprite))
{
SetMovementDelay(sprite, gMovementDelaysShort[Random() & 3]);
- objectEvent->singleMovementActive = 0;
+ objectEvent->singleMovementActive = FALSE;
sprite->data[1] = 3;
}
return FALSE;
@@ -3835,7 +3858,7 @@ bool8 MovementType_WalkBackAndForth_Step2(struct ObjectEvent *objectEvent, struc
movementActionId = GetWalkInPlaceNormalMovementAction(objectEvent->facingDirection);
ObjectEventSetSingleMovement(objectEvent, sprite, movementActionId);
- objectEvent->singleMovementActive = 1;
+ objectEvent->singleMovementActive = TRUE;
sprite->data[1] = 3;
return TRUE;
}
@@ -3844,7 +3867,7 @@ bool8 MovementType_WalkBackAndForth_Step3(struct ObjectEvent *objectEvent, struc
{
if (ObjectEventExecSingleMovementAction(objectEvent, sprite))
{
- objectEvent->singleMovementActive = 0;
+ objectEvent->singleMovementActive = FALSE;
sprite->data[1] = 1;
}
return FALSE;
@@ -3880,7 +3903,7 @@ bool8 MoveNextDirectionInSequence(struct ObjectEvent *objectEvent, struct Sprite
movementActionId = GetWalkInPlaceNormalMovementAction(objectEvent->facingDirection);
ObjectEventSetSingleMovement(objectEvent, sprite, movementActionId);
- objectEvent->singleMovementActive = 1;
+ objectEvent->singleMovementActive = TRUE;
sprite->data[1] = 2;
return TRUE;
}
@@ -3889,7 +3912,7 @@ bool8 MovementType_WalkSequence_Step2(struct ObjectEvent *objectEvent, struct Sp
{
if (ObjectEventExecSingleMovementAction(objectEvent, sprite))
{
- objectEvent->singleMovementActive = 0;
+ objectEvent->singleMovementActive = FALSE;
sprite->data[1] = 1;
}
return FALSE;
@@ -4233,7 +4256,7 @@ bool8 MovementType_CopyPlayer_Step2(struct ObjectEvent *objectEvent, struct Spri
{
if (ObjectEventExecSingleMovementAction(objectEvent, sprite))
{
- objectEvent->singleMovementActive = 0;
+ objectEvent->singleMovementActive = FALSE;
sprite->data[1] = 1;
}
return FALSE;
@@ -4247,7 +4270,7 @@ bool8 CopyablePlayerMovement_None(struct ObjectEvent *objectEvent, struct Sprite
bool8 CopyablePlayerMovement_FaceDirection(struct ObjectEvent *objectEvent, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8))
{
ObjectEventSetSingleMovement(objectEvent, sprite, GetFaceDirectionMovementAction(state_to_direction(gInitialMovementTypeFacingDirections[objectEvent->movementType], objectEvent->directionSequenceIndex, playerDirection)));
- objectEvent->singleMovementActive = 1;
+ objectEvent->singleMovementActive = TRUE;
sprite->data[1] = 2;
return TRUE;
}
@@ -4268,7 +4291,7 @@ bool8 CopyablePlayerMovement_GoSpeed0(struct ObjectEvent *objectEvent, struct Sp
direction = state_to_direction(gInitialMovementTypeFacingDirections[objectEvent->movementType], objectEvent->directionSequenceIndex, direction);
ObjectEventMoveDestCoords(objectEvent, direction, &x, &y);
ObjectEventSetSingleMovement(objectEvent, sprite, GetFaceDirectionMovementAction(direction));
- objectEvent->singleMovementActive = 1;
+ objectEvent->singleMovementActive = TRUE;
sprite->data[1] = 2;
return TRUE;
}
@@ -4283,7 +4306,7 @@ bool8 CopyablePlayerMovement_GoSpeed0(struct ObjectEvent *objectEvent, struct Sp
{
ObjectEventSetSingleMovement(objectEvent, sprite, GetFaceDirectionMovementAction(direction));
}
- objectEvent->singleMovementActive = 1;
+ objectEvent->singleMovementActive = TRUE;
sprite->data[1] = 2;
return TRUE;
}
@@ -4538,13 +4561,13 @@ bool8 MovementType_Invisible_Step1(struct ObjectEvent *objectEvent, struct Sprit
bool8 MovementType_Invisible_Step2(struct ObjectEvent *objectEvent, struct Sprite *sprite)
{
- objectEvent->singleMovementActive = 0;
+ objectEvent->singleMovementActive = FALSE;
return FALSE;
}
static void ClearObjectEventMovement(struct ObjectEvent *objectEvent, struct Sprite *sprite)
{
- objectEvent->singleMovementActive = 0;
+ objectEvent->singleMovementActive = FALSE;
objectEvent->heldMovementActive = FALSE;
objectEvent->heldMovementFinished = FALSE;
objectEvent->movementActionId = 0xFF;
@@ -4824,7 +4847,7 @@ bool8 IsBerryTreeSparkling(u8 localId, u8 mapNum, u8 mapGroup)
u8 objectEventId;
if (!TryGetObjectEventIdByLocalIdAndMap(localId, mapNum, mapGroup, &objectEventId)
- && gSprites[gObjectEvents[objectEventId].spriteId].data[7] & 2)
+ && gSprites[gObjectEvents[objectEventId].spriteId].sBerryTreeFlags & BERRY_FLAG_SPARKLING)
{
return TRUE;
}
@@ -4832,13 +4855,13 @@ bool8 IsBerryTreeSparkling(u8 localId, u8 mapNum, u8 mapGroup)
return FALSE;
}
-void sub_8092EF0(u8 localId, u8 mapNum, u8 mapGroup)
+void SetBerryTreeJustPicked(u8 localId, u8 mapNum, u8 mapGroup)
{
u8 objectEventId;
if (!TryGetObjectEventIdByLocalIdAndMap(localId, mapNum, mapGroup, &objectEventId))
{
- gSprites[gObjectEvents[objectEventId].spriteId].data[7] |= 0x04;
+ gSprites[gObjectEvents[objectEventId].spriteId].sBerryTreeFlags |= BERRY_FLAG_JUST_PICKED;
}
}
@@ -6579,7 +6602,7 @@ bool8 MovementAction_RevealTrainer_Step0(struct ObjectEvent *objectEvent, struct
{
if (objectEvent->movementType == MOVEMENT_TYPE_HIDDEN)
{
- sub_80B4578(objectEvent);
+ SetHiddenTrainerMovement(objectEvent);
return FALSE;
}
if (objectEvent->movementType != MOVEMENT_TYPE_TREE_DISGUISE && objectEvent->movementType != MOVEMENT_TYPE_MOUNTAIN_DISGUISE)
@@ -8971,13 +8994,14 @@ void DestroyExtraMovementTask(u8 taskId)
DestroyTask(taskId);
}
-void sub_8098074(u8 var1, u8 var2)
+// Used to freeze other objects except two trainers approaching for battle
+void FreezeObjectEventsExceptTwo(u8 objectEventId1, u8 objectEventId2)
{
u8 i;
for(i = 0; i < OBJECT_EVENTS_COUNT; i++)
{
- if(i != var1 && i != var2 &&
+ if(i != objectEventId1 && i != objectEventId2 &&
gObjectEvents[i].active && i != gPlayerAvatar.objectEventId)
FreezeObjectEvent(&gObjectEvents[i]);
}
diff --git a/src/field_camera.c b/src/field_camera.c
index 57be52221..699b984ac 100644
--- a/src/field_camera.c
+++ b/src/field_camera.c
@@ -417,7 +417,7 @@ void CameraUpdate(void)
CameraMove(deltaX, deltaY);
UpdateObjectEventsForCameraUpdate(deltaX, deltaY);
RotatingGatePuzzleCameraUpdate(deltaX, deltaY);
- ResetBerryTreeSparkleFlags();
+ SetBerryTreesSeen();
AddCameraTileOffset(&sFieldCameraOffset, deltaX * 2, deltaY * 2);
RedrawMapSlicesForCameraUpdate(&sFieldCameraOffset, deltaX * 2, deltaY * 2);
}
diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c
index cc4c03c9d..3d29e013f 100644
--- a/src/field_player_avatar.c
+++ b/src/field_player_avatar.c
@@ -96,7 +96,7 @@ static void PlayerNotOnBikeCollideWithFarawayIslandMew(u8);
static void PlayCollisionSoundIfNotFacingWarp(u8 a);
-static void sub_808C280(struct ObjectEvent *);
+static void HideShowWarpArrow(struct ObjectEvent *);
static void StartStrengthAnim(u8, u8);
static void Task_PushBoulder(u8 taskId);
@@ -323,7 +323,7 @@ void PlayerStep(u8 direction, u16 newKeys, u16 heldKeys)
{
struct ObjectEvent *playerObjEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
- sub_808C280(playerObjEvent);
+ HideShowWarpArrow(playerObjEvent);
if (gPlayerAvatar.preventStep == FALSE)
{
Bike_TryAcroBikeHistoryUpdate(newKeys, heldKeys);
@@ -940,9 +940,9 @@ u8 PlayerGetCopyableMovement(void)
return gObjectEvents[gPlayerAvatar.objectEventId].playerCopyableMovement;
}
-static void sub_808B6BC(u8 a)
+static void PlayerForceSetHeldMovement(u8 movementActionId)
{
- ObjectEventForceSetHeldMovement(&gObjectEvents[gPlayerAvatar.objectEventId], a);
+ ObjectEventForceSetHeldMovement(&gObjectEvents[gPlayerAvatar.objectEventId], movementActionId);
}
void PlayerSetAnimId(u8 movementActionId, u8 copyableMovement)
@@ -1020,12 +1020,13 @@ void PlayerJumpLedge(u8 direction)
PlayerSetAnimId(GetJump2MovementAction(direction), 8);
}
-void sub_808B864(void)
+// Stop player on current facing direction once they're done moving and if they're not currently Acro Biking on bumpy slope
+void PlayerFreeze(void)
{
if (gPlayerAvatar.tileTransitionState == T_TILE_CENTER || gPlayerAvatar.tileTransitionState == T_NOT_MOVING)
{
- if (player_should_look_direction_be_enforced_upon_movement())
- sub_808B6BC(GetFaceDirectionMovementAction(gObjectEvents[gPlayerAvatar.objectEventId].facingDirection));
+ if (IsPlayerNotUsingAcroBikeOnBumpySlope())
+ PlayerForceSetHeldMovement(GetFaceDirectionMovementAction(gObjectEvents[gPlayerAvatar.objectEventId].facingDirection));
}
}
@@ -1424,7 +1425,7 @@ void SetPlayerAvatarWatering(u8 direction)
StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], GetFaceDirectionAnimNum(direction));
}
-static void sub_808C280(struct ObjectEvent *objectEvent)
+static void HideShowWarpArrow(struct ObjectEvent *objectEvent)
{
s16 x;
s16 y;
@@ -1435,6 +1436,7 @@ static void sub_808C280(struct ObjectEvent *objectEvent)
{
if (sArrowWarpMetatileBehaviorChecks2[x](metatileBehavior) && direction == objectEvent->movementDirection)
{
+ // Show warp arrow if applicable
x = objectEvent->currentCoords.x;
y = objectEvent->currentCoords.y;
MoveCoords(direction, &x, &y);
diff --git a/src/item_menu.c b/src/item_menu.c
index 6d30038d0..c63342041 100755
--- a/src/item_menu.c
+++ b/src/item_menu.c
@@ -1971,7 +1971,7 @@ bool8 UseRegisteredKeyItemOnField(void)
{
ScriptContext2_Enable();
FreezeObjectEvents();
- sub_808B864();
+ PlayerFreeze();
sub_808BCF4();
gSpecialVar_ItemId = gSaveBlock1Ptr->registeredItem;
taskId = CreateTask(ItemId_GetFieldFunc(gSaveBlock1Ptr->registeredItem), 8);
diff --git a/src/main.c b/src/main.c
index 854100a78..8d6bd94fa 100644
--- a/src/main.c
+++ b/src/main.c
@@ -298,7 +298,7 @@ void InitIntrHandlers(void)
REG_IME = 1;
- EnableInterrupts(0x1);
+ EnableInterrupts(INTR_FLAG_VBLANK);
}
void SetVBlankCallback(IntrCallback callback)
diff --git a/src/match_call.c b/src/match_call.c
index 7e8d0c38a..68b630d6b 100644
--- a/src/match_call.c
+++ b/src/match_call.c
@@ -1114,7 +1114,7 @@ static void StartMatchCall(void)
{
ScriptContext2_Enable();
FreezeObjectEvents();
- sub_808B864();
+ PlayerFreeze();
sub_808BCF4();
}
diff --git a/src/scrcmd.c b/src/scrcmd.c
index f36a44187..f599a0004 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -53,8 +53,8 @@
typedef u16 (*SpecialFunc)(void);
typedef void (*NativeFunc)(void);
-EWRAM_DATA const u8 *gUnknown_020375C0 = NULL;
-static EWRAM_DATA u32 gUnknown_020375C4 = 0;
+EWRAM_DATA const u8 *gRamScriptRetAddr = NULL;
+static EWRAM_DATA u32 sAddressOffset = 0; // For relative addressing in vgoto etc., used by saved scripts (e.g. Mystery Event)
static EWRAM_DATA u16 sPauseCounter = 0;
static EWRAM_DATA u16 sMovingNpcId = 0;
static EWRAM_DATA u16 sMovingNpcMapBank = 0;
@@ -192,7 +192,7 @@ bool8 ScrCmd_setvaddress(struct ScriptContext *ctx)
u32 addr1 = (u32)ctx->scriptPtr - 1;
u32 addr2 = ScriptReadWord(ctx);
- gUnknown_020375C4 = addr2 - addr1;
+ sAddressOffset = addr2 - addr1;
return FALSE;
}
@@ -200,7 +200,7 @@ bool8 ScrCmd_vgoto(struct ScriptContext *ctx)
{
u32 addr = ScriptReadWord(ctx);
- ScriptJump(ctx, (u8 *)(addr - gUnknown_020375C4));
+ ScriptJump(ctx, (u8 *)(addr - sAddressOffset));
return FALSE;
}
@@ -208,14 +208,14 @@ bool8 ScrCmd_vcall(struct ScriptContext *ctx)
{
u32 addr = ScriptReadWord(ctx);
- ScriptCall(ctx, (u8 *)(addr - gUnknown_020375C4));
+ ScriptCall(ctx, (u8 *)(addr - sAddressOffset));
return FALSE;
}
bool8 ScrCmd_vgoto_if(struct ScriptContext *ctx)
{
u8 condition = ScriptReadByte(ctx);
- const u8 *ptr = (const u8 *)(ScriptReadWord(ctx) - gUnknown_020375C4);
+ const u8 *ptr = (const u8 *)(ScriptReadWord(ctx) - sAddressOffset);
if (sScriptConditionTable[condition][ctx->comparisonResult] == 1)
ScriptJump(ctx, ptr);
@@ -225,7 +225,7 @@ bool8 ScrCmd_vgoto_if(struct ScriptContext *ctx)
bool8 ScrCmd_vcall_if(struct ScriptContext *ctx)
{
u8 condition = ScriptReadByte(ctx);
- const u8 *ptr = (const u8 *)(ScriptReadWord(ctx) - gUnknown_020375C4);
+ const u8 *ptr = (const u8 *)(ScriptReadWord(ctx) - sAddressOffset);
if (sScriptConditionTable[condition][ctx->comparisonResult] == 1)
ScriptCall(ctx, ptr);
@@ -282,7 +282,7 @@ bool8 ScrCmd_callstd_if(struct ScriptContext *ctx)
bool8 ScrCmd_returnram(struct ScriptContext *ctx)
{
- ScriptJump(ctx, gUnknown_020375C0);
+ ScriptJump(ctx, gRamScriptRetAddr);
return FALSE;
}
@@ -378,32 +378,30 @@ bool8 ScrCmd_setorcopyvar(struct ScriptContext *ctx)
return FALSE;
}
-u8 compare_012(u16 a1, u16 a2)
+u8 Compare(u16 a, u16 b)
{
- if (a1 < a2)
+ if (a < b)
return 0;
- if (a1 == a2)
+ if (a == b)
return 1;
return 2;
}
-// comparelocaltolocal
bool8 ScrCmd_compare_local_to_local(struct ScriptContext *ctx)
{
const u8 value1 = ctx->data[ScriptReadByte(ctx)];
const u8 value2 = ctx->data[ScriptReadByte(ctx)];
- ctx->comparisonResult = compare_012(value1, value2);
+ ctx->comparisonResult = Compare(value1, value2);
return FALSE;
}
-// comparelocaltoimm
bool8 ScrCmd_compare_local_to_value(struct ScriptContext *ctx)
{
const u8 value1 = ctx->data[ScriptReadByte(ctx)];
const u8 value2 = ScriptReadByte(ctx);
- ctx->comparisonResult = compare_012(value1, value2);
+ ctx->comparisonResult = Compare(value1, value2);
return FALSE;
}
@@ -412,7 +410,7 @@ bool8 ScrCmd_compare_local_to_addr(struct ScriptContext *ctx)
const u8 value1 = ctx->data[ScriptReadByte(ctx)];
const u8 value2 = *(const u8 *)ScriptReadWord(ctx);
- ctx->comparisonResult = compare_012(value1, value2);
+ ctx->comparisonResult = Compare(value1, value2);
return FALSE;
}
@@ -421,7 +419,7 @@ bool8 ScrCmd_compare_addr_to_local(struct ScriptContext *ctx)
const u8 value1 = *(const u8 *)ScriptReadWord(ctx);
const u8 value2 = ctx->data[ScriptReadByte(ctx)];
- ctx->comparisonResult = compare_012(value1, value2);
+ ctx->comparisonResult = Compare(value1, value2);
return FALSE;
}
@@ -430,7 +428,7 @@ bool8 ScrCmd_compare_addr_to_value(struct ScriptContext *ctx)
const u8 value1 = *(const u8 *)ScriptReadWord(ctx);
const u8 value2 = ScriptReadByte(ctx);
- ctx->comparisonResult = compare_012(value1, value2);
+ ctx->comparisonResult = Compare(value1, value2);
return FALSE;
}
@@ -439,7 +437,7 @@ bool8 ScrCmd_compare_addr_to_addr(struct ScriptContext *ctx)
const u8 value1 = *(const u8 *)ScriptReadWord(ctx);
const u8 value2 = *(const u8 *)ScriptReadWord(ctx);
- ctx->comparisonResult = compare_012(value1, value2);
+ ctx->comparisonResult = Compare(value1, value2);
return FALSE;
}
@@ -448,7 +446,7 @@ bool8 ScrCmd_compare_var_to_value(struct ScriptContext *ctx)
const u16 value1 = *GetVarPointer(ScriptReadHalfword(ctx));
const u16 value2 = ScriptReadHalfword(ctx);
- ctx->comparisonResult = compare_012(value1, value2);
+ ctx->comparisonResult = Compare(value1, value2);
return FALSE;
}
@@ -457,7 +455,7 @@ bool8 ScrCmd_compare_var_to_var(struct ScriptContext *ctx)
const u16 *ptr1 = GetVarPointer(ScriptReadHalfword(ctx));
const u16 *ptr2 = GetVarPointer(ScriptReadHalfword(ctx));
- ctx->comparisonResult = compare_012(*ptr1, *ptr2);
+ ctx->comparisonResult = Compare(*ptr1, *ptr2);
return FALSE;
}
@@ -1120,7 +1118,7 @@ bool8 ScrCmd_showobject_at(struct ScriptContext *ctx)
u8 mapGroup = ScriptReadByte(ctx);
u8 mapNum = ScriptReadByte(ctx);
- npc_by_local_id_and_map_set_field_1_bit_x20(localId, mapNum, mapGroup, 0);
+ SetObjectInvisibility(localId, mapNum, mapGroup, FALSE);
return FALSE;
}
@@ -1130,7 +1128,7 @@ bool8 ScrCmd_hideobject_at(struct ScriptContext *ctx)
u8 mapGroup = ScriptReadByte(ctx);
u8 mapNum = ScriptReadByte(ctx);
- npc_by_local_id_and_map_set_field_1_bit_x20(localId, mapNum, mapGroup, 1);
+ SetObjectInvisibility(localId, mapNum, mapGroup, TRUE);
return FALSE;
}
@@ -1141,7 +1139,7 @@ bool8 ScrCmd_setobjectpriority(struct ScriptContext *ctx)
u8 mapNum = ScriptReadByte(ctx);
u8 priority = ScriptReadByte(ctx);
- sub_808E78C(localId, mapNum, mapGroup, priority + 83);
+ SetObjectPriority(localId, mapNum, mapGroup, priority + 83);
return FALSE;
}
@@ -1151,7 +1149,7 @@ bool8 ScrCmd_resetobjectpriority(struct ScriptContext *ctx)
u8 mapGroup = ScriptReadByte(ctx);
u8 mapNum = ScriptReadByte(ctx);
- sub_808E7E4(localId, mapNum, mapGroup);
+ ResetObjectPriority(localId, mapNum, mapGroup);
return FALSE;
}
@@ -1214,7 +1212,7 @@ bool8 ScrCmd_lockall(struct ScriptContext *ctx)
else
{
ScriptFreezeObjectEvents();
- SetupNativeScript(ctx, sub_80983C4);
+ SetupNativeScript(ctx, IsFreezePlayerFinished);
return TRUE;
}
}
@@ -1230,12 +1228,12 @@ bool8 ScrCmd_lock(struct ScriptContext *ctx)
if (gObjectEvents[gSelectedObjectEvent].active)
{
LockSelectedObjectEvent();
- SetupNativeScript(ctx, sub_809847C);
+ SetupNativeScript(ctx, IsFreezeSelectedObjectAndPlayerFinished);
}
else
{
ScriptFreezeObjectEvents();
- SetupNativeScript(ctx, sub_80983C4);
+ SetupNativeScript(ctx, IsFreezePlayerFinished);
}
return TRUE;
}
@@ -1299,7 +1297,8 @@ bool8 ScrCmd_messageautoscroll(struct ScriptContext *ctx)
return FALSE;
}
-bool8 ScrCmd_cmdDB(struct ScriptContext *ctx)
+// Prints all at once. Skips waiting for player input. Only used by link contests
+bool8 ScrCmd_messageinstant(struct ScriptContext *ctx)
{
const u8 *msg = (const u8 *)ScriptReadWord(ctx);
@@ -1489,27 +1488,30 @@ bool8 ScrCmd_braillemessage(struct ScriptContext *ctx)
u8 xWindow, yWindow, xText, yText;
u8 temp;
+ // + 6 for the 6 bytes at the start of a braille message (brailleformat macro)
+ // In RS these bytes are used to position the text and window, but
+ // in Emerald they are unused and position is calculated below instead
StringExpandPlaceholders(gStringVar4, ptr + 6);
width = GetStringWidth(6, gStringVar4, -1) / 8u;
- if (width > 0x1C)
- width = 0x1C;
+ if (width > 28)
+ width = 28;
- for (i = 0, height = 4; gStringVar4[i] != 0xFF;)
+ for (i = 0, height = 4; gStringVar4[i] != EOS;)
{
- if (gStringVar4[i++] == 0xFE)
+ if (gStringVar4[i++] == CHAR_NEWLINE)
height += 3;
}
- if (height > 0x12)
- height = 0x12;
+ if (height > 18)
+ height = 18;
temp = width + 2;
- xWindow = (0x1E - temp) / 2;
+ xWindow = (30 - temp) / 2;
temp = height + 2;
- yText = (0x14 - temp) / 2;
+ yText = (20 - temp) / 2;
xText = xWindow;
xWindow += 1;
@@ -1539,9 +1541,9 @@ bool8 ScrCmd_closebraillemessage(struct ScriptContext *ctx)
bool8 ScrCmd_vmessage(struct ScriptContext *ctx)
{
- u32 v1 = ScriptReadWord(ctx);
+ u32 msg = ScriptReadWord(ctx);
- ShowFieldMessage((u8 *)(v1 - gUnknown_020375C4));
+ ShowFieldMessage((u8 *)(msg - sAddressOffset));
return FALSE;
}
@@ -1651,7 +1653,7 @@ bool8 ScrCmd_bufferstring(struct ScriptContext *ctx)
bool8 ScrCmd_vloadword(struct ScriptContext *ctx)
{
- const u8 *ptr = (u8 *)(ScriptReadWord(ctx) - gUnknown_020375C4);
+ const u8 *ptr = (u8 *)(ScriptReadWord(ctx) - sAddressOffset);
StringExpandPlaceholders(gStringVar4, ptr);
return FALSE;
@@ -1662,7 +1664,7 @@ bool8 ScrCmd_vbufferstring(struct ScriptContext *ctx)
u8 stringVarIndex = ScriptReadByte(ctx);
u32 addr = ScriptReadWord(ctx);
- const u8 *src = (u8 *)(addr - gUnknown_020375C4);
+ const u8 *src = (u8 *)(addr - sAddressOffset);
u8 *dest = sScriptStringVars[stringVarIndex];
StringCopy(dest, src);
return FALSE;
@@ -1900,6 +1902,7 @@ bool8 ScrCmd_pokemartdecoration(struct ScriptContext *ctx)
return TRUE;
}
+// Changes clerk dialogue slightly from above. See MART_TYPE_DECOR2
bool8 ScrCmd_pokemartdecoration2(struct ScriptContext *ctx)
{
const void *ptr = (void *)ScriptReadWord(ctx);
@@ -2104,6 +2107,7 @@ bool8 ScrCmd_setdoorclosed(struct ScriptContext *ctx)
return FALSE;
}
+// Below two are functions for elevators in RS, do nothing in Emerald
bool8 ScrCmd_addelevmenuitem(struct ScriptContext *ctx)
{
u8 v3 = ScriptReadByte(ctx);
@@ -2135,9 +2139,9 @@ bool8 ScrCmd_addcoins(struct ScriptContext *ctx)
u16 coins = VarGet(ScriptReadHalfword(ctx));
if (AddCoins(coins) == TRUE)
- gSpecialVar_Result = 0;
+ gSpecialVar_Result = FALSE;
else
- gSpecialVar_Result = 1;
+ gSpecialVar_Result = TRUE;
return FALSE;
}
@@ -2146,9 +2150,9 @@ bool8 ScrCmd_removecoins(struct ScriptContext *ctx)
u16 coins = VarGet(ScriptReadHalfword(ctx));
if (RemoveCoins(coins) == TRUE)
- gSpecialVar_Result = 0;
+ gSpecialVar_Result = FALSE;
else
- gSpecialVar_Result = 1;
+ gSpecialVar_Result = TRUE;
return FALSE;
}
@@ -2180,13 +2184,13 @@ bool8 ScrCmd_freerotatingtilepuzzle(struct ScriptContext *ctx)
return FALSE;
}
-bool8 ScrCmd_cmdD8(struct ScriptContext *ctx)
+bool8 ScrCmd_selectapproachingtrainer(struct ScriptContext *ctx)
{
gSelectedObjectEvent = GetCurrentApproachingTrainerObjectEventId();
return FALSE;
}
-bool8 ScrCmd_cmdD9(struct ScriptContext *ctx)
+bool8 ScrCmd_lockfortrainer(struct ScriptContext *ctx)
{
if (IsUpdateLinkStateCBActive())
{
@@ -2196,8 +2200,8 @@ bool8 ScrCmd_cmdD9(struct ScriptContext *ctx)
{
if (gObjectEvents[gSelectedObjectEvent].active)
{
- sub_8098630();
- SetupNativeScript(ctx, sub_8098734);
+ FreezeForApproachingTrainers();
+ SetupNativeScript(ctx, IsFreezeObjectAndPlayerFinished);
}
return TRUE;
}
@@ -2225,12 +2229,12 @@ bool8 ScrCmd_checkmonobedience(struct ScriptContext *ctx)
// See GetSavedRamScriptIfValid, which is NULL if ValidateReceivedWonderCard returns FALSE
bool8 ScrCmd_gotoram(struct ScriptContext *ctx)
{
- const u8* v1 = GetSavedRamScriptIfValid();
+ const u8* script = GetSavedRamScriptIfValid();
- if (v1)
+ if (script)
{
- gUnknown_020375C0 = ctx->scriptPtr;
- ScriptJump(ctx, v1);
+ gRamScriptRetAddr = ctx->scriptPtr;
+ ScriptJump(ctx, script);
}
return FALSE;
}
diff --git a/src/script.c b/src/script.c
index e6557aa75..69899fdb3 100644
--- a/src/script.c
+++ b/src/script.c
@@ -7,7 +7,7 @@
#define RAM_SCRIPT_MAGIC 51
-extern const u8* gUnknown_020375C0;
+extern const u8* gRamScriptRetAddr;
// ewram bss
static u8 sScriptContext1Status;
@@ -363,7 +363,7 @@ bool8 InitRamScript(const u8 *script, u16 scriptSize, u8 mapGroup, u8 mapNum, u8
const u8 *GetRamScript(u8 objectId, const u8 *script)
{
struct RamScriptData *scriptData = &gSaveBlock1Ptr->ramScript.data;
- gUnknown_020375C0 = NULL;
+ gRamScriptRetAddr = NULL;
if (scriptData->magic != RAM_SCRIPT_MAGIC)
return script;
if (scriptData->mapGroup != gSaveBlock1Ptr->location.mapGroup)
@@ -379,7 +379,7 @@ const u8 *GetRamScript(u8 objectId, const u8 *script)
}
else
{
- gUnknown_020375C0 = script;
+ gRamScriptRetAddr = script;
return scriptData->script;
}
}
diff --git a/src/shop.c b/src/shop.c
index a447982fc..04afc7d0b 100755
--- a/src/shop.c
+++ b/src/shop.c
@@ -965,8 +965,9 @@ static void Task_BuyMenu(u8 taskId)
if (gMartInfo.martType == MART_TYPE_DECOR)
StringExpandPlaceholders(gStringVar4, gText_Var1IsItThatllBeVar2);
- else
+ else // MART_TYPE_DECOR2
StringExpandPlaceholders(gStringVar4, gText_YouWantedVar1ThatllBeVar2);
+
BuyMenuDisplayMessage(taskId, gStringVar4, BuyMenuConfirmPurchase);
}
}
@@ -1069,13 +1070,9 @@ static void BuyMenuTryMakePurchase(u8 taskId)
if (DecorationAdd(tItemId))
{
if (gMartInfo.martType == MART_TYPE_DECOR)
- {
BuyMenuDisplayMessage(taskId, gText_ThankYouIllSendItHome, BuyMenuSubtractMoney);
- }
- else
- {
+ else // MART_TYPE_DECOR2
BuyMenuDisplayMessage(taskId, gText_ThanksIllSendItHome, BuyMenuSubtractMoney);
- }
}
else
{
diff --git a/src/start_menu.c b/src/start_menu.c
index bfced1858..8e165b3be 100644
--- a/src/start_menu.c
+++ b/src/start_menu.c
@@ -541,7 +541,7 @@ void ShowStartMenu(void)
if (!IsUpdateLinkStateCBActive())
{
FreezeObjectEvents();
- sub_808B864();
+ PlayerFreeze();
sub_808BCF4();
}
CreateStartMenuTask(Task_ShowStartMenu);
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;
-
- gTasks[taskId].func = NULL;
-
- TASK_DATA_OP(taskId, 28, func = *((u16 *)addr))
- TASK_DATA_OP(taskId, 30, func |= *((s16 *)addr) << 16)
+ u8 followupFuncIndex = NUM_TASK_DATA - 2; // Should be const.
- 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/trainer_see.c b/src/trainer_see.c
index 46fafa7e3..8a7d2a5f9 100644
--- a/src/trainer_see.c
+++ b/src/trainer_see.c
@@ -23,9 +23,9 @@
static u8 CheckTrainer(u8 objectEventId);
static u8 GetTrainerApproachDistance(struct ObjectEvent *trainerObj);
static u8 CheckPathBetweenTrainerAndPlayer(struct ObjectEvent *trainerObj, u8 approachDistance, u8 direction);
-static void TrainerApproachPlayer(struct ObjectEvent *trainerObj, u8 range);
+static void InitTrainerApproachTask(struct ObjectEvent *trainerObj, u8 range);
static void Task_RunTrainerSeeFuncList(u8 taskId);
-static void Task_DestroyTrainerApproachTask(u8 taskId);
+static void Task_EndTrainerApproach(u8 taskId);
static void SetIconSpriteData(struct Sprite *sprite, u16 fldEffId, u8 spriteAnimNum);
static u8 GetTrainerApproachDistanceSouth(struct ObjectEvent *trainerObj, s16 range, s16 x, s16 y);
@@ -33,7 +33,7 @@ static u8 GetTrainerApproachDistanceNorth(struct ObjectEvent *trainerObj, s16 ra
static u8 GetTrainerApproachDistanceWest(struct ObjectEvent *trainerObj, s16 range, s16 x, s16 y);
static u8 GetTrainerApproachDistanceEast(struct ObjectEvent *trainerObj, s16 range, s16 x, s16 y);
-static bool8 sub_80B4178(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj);
+static bool8 TrainerSeeIdle(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj);
static bool8 TrainerExclamationMark(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj);
static bool8 WaitTrainerExclamationMark(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj);
static bool8 TrainerMoveToPlayer(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj);
@@ -71,20 +71,35 @@ static u8 (*const sDirectionalApproachDistanceFuncs[])(struct ObjectEvent *train
GetTrainerApproachDistanceEast,
};
+enum {
+ TRSEE_NONE,
+ TRSEE_EXCLAMATION,
+ TRSEE_EXCLAMATION_WAIT,
+ TRSEE_MOVE_TO_PLAYER,
+ TRSEE_PLAYER_FACE,
+ TRSEE_PLAYER_FACE_WAIT,
+ TRSEE_REVEAL_DISGUISE,
+ TRSEE_REVEAL_DISGUISE_WAIT,
+ TRSEE_REVEAL_HIDDEN,
+ TRSEE_HIDDEN_POP_OUT,
+ TRSEE_HIDDEN_JUMP,
+ TRSEE_REVEAL_HIDDEN_WAIT,
+};
+
static bool8 (*const sTrainerSeeFuncList[])(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj) =
{
- sub_80B4178,
- TrainerExclamationMark,
- WaitTrainerExclamationMark,
- TrainerMoveToPlayer,
- PlayerFaceApproachingTrainer,
- WaitPlayerFaceApproachingTrainer,
- RevealDisguisedTrainer,
- WaitRevealDisguisedTrainer,
- RevealHiddenTrainer,
- PopOutOfAshHiddenTrainer,
- JumpInPlaceHiddenTrainer,
- WaitRevealHiddenTrainer,
+ [TRSEE_NONE] = TrainerSeeIdle,
+ [TRSEE_EXCLAMATION] = TrainerExclamationMark,
+ [TRSEE_EXCLAMATION_WAIT] = WaitTrainerExclamationMark,
+ [TRSEE_MOVE_TO_PLAYER] = TrainerMoveToPlayer,
+ [TRSEE_PLAYER_FACE] = PlayerFaceApproachingTrainer,
+ [TRSEE_PLAYER_FACE_WAIT] = WaitPlayerFaceApproachingTrainer,
+ [TRSEE_REVEAL_DISGUISE] = RevealDisguisedTrainer,
+ [TRSEE_REVEAL_DISGUISE_WAIT] = WaitRevealDisguisedTrainer,
+ [TRSEE_REVEAL_HIDDEN] = RevealHiddenTrainer,
+ [TRSEE_HIDDEN_POP_OUT] = PopOutOfAshHiddenTrainer,
+ [TRSEE_HIDDEN_JUMP] = JumpInPlaceHiddenTrainer,
+ [TRSEE_REVEAL_HIDDEN_WAIT] = WaitRevealHiddenTrainer,
};
static bool8 (*const sTrainerSeeFuncList2[])(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj) =
@@ -233,7 +248,7 @@ bool8 CheckForTrainersWantingBattle(void)
static u8 CheckTrainer(u8 objectEventId)
{
const u8 *scriptPtr;
- u8 ret = 1;
+ u8 numTrainers = 1;
u8 approachDistance;
if (InTrainerHill() == TRUE)
@@ -268,16 +283,16 @@ static u8 CheckTrainer(u8 objectEventId)
if (GetMonsStateToDoubles_2() != 0)
return 0;
- ret = 2;
+ numTrainers = 2;
}
gApproachingTrainers[gNoOfApproachingTrainers].objectEventId = objectEventId;
gApproachingTrainers[gNoOfApproachingTrainers].trainerScriptPtr = scriptPtr;
gApproachingTrainers[gNoOfApproachingTrainers].radius = approachDistance;
- TrainerApproachPlayer(&gObjectEvents[objectEventId], approachDistance - 1);
+ InitTrainerApproachTask(&gObjectEvents[objectEventId], approachDistance - 1);
gNoOfApproachingTrainers++;
- return ret;
+ return numTrainers;
}
return 0;
@@ -357,8 +372,7 @@ static u8 GetTrainerApproachDistanceEast(struct ObjectEvent *trainerObj, s16 ran
static u8 CheckPathBetweenTrainerAndPlayer(struct ObjectEvent *trainerObj, u8 approachDistance, u8 direction)
{
s16 x, y;
- u8 unk19_temp;
- u8 unk19b_temp;
+ u8 rangeX, rangeY;
u8 i;
u8 collision;
@@ -376,17 +390,16 @@ static u8 CheckPathBetweenTrainerAndPlayer(struct ObjectEvent *trainerObj, u8 ap
return 0;
}
- // preserve mapobj_unk_19 before clearing.
- unk19_temp = trainerObj->rangeX;
- unk19b_temp = trainerObj->rangeY;
+ rangeX = trainerObj->rangeX;
+ rangeY = trainerObj->rangeY;
trainerObj->rangeX = 0;
trainerObj->rangeY = 0;
collision = GetCollisionAtCoords(trainerObj, x, y, direction);
- trainerObj->rangeX = unk19_temp;
- trainerObj->rangeY = unk19b_temp;
- if (collision == 4)
+ trainerObj->rangeX = rangeX;
+ trainerObj->rangeY = rangeY;
+ if (collision == COLLISION_OBJECT_EVENT)
return approachDistance;
return 0;
@@ -397,7 +410,7 @@ static u8 CheckPathBetweenTrainerAndPlayer(struct ObjectEvent *trainerObj, u8 ap
#define tOutOfAshSpriteId data[4]
#define tTrainerObjectEventId data[7]
-static void TrainerApproachPlayer(struct ObjectEvent *trainerObj, u8 range)
+static void InitTrainerApproachTask(struct ObjectEvent *trainerObj, u8 range)
{
struct Task *task;
@@ -407,7 +420,7 @@ static void TrainerApproachPlayer(struct ObjectEvent *trainerObj, u8 range)
task->tTrainerObjectEventId = gApproachingTrainers[gNoOfApproachingTrainers].objectEventId;
}
-static void sub_80B40C8(TaskFunc followupFunc)
+static void StartTrainerApproach(TaskFunc followupFunc)
{
u8 taskId;
TaskFunc taskFunc;
@@ -419,7 +432,7 @@ static void sub_80B40C8(TaskFunc followupFunc)
taskFunc = Task_RunTrainerSeeFuncList;
SetTaskFuncWithFollowupFunc(taskId, taskFunc, followupFunc);
- gTasks[taskId].tFuncId = 1;
+ gTasks[taskId].tFuncId = TRSEE_EXCLAMATION;
taskFunc(taskId);
}
@@ -438,11 +451,12 @@ static void Task_RunTrainerSeeFuncList(u8 taskId)
}
}
-static bool8 sub_80B4178(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj)
+static bool8 TrainerSeeIdle(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj)
{
return FALSE;
}
+// TRSEE_EXCLAMATION
static bool8 TrainerExclamationMark(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj)
{
u8 direction;
@@ -451,10 +465,11 @@ static bool8 TrainerExclamationMark(u8 taskId, struct Task *task, struct ObjectE
FieldEffectStart(FLDEFF_EXCLAMATION_MARK_ICON);
direction = GetFaceDirectionMovementAction(trainerObj->facingDirection);
ObjectEventSetHeldMovement(trainerObj, direction);
- task->tFuncId++;
+ task->tFuncId++; // TRSEE_EXCLAMATION_WAIT
return TRUE;
}
+// TRSEE_EXCLAMATION_WAIT
static bool8 WaitTrainerExclamationMark(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj)
{
if (FieldEffectActiveListContains(FLDEFF_EXCLAMATION_MARK_ICON))
@@ -463,15 +478,16 @@ static bool8 WaitTrainerExclamationMark(u8 taskId, struct Task *task, struct Obj
}
else
{
- task->tFuncId++;
+ task->tFuncId++; // TRSEE_MOVE_TO_PLAYER
if (trainerObj->movementType == MOVEMENT_TYPE_TREE_DISGUISE || trainerObj->movementType == MOVEMENT_TYPE_MOUNTAIN_DISGUISE)
- task->tFuncId = 6;
+ task->tFuncId = TRSEE_REVEAL_DISGUISE;
if (trainerObj->movementType == MOVEMENT_TYPE_HIDDEN)
- task->tFuncId = 8;
+ task->tFuncId = TRSEE_REVEAL_HIDDEN;
return TRUE;
}
}
+// TRSEE_MOVE_TO_PLAYER
static bool8 TrainerMoveToPlayer(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj)
{
if (!ObjectEventIsMovementOverridden(trainerObj) || ObjectEventClearHeldMovementIfFinished(trainerObj))
@@ -484,12 +500,13 @@ static bool8 TrainerMoveToPlayer(u8 taskId, struct Task *task, struct ObjectEven
else
{
ObjectEventSetHeldMovement(trainerObj, MOVEMENT_ACTION_FACE_PLAYER);
- task->tFuncId++;
+ task->tFuncId++; // TRSEE_PLAYER_FACE
}
}
return FALSE;
}
+// TRSEE_PLAYER_FACE
static bool8 PlayerFaceApproachingTrainer(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj)
{
struct ObjectEvent *playerObj;
@@ -497,6 +514,7 @@ static bool8 PlayerFaceApproachingTrainer(u8 taskId, struct Task *task, struct O
if (ObjectEventIsMovementOverridden(trainerObj) && !ObjectEventClearHeldMovementIfFinished(trainerObj))
return FALSE;
+ // Set trainer's movement type so they stop and remain facing that direction
SetTrainerMovementType(trainerObj, GetTrainerFacingDirectionMovementType(trainerObj->facingDirection));
TryOverrideTemplateCoordsForObjectEvent(trainerObj, GetTrainerFacingDirectionMovementType(trainerObj->facingDirection));
OverrideTemplateCoordsForObjectEvent(trainerObj);
@@ -507,10 +525,11 @@ static bool8 PlayerFaceApproachingTrainer(u8 taskId, struct Task *task, struct O
sub_808BCE8();
ObjectEventSetHeldMovement(&gObjectEvents[gPlayerAvatar.objectEventId], GetFaceDirectionMovementAction(GetOppositeDirection(trainerObj->facingDirection)));
- task->tFuncId++;
+ task->tFuncId++; // TRSEE_PLAYER_FACE_WAIT
return FALSE;
}
+// TRSEE_PLAYER_FACE_WAIT
static bool8 WaitPlayerFaceApproachingTrainer(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj)
{
struct ObjectEvent *playerObj = &gObjectEvents[gPlayerAvatar.objectEventId];
@@ -521,25 +540,28 @@ static bool8 WaitPlayerFaceApproachingTrainer(u8 taskId, struct Task *task, stru
return FALSE;
}
+// TRSEE_REVEAL_DISGUISE
static bool8 RevealDisguisedTrainer(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj)
{
if (!ObjectEventIsMovementOverridden(trainerObj)
|| ObjectEventClearHeldMovementIfFinished(trainerObj))
{
ObjectEventSetHeldMovement(trainerObj, MOVEMENT_ACTION_REVEAL_TRAINER);
- task->tFuncId++;
+ task->tFuncId++; // TRSEE_REVEAL_DISGUISE_WAIT
}
return FALSE;
}
+// TRSEE_REVEAL_DISGUISE_WAIT
static bool8 WaitRevealDisguisedTrainer(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj)
{
if (ObjectEventClearHeldMovementIfFinished(trainerObj))
- task->tFuncId = 3;
+ task->tFuncId = TRSEE_MOVE_TO_PLAYER;
return FALSE;
}
+// TRSEE_REVEAL_HIDDEN
static bool8 RevealHiddenTrainer(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj)
{
if (!ObjectEventIsMovementOverridden(trainerObj)
@@ -551,6 +573,7 @@ static bool8 RevealHiddenTrainer(u8 taskId, struct Task *task, struct ObjectEven
return FALSE;
}
+// TRSEE_HIDDEN_POP_OUT
static bool8 PopOutOfAshHiddenTrainer(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj)
{
if (ObjectEventCheckHeldMovementStatus(trainerObj))
@@ -565,6 +588,7 @@ static bool8 PopOutOfAshHiddenTrainer(u8 taskId, struct Task *task, struct Objec
return FALSE;
}
+// TRSEE_HIDDEN_JUMP
static bool8 JumpInPlaceHiddenTrainer(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj)
{
struct Sprite *sprite;
@@ -584,33 +608,34 @@ static bool8 JumpInPlaceHiddenTrainer(u8 taskId, struct Task *task, struct Objec
return FALSE;
}
+// TRSEE_REVEAL_HIDDEN_WAIT
static bool8 WaitRevealHiddenTrainer(u8 taskId, struct Task *task, struct ObjectEvent *trainerObj)
{
if (!FieldEffectActiveListContains(FLDEFF_ASH_PUFF))
- task->tFuncId = 3;
+ task->tFuncId = TRSEE_MOVE_TO_PLAYER;
return FALSE;
}
-#undef tFuncId
#undef tTrainerRange
#undef tOutOfAshSpriteId
#undef tTrainerObjectEventId
-static void sub_80B44C8(u8 taskId)
+#define tObjEvent data[1]
+
+static void Task_SetHiddenTrainerMovement(u8 taskId)
{
struct Task *task = &gTasks[taskId];
struct ObjectEvent *objEvent;
- // another objEvent loaded into by loadword?
- LoadWordFromTwoHalfwords(&task->data[1], (u32 *)&objEvent);
+ LoadWordFromTwoHalfwords(&task->tObjEvent, (u32 *)&objEvent);
if (!task->data[7])
{
ObjectEventClearHeldMovement(objEvent);
task->data[7]++;
}
- sTrainerSeeFuncList2[task->data[0]](taskId, task, objEvent);
- if (task->data[0] == 3 && !FieldEffectActiveListContains(FLDEFF_ASH_PUFF))
+ sTrainerSeeFuncList2[task->tFuncId](taskId, task, objEvent);
+ if (task->tFuncId == ((int)ARRAY_COUNT(sTrainerSeeFuncList2) - 1) && !FieldEffectActiveListContains(FLDEFF_ASH_PUFF))
{
SetTrainerMovementType(objEvent, GetTrainerFacingDirectionMovementType(objEvent->facingDirection));
TryOverrideTemplateCoordsForObjectEvent(objEvent, GetTrainerFacingDirectionMovementType(objEvent->facingDirection));
@@ -622,17 +647,18 @@ static void sub_80B44C8(u8 taskId)
}
}
-void sub_80B4578(struct ObjectEvent *var)
+// Called when a "buried" trainer has the reveal_trainer movement applied, from direct interaction
+void SetHiddenTrainerMovement(struct ObjectEvent *objEvent)
{
- StoreWordInTwoHalfwords(&gTasks[CreateTask(sub_80B44C8, 0)].data[1], (u32)var);
+ StoreWordInTwoHalfwords(&gTasks[CreateTask(Task_SetHiddenTrainerMovement, 0)].tObjEvent, (u32)objEvent);
}
-void EndTrainerApproach(void)
+void DoTrainerApproach(void)
{
- sub_80B40C8(Task_DestroyTrainerApproachTask);
+ StartTrainerApproach(Task_EndTrainerApproach);
}
-static void Task_DestroyTrainerApproachTask(u8 taskId)
+static void Task_EndTrainerApproach(u8 taskId)
{
DestroyTask(taskId);
EnableBothScriptContexts();
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-08 13:24:54 +0000