diff options
author | Cameron Hall <camthesaxman@users.noreply.github.com> | 2017-12-05 11:57:54 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-12-05 11:57:54 -0600 |
commit | 7597433af6bb89986cf7c69617923cabcbec17c1 (patch) | |
tree | 76480f2a45cb5a6f1fd5ff845fde26a06bf5513c /src/hall_of_fame.c | |
parent | 0250aefb73a995a6812a657193abeb96eb34d489 (diff) | |
parent | ddcf52bcae7ed6909215f2c79b3e75ffb1f940bd (diff) |
Merge pull request #130 from DizzyEggg/decompile_pokeball
Decompile pokeball
Diffstat (limited to 'src/hall_of_fame.c')
-rw-r--r-- | src/hall_of_fame.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c index bc7177bd7..af1f9813a 100644 --- a/src/hall_of_fame.c +++ b/src/hall_of_fame.c @@ -580,9 +580,9 @@ static void Task_Hof_SetMonDisplayTask(u8 taskId) gTasks[taskId].func = Task_Hof_DisplayMon; } -#define tDestinationX data1 -#define tDestinationY data2 -#define tSpecies data7 +#define tDestinationX data[1] +#define tDestinationY data[2] +#define tSpecies data[7] static void Task_Hof_DisplayMon(u8 taskId) { @@ -613,7 +613,7 @@ static void Task_Hof_DisplayMon(u8 taskId) spriteId = sub_818D3E4(currMon->species, currMon->tid, currMon->personality, 1, xPos, yPos, currMonId, 0xFFFF); gSprites[spriteId].tDestinationX = field4; gSprites[spriteId].tDestinationY = field6; - gSprites[spriteId].data0 = 0; + gSprites[spriteId].data[0] = 0; gSprites[spriteId].tSpecies = currMon->species; gSprites[spriteId].callback = SpriteCB_GetOnScreenAndAnimate; gTasks[taskId].tMonSpriteId(currMonId) = spriteId; @@ -1404,13 +1404,13 @@ static void sub_81751A4(struct Sprite* sprite) u8 tableID; sprite->pos2.y++; - sprite->pos2.y += sprite->data1; + sprite->pos2.y += sprite->data[1]; - tableID = sprite->data0; + tableID = sprite->data[0]; rand = (Random() % 4) + 8; sprite->pos2.x = rand * gSineTable[tableID] / 256; - sprite->data0 += 4; + sprite->data[0] += 4; } } @@ -1428,9 +1428,9 @@ static bool8 sub_81751FC(void) StartSpriteAnim(sprite, Random() % 17); if (Random() & 3) - sprite->data1 = 0; + sprite->data[1] = 0; else - sprite->data1 = 1; + sprite->data[1] = 1; return FALSE; } |