Review changes.

This commit is contained in:
Eduardo Quezada
2023-09-22 11:19:00 -03:00
parent af210da972
commit a56eb4f53f
3 changed files with 29 additions and 30 deletions
+1 -1
View File
@@ -4734,7 +4734,7 @@ static void AnimFalseSwipeSlice(struct Sprite *sprite)
static void AnimFalseSwipePositionedSlice(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); sprite->y = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y_PIC_OFFSET);
StartSpriteAnim(sprite, 1); StartSpriteAnim(sprite, 1);
sprite->data[0] = 0; sprite->data[0] = 0;
-1
View File
@@ -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 IsPosInIncomingConnectingMap(u8 direction, int x, int y, const struct MapConnection *connection);
static bool8 IsCoordInIncomingConnectingMap(int coord, int srcMax, int destMax, int offset); static bool8 IsCoordInIncomingConnectingMap(int coord, int srcMax, int destMax, int offset);
#define GetBorderBlockAt(x, y)({ \ #define GetBorderBlockAt(x, y)({ \
u16 block; \ u16 block; \
int i; \ int i; \
+28 -28
View File
@@ -257,34 +257,34 @@ const u8 gClockTable[] =
const struct PokemonCrySong gPokemonCrySongTemplate = const struct PokemonCrySong gPokemonCrySongTemplate =
{ {
1, // track count .trackCount = 1,
0, // block count .blockCount = 0,
255, // priority .priority = 255,
0, // reverb .reverb = 0,
(struct ToneData *)&voicegroup000, // tone .tone = (struct ToneData *)&voicegroup000,
{NULL, NULL}, // part .part = {NULL, NULL},
0, // gap .gap = 0,
TUNE, // part 0 .part0 = TUNE,
C_V, // TUNE value .tuneValue = C_V,
GOTO, .gotoCmd = GOTO,
0, // GOTO target address .gotoTarget = 0,
TUNE, // part 1 .part1 = TUNE,
C_V + 16, // TUNE value .tuneValue2 = C_V + 16,
{VOICE, 0}, // part 0 jumps here with GOTO .cont = {VOICE, 0}, // part0 jumps here with gotoCmd
VOL, .volCmd = VOL,
127, // volume .volumeValue = 127,
{XCMD, 0x0D}, .unkCmd0D = {XCMD, 0x0D},
0, // unk value .unkCmd0DParam = 0,
{XCMD, xRELE}, .xreleCmd = {XCMD, xRELE},
0, // release .releaseValue = 0,
PAN, .panCmd = PAN,
C_V, // PAN value .panValue = C_V,
TIE, .tieCmd = TIE,
60, // TIE key (default is Cn3) .tieKeyValue = 60, // default is Cn3
127, // TIE velocity .tieVelocityValue = 127,
{XCMD, 0x0C}, .unkCmd0C = {XCMD, 0x0C},
60, // unk value .unkCmd0CParam = 60,
{EOT, FINE} // end .end = {EOT, FINE}
}; };
const XcmdFunc gXcmdTable[] = const XcmdFunc gXcmdTable[] =