diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-02-10 17:29:11 -0800 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2018-02-10 17:29:11 -0800 |
| commit | c59acc702458caa610ce856ce20ac6dc12d16621 (patch) | |
| tree | 04816e5a26540fd5cd99061d6911c6fc3360574c /src/contest.c | |
| parent | aaf065aba01db7456ed9a8fd82ccb2961ea9d97a (diff) | |
Start documenting battle anims
Diffstat (limited to 'src/contest.c')
| -rw-r--r-- | src/contest.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/contest.c b/src/contest.c index e2695627e..e7740bade 100644 --- a/src/contest.c +++ b/src/contest.c @@ -47,7 +47,7 @@ extern u16 gBattleTypeFlags; extern u8 gBankAttacker; extern u8 gBankTarget; extern u8 gBanksBySide[]; -extern u8 gObjectBankIDs[]; +extern u8 gBankSpriteIds[]; extern u16 gBattle_BG3_X; extern s16 gBattle_BG1_Y; extern u16 gBattle_BG3_Y; @@ -553,7 +553,7 @@ u8 sub_80AB70C(u8 *a) gBattleTypeFlags = 0; gBankAttacker = 2; gBankTarget = 3; - gObjectBankIDs[gBankAttacker] = CreateJudgeSprite(); + gBankSpriteIds[gBankAttacker] = CreateJudgeSprite(); sub_80B292C(); break; default: @@ -931,7 +931,7 @@ void debug_sub_80BA054(u8 taskId) gSprites[r6].pos2.x = 120; gSprites[r6].callback = sub_80AD8FC; gTasks[taskId].data[2] = r6; - gObjectBankIDs[gBankAttacker] = r6; + gBankSpriteIds[gBankAttacker] = r6; gTasks[taskId].data[3] = 0; gTasks[taskId].data[0]++; sContest.unk1925E = 0; @@ -1143,7 +1143,7 @@ void sub_80AC2CC(u8 taskId) gSprites[spriteId].pos2.x = 120; gSprites[spriteId].callback = sub_80AD8FC; gTasks[taskId].data[2] = spriteId; - gObjectBankIDs[gBankAttacker] = spriteId; + gBankSpriteIds[gBankAttacker] = spriteId; sub_80B0BC4(sub_80B09E4(sContest.unk19215), FALSE); gTasks[taskId].data[0] = 4; return; @@ -5415,14 +5415,14 @@ void sub_80B28F0(u8 a) void sub_80B292C(void) { - gObjectBankIDs[3] = CreateInvisibleSpriteWithCallback(SpriteCallbackDummy); - InitSpriteAffineAnim(&gSprites[gObjectBankIDs[gBankTarget]]); + gBankSpriteIds[3] = CreateInvisibleSpriteWithCallback(SpriteCallbackDummy); + InitSpriteAffineAnim(&gSprites[gBankSpriteIds[gBankTarget]]); sub_80B2968(); } void sub_80B2968(void) { - struct Sprite *sprite = &gSprites[gObjectBankIDs[3]]; + struct Sprite *sprite = &gSprites[gBankSpriteIds[3]]; sprite->pos2.x = 0; sprite->pos2.y = 0; |