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

mostly standardize to object event to prep for disassembly

Browse Source
This commit is contained in:
garak
2019-12-02 13:34:11 -05:00
parent ebd3a13717
commit 36b2301fd2
238 changed files with 5708 additions and 2145 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ss_anne.c
+12 -12
View File
@@ -104,7 +104,7 @@ static void Task_SSAnneRun(u8 taskId)
{
s16 * data = gTasks[taskId].data;
u8 mapObjectId;
struct MapObject * boatObject;
struct ObjectEvent * boatObject;
s16 x;
data[1]++;
@@ -114,8 +114,8 @@ static void Task_SSAnneRun(u8 taskId)
data[1] = 0;
CreateSmokeSprite();
}
TryGetFieldObjectIdByLocalIdAndMap(1, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &mapObjectId);
boatObject = &gMapObjects[mapObjectId];
TryGetObjectEventIdByLocalIdAndMap(1, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &mapObjectId);
boatObject = &gObjectEvents[mapObjectId];
if (gSprites[boatObject->spriteId].pos1.x + gSprites[boatObject->spriteId].pos2.x < -120)
{
PlaySE(SE_KITEKI);
@@ -144,12 +144,12 @@ static void Task_SSAnneFinish(u8 taskId)
static void CreateWakeBehindBoat(void)
{
u8 mapObjectId;
struct MapObject * boatObject;
struct ObjectEvent * boatObject;
u16 x;
u8 spriteId;
TryGetFieldObjectIdByLocalIdAndMap(1, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &mapObjectId);
boatObject = &gMapObjects[mapObjectId];
TryGetObjectEventIdByLocalIdAndMap(1, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &mapObjectId);
boatObject = &gObjectEvents[mapObjectId];
x = gSprites[boatObject->spriteId].pos1.x + gSprites[boatObject->spriteId].pos2.x + 80;
spriteId = CreateSprite(&sWakeSpriteTemplate, x, 109, 0xFF);
gSprites[spriteId].oam.priority = 2;
@@ -159,11 +159,11 @@ static void CreateWakeBehindBoat(void)
static void WakeSpriteCallback(struct Sprite * sprite)
{
u8 mapObjectId;
struct MapObject * boatObject;
struct ObjectEvent * boatObject;
u16 x;
TryGetFieldObjectIdByLocalIdAndMap(1, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &mapObjectId);
boatObject = &gMapObjects[mapObjectId];
TryGetObjectEventIdByLocalIdAndMap(1, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &mapObjectId);
boatObject = &gObjectEvents[mapObjectId];
x = gSprites[boatObject->spriteId].pos1.x + gSprites[boatObject->spriteId].pos2.x + 80;
sprite->pos1.x = x;
if (sprite->data[0] / 6 < 22)
@@ -176,12 +176,12 @@ static void WakeSpriteCallback(struct Sprite * sprite)
static void CreateSmokeSprite(void)
{
u8 mapObjectId;
struct MapObject * boatObject;
struct ObjectEvent * boatObject;
u16 x;
u8 spriteId;
TryGetFieldObjectIdByLocalIdAndMap(1, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &mapObjectId);
boatObject = &gMapObjects[mapObjectId];
TryGetObjectEventIdByLocalIdAndMap(1, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &mapObjectId);
boatObject = &gObjectEvents[mapObjectId];
x = gSprites[boatObject->spriteId].pos1.x + gSprites[boatObject->spriteId].pos2.x + 49;
if ((s16)x >= -32)
{