dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into doc-union

Browse Source
This commit is contained in:
GriffinR
2021-10-07 16:10:35 -04:00
committed by GitHub
parent e86d3410a1 001a25e49c
commit a2655ba9ab
1136 changed files with 52228 additions and 51993 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pokemon_jump.c
+53 -53
View File
@@ -126,7 +126,7 @@ enum {
#define PLAY_AGAIN_YES 2
#define TAG_MON1 0
#define TAG_MON2 1 // MON2-5 used implicitly by adding multiplayer id to tag
#define TAG_MON2 1 // MON2-5 used implicitly by adding multiplayer id to tag
#define TAG_MON3 2
#define TAG_MON4 3
#define TAG_MON5 4
@@ -1723,7 +1723,7 @@ static void UpdateVineState(void)
sPokemonJump->prevVineState = sPokemonJump->vineState;
sPokemonJump->vineState = sPokemonJump->vineStateTimer >> 8;
// If beginning upswing
if (sPokemonJump->vineState > VINE_UPSWING_LOWER && sPokemonJump->prevVineState < VINE_UPSWING_LOW)
{
@@ -1960,23 +1960,23 @@ static void HandleMonState(void)
static const s8 sJumpOffsets[][48] =
{
[JUMP_TYPE_NORMAL] = { -3, -6, -8, -10, -13, -15, -17, -19,
-21, -23, -25, -27, -28, -29,
JUMP_PEAK, JUMP_PEAK, JUMP_PEAK,
-28, -27, -26, -25, -23, -22, -20, -18,
[JUMP_TYPE_NORMAL] = { -3, -6, -8, -10, -13, -15, -17, -19,
-21, -23, -25, -27, -28, -29,
JUMP_PEAK, JUMP_PEAK, JUMP_PEAK,
-28, -27, -26, -25, -23, -22, -20, -18,
-17, -15, -13, -11, -8, -6, -4, -1},
[JUMP_TYPE_FAST] = { -3, -6, -9, -11, -14, -16, -18, -20,
-22, -24, -26, -28, -29,
JUMP_PEAK, JUMP_PEAK,
-28, -26, -24, -22, -20, -18, -16, -14,
[JUMP_TYPE_FAST] = { -3, -6, -9, -11, -14, -16, -18, -20,
-22, -24, -26, -28, -29,
JUMP_PEAK, JUMP_PEAK,
-28, -26, -24, -22, -20, -18, -16, -14,
-11, -9, -6, -4, -1},
[JUMP_TYPE_SLOW] = { -3, -6, -9, -11, -13, -15, -17, -19,
-21, -23, -25, -27, -28, -29,
JUMP_PEAK, JUMP_PEAK, JUMP_PEAK, JUMP_PEAK,
-29, -29, -28, -28, -27, -27, -26, -25,
-24, -22, -20, -18, -16, -14, -12, -11,
[JUMP_TYPE_SLOW] = { -3, -6, -9, -11, -13, -15, -17, -19,
-21, -23, -25, -27, -28, -29,
JUMP_PEAK, JUMP_PEAK, JUMP_PEAK, JUMP_PEAK,
-29, -29, -28, -28, -27, -27, -26, -25,
-24, -22, -20, -18, -16, -14, -12, -11,
-9, -6, -4, -1},
};
@@ -2248,13 +2248,13 @@ static void TryUpdateExcellentsRecord(u16 excellentsInRow)
}
static const u16 sPrizeItems[] = {
ITEM_LEPPA_BERRY,
ITEM_LUM_BERRY,
ITEM_SITRUS_BERRY,
ITEM_FIGY_BERRY,
ITEM_WIKI_BERRY,
ITEM_MAGO_BERRY,
ITEM_AGUAV_BERRY,
ITEM_LEPPA_BERRY,
ITEM_LUM_BERRY,
ITEM_SITRUS_BERRY,
ITEM_FIGY_BERRY,
ITEM_WIKI_BERRY,
ITEM_MAGO_BERRY,
ITEM_AGUAV_BERRY,
ITEM_IAPAPA_BERRY
};
@@ -2764,7 +2764,7 @@ static void DoStarAnim(struct PokemonJumpGfx *jumpGfx, int multiplayerId)
ResetPokeJumpSpriteData(jumpGfx->starSprites[multiplayerId]);
jumpGfx->starSprites[multiplayerId]->sOffset = jumpGfx->monSprites[multiplayerId] - gSprites;
jumpGfx->starSprites[multiplayerId]->invisible = FALSE;
jumpGfx->starSprites[multiplayerId]->pos1.y = 96;
jumpGfx->starSprites[multiplayerId]->y = 96;
jumpGfx->starSprites[multiplayerId]->callback = SpriteCB_Star;
StartSpriteAnim(jumpGfx->starSprites[multiplayerId], 1);
}
@@ -2781,11 +2781,11 @@ static void SpriteCB_Star(struct Sprite *sprite)
}
break;
case 1:
sprite->pos1.y--;
sprite->y--;
sprite->sTimer++;
if (sprite->pos1.y <= 72)
if (sprite->y <= 72)
{
sprite->pos1.y = 72;
sprite->y = 72;
sprite->sState++;
}
break;
@@ -2806,7 +2806,7 @@ static void SpriteCB_Star(struct Sprite *sprite)
static void Gfx_StartMonHitShake(struct PokemonJumpGfx *jumpGfx, int multiplayerId)
{
jumpGfx->monSprites[multiplayerId]->callback = SpriteCB_MonHitShake;
jumpGfx->monSprites[multiplayerId]->pos2.y = 0;
jumpGfx->monSprites[multiplayerId]->y2 = 0;
ResetPokeJumpSpriteData(jumpGfx->monSprites[multiplayerId]);
}
@@ -2823,16 +2823,16 @@ static void SpriteCB_MonHitShake(struct Sprite *sprite)
if (++sprite->sTimer > 1)
{
if (++sprite->sNumShakes & 1)
sprite->pos2.y = 2;
sprite->y2 = 2;
else
sprite->pos2.y = -2;
sprite->y2 = -2;
sprite->sTimer = 0;
}
if (sprite->sNumShakes > 12)
{
sprite->pos2.y = 0;
sprite->y2 = 0;
sprite->callback = SpriteCallbackDummy;
}
}
@@ -2919,7 +2919,7 @@ static void SpriteCB_MonIntroBounce(struct Sprite *sprite)
if (sprite->sHopPos > 127)
sprite->sHopPos = 0;
sprite->pos2.y = -(gSineTable[sprite->sHopPos] >> 3);
sprite->y2 = -(gSineTable[sprite->sHopPos] >> 3);
if (sprite->sHopPos == 0)
{
if (++sprite->sNumHops < 2)
@@ -2990,7 +2990,7 @@ static void UpdateVineAnim(struct PokemonJumpGfx *jumpGfx, int vineState)
count = 0;
for (i = 0; i < VINE_SPRITES_PER_SIDE; i++)
{
jumpGfx->vineSprites[count]->pos1.y = sVineYCoords[i][vineState];
jumpGfx->vineSprites[count]->y = sVineYCoords[i][vineState];
jumpGfx->vineSprites[count]->oam.priority = priority;
jumpGfx->vineSprites[count]->oam.paletteNum = palNum;
StartSpriteAnim(jumpGfx->vineSprites[count], vineState);
@@ -2999,7 +2999,7 @@ static void UpdateVineAnim(struct PokemonJumpGfx *jumpGfx, int vineState)
for (i = VINE_SPRITES_PER_SIDE - 1; i >= 0; i--)
{
jumpGfx->vineSprites[count]->pos1.y = sVineYCoords[i][vineState];
jumpGfx->vineSprites[count]->y = sVineYCoords[i][vineState];
jumpGfx->vineSprites[count]->oam.priority = priority;
jumpGfx->vineSprites[count]->oam.paletteNum = palNum;
StartSpriteAnim(jumpGfx->vineSprites[count], vineState);
@@ -3649,15 +3649,15 @@ enum {
};
static const u8 sVenusaurStates[] = {
[VINE_HIGHEST] = VENUSAUR_UP,
[VINE_DOWNSWING_HIGHER] = VENUSAUR_UP,
[VINE_DOWNSWING_HIGH] = VENUSAUR_NEUTRAL,
[VINE_DOWNSWING_LOW] = VENUSAUR_NEUTRAL,
[VINE_DOWNSWING_LOWER] = VENUSAUR_DOWN,
[VINE_LOWEST] = VENUSAUR_DOWN,
[VINE_UPSWING_LOWER] = VENUSAUR_DOWN,
[VINE_UPSWING_LOW] = VENUSAUR_NEUTRAL,
[VINE_UPSWING_HIGH] = VENUSAUR_NEUTRAL,
[VINE_HIGHEST] = VENUSAUR_UP,
[VINE_DOWNSWING_HIGHER] = VENUSAUR_UP,
[VINE_DOWNSWING_HIGH] = VENUSAUR_NEUTRAL,
[VINE_DOWNSWING_LOW] = VENUSAUR_NEUTRAL,
[VINE_DOWNSWING_LOWER] = VENUSAUR_DOWN,
[VINE_LOWEST] = VENUSAUR_DOWN,
[VINE_UPSWING_LOWER] = VENUSAUR_DOWN,
[VINE_UPSWING_LOW] = VENUSAUR_NEUTRAL,
[VINE_UPSWING_HIGH] = VENUSAUR_NEUTRAL,
[VINE_UPSWING_HIGHER] = VENUSAUR_UP,
};
@@ -3665,25 +3665,25 @@ static const struct CompressedSpriteSheet sSpriteSheet_Digits = {gMinigameDigits
static const struct SpritePalette sSpritePalette_Digits = {gMinigameDigits_Pal, TAG_DIGITS};
static const u16 sPlayerNameWindowCoords_2Players[] = {
6, 8,
6, 8,
16, 8
};
static const u16 sPlayerNameWindowCoords_3Players[] = {
6, 8,
11, 6,
6, 8,
11, 6,
16, 8
};
static const u16 sPlayerNameWindowCoords_4Players[] = {
2, 6,
6, 8,
16, 8,
2, 6,
6, 8,
16, 8,
20, 6
};
static const u16 sPlayerNameWindowCoords_5Players[] = {
2, 6,
6, 8,
11, 6,
16, 8,
2, 6,
6, 8,
11, 6,
16, 8,
20, 6
};
@@ -3726,7 +3726,7 @@ static void CreateJumpMonSprites(void)
static void SetMonSpriteY(u32 id, s16 y)
{
sPokemonJumpGfx->monSprites[id]->pos2.y = y;
sPokemonJumpGfx->monSprites[id]->y2 = y;
}
static void UpdateVineSwing(int vineState)