From a56eb4f53fe1ee1021f762af8b199988ed2b00b2 Mon Sep 17 00:00:00 2001
From: Eduardo Quezada <eduardo602002@gmail.com>
Date: Fri, 22 Sep 2023 11:19:00 -0300
Subject: [PATCH] Review changes.

---
 src/battle_anim_effects_1.c |  2 +-
 src/fieldmap.c              |  1 -
 src/m4a_tables.c            | 56 ++++++++++++++++++-------------------
 3 files changed, 29 insertions(+), 30 deletions(-)

diff --git a/src/battle_anim_effects_1.c b/src/battle_anim_effects_1.c
index 0368adcf80..3a558969b5 100644
--- a/src/battle_anim_effects_1.c
+++ b/src/battle_anim_effects_1.c
@@ -4734,7 +4734,7 @@ static void AnimFalseSwipeSlice(struct Sprite *sprite)
 
 static void AnimFalseSwipePositionedSlice(struct Sprite *sprite)
 {
-    sprite->x = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X_2) + 0xFFD0 + gBattleAnimArgs[0];
+    sprite->x = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X_2) - 48 + gBattleAnimArgs[0];
     sprite->y = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y_PIC_OFFSET);
     StartSpriteAnim(sprite, 1);
     sprite->data[0] = 0;
diff --git a/src/fieldmap.c b/src/fieldmap.c
index 97b5b78113..d9c4fa371a 100644
--- a/src/fieldmap.c
+++ b/src/fieldmap.c
@@ -48,7 +48,6 @@ static const struct MapConnection *GetIncomingConnection(u8 direction, int x, in
 static bool8 IsPosInIncomingConnectingMap(u8 direction, int x, int y, const struct MapConnection *connection);
 static bool8 IsCoordInIncomingConnectingMap(int coord, int srcMax, int destMax, int offset);
 
-
 #define GetBorderBlockAt(x, y)({                                                                   \
     u16 block;                                                                                     \
     int i;                                                                                         \
diff --git a/src/m4a_tables.c b/src/m4a_tables.c
index 12e6893902..4d012cea28 100644
--- a/src/m4a_tables.c
+++ b/src/m4a_tables.c
@@ -257,34 +257,34 @@ const u8 gClockTable[] =
 
 const struct PokemonCrySong gPokemonCrySongTemplate =
 {
-    1, // track count
-    0, // block count
-    255, // priority
-    0, // reverb
-    (struct ToneData *)&voicegroup000, // tone
-    {NULL, NULL}, // part
-    0, // gap
-    TUNE, // part 0
-    C_V, // TUNE value
-    GOTO,
-    0, // GOTO target address
-    TUNE, // part 1
-    C_V + 16, // TUNE value
-    {VOICE, 0}, // part 0 jumps here with GOTO
-    VOL,
-    127, // volume
-    {XCMD, 0x0D},
-    0, // unk value
-    {XCMD, xRELE},
-    0, // release
-    PAN,
-    C_V, // PAN value
-    TIE,
-    60, // TIE key (default is Cn3)
-    127, // TIE velocity
-    {XCMD, 0x0C},
-    60, // unk value
-    {EOT, FINE} // end
+    .trackCount = 1,
+    .blockCount = 0,
+    .priority = 255,
+    .reverb = 0,
+    .tone = (struct ToneData *)&voicegroup000,
+    .part = {NULL, NULL},
+    .gap = 0,
+    .part0 = TUNE,
+    .tuneValue = C_V,
+    .gotoCmd = GOTO,
+    .gotoTarget = 0,
+    .part1 = TUNE,
+    .tuneValue2 = C_V + 16,
+    .cont = {VOICE, 0}, // part0 jumps here with gotoCmd
+    .volCmd = VOL,
+    .volumeValue = 127,
+    .unkCmd0D = {XCMD, 0x0D},
+    .unkCmd0DParam = 0,
+    .xreleCmd = {XCMD, xRELE},
+    .releaseValue = 0,
+    .panCmd = PAN,
+    .panValue = C_V,
+    .tieCmd = TIE,
+    .tieKeyValue = 60, // default is Cn3
+    .tieVelocityValue = 127,
+    .unkCmd0C = {XCMD, 0x0C},
+    .unkCmd0CParam = 60,
+    .end = {EOT, FINE}
 };
 
 const XcmdFunc gXcmdTable[] =