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/ss_anne.c
+4 -4
View File
@@ -14,9 +14,9 @@ static void Task_SSAnneInit(u8 taskId);
static void Task_SSAnneRun(u8 taskId);
static void Task_SSAnneFinish(u8 taskId);
static void CreateWakeBehindBoat(void);
static void WakeSpriteCallback(struct Sprite * sprite);
static void WakeSpriteCallback(struct Sprite *sprite);
static void CreateSmokeSprite(void);
static void SmokeSpriteCallback(struct Sprite * sprite);
static void SmokeSpriteCallback(struct Sprite *sprite);
static const u16 sWakeTiles[] = INCBIN_U16("graphics/ss_anne/unk_8479838.4bpp");
static const u16 sSmokeTiles[] = INCBIN_U16("graphics/ss_anne/unk_8479A38.4bpp");
@@ -156,7 +156,7 @@ static void CreateWakeBehindBoat(void)
gSprites[spriteId].oam.paletteNum = 10;
}
static void WakeSpriteCallback(struct Sprite * sprite)
static void WakeSpriteCallback(struct Sprite *sprite)
{
u8 objectEventId;
struct ObjectEvent * boatObject;
@@ -191,7 +191,7 @@ static void CreateSmokeSprite(void)
}
}
static void SmokeSpriteCallback(struct Sprite * sprite)
static void SmokeSpriteCallback(struct Sprite *sprite)
{
sprite->data[0]++;
sprite->x2 = sprite->data[0] / 4;