dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Synced src/mon_markings.c and partly synced PSS

Browse Source
This commit is contained in:
Eduardo Quezada
2022-07-30 02:22:59 -04:00
parent 4a60396428
commit 60ce72fa5a
88 changed files with 1742 additions and 1590 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/seagallop.c
+6 -6
View File
@@ -18,7 +18,7 @@
#define PALTAG_FERRY_WAKE 3000
static EWRAM_DATA void * sBg3TilemapBuffer = NULL;
static EWRAM_DATA void *sBg3TilemapBuffer = NULL;
static void CB2_SetUpSeagallopScene(void);
static void VBlankCB_SeaGallop(void);
@@ -34,9 +34,9 @@ static void ResetBGPos(void);
static void LoadFerrySpriteResources(void);
static void FreeFerrySpriteResources(void);
static void CreateFerrySprite(void);
static void SpriteCB_Ferry(struct Sprite * sprite);
static void SpriteCB_Ferry(struct Sprite *sprite);
static void CreateWakeSprite(s16 x);
static void SpriteCB_Wake(struct Sprite * sprite);
static void SpriteCB_Wake(struct Sprite *sprite);
static bool8 GetDirectionOfTravel(void);
static const u16 sWaterTiles[] = INCBIN_U16("graphics/seagallop/water.4bpp");
@@ -328,7 +328,7 @@ static void Task_Seagallop_3(void)
static void ResetGPU(void)
{
void * dest = (void *) VRAM;
void *dest = (void *) VRAM;
DmaClearLarge16(3, dest, VRAM_SIZE, 0x1000);
DmaClear32(3, (void *)OAM, OAM_SIZE);
@@ -410,7 +410,7 @@ static void CreateFerrySprite(void)
}
}
static void SpriteCB_Ferry(struct Sprite * sprite)
static void SpriteCB_Ferry(struct Sprite *sprite)
{
sprite->data[1] += sprite->data[0];
sprite->x2 = sprite->data[1] >> 4;
@@ -437,7 +437,7 @@ static void CreateWakeSprite(s16 x)
}
}
static void SpriteCB_Wake(struct Sprite * sprite)
static void SpriteCB_Wake(struct Sprite *sprite)
{
if (sprite->animEnded)
{