diff options
author | garak <garakmon@gmail.com> | 2018-09-24 10:54:12 -0400 |
---|---|---|
committer | garak <garakmon@gmail.com> | 2018-09-24 10:54:12 -0400 |
commit | 58030e1e1ccf9e16527da510e64501fa73688d2f (patch) | |
tree | a72fd74d24662b9d01127a970aa8130bfce0eb56 /src | |
parent | c118a58f563648e0e4d824ed453386940d95e485 (diff) |
second arg of sub_8078764 is bool8
Diffstat (limited to 'src')
-rw-r--r-- | src/battle/anim/current.c | 2 | ||||
-rw-r--r-- | src/battle/anim/fight.c | 14 | ||||
-rw-r--r-- | src/battle/anim/flying.c | 4 | ||||
-rw-r--r-- | src/battle/anim/ghost.c | 4 | ||||
-rw-r--r-- | src/battle/anim/ground.c | 2 | ||||
-rw-r--r-- | src/battle/anim/heal.c | 2 | ||||
-rw-r--r-- | src/battle/anim/hop_2.c | 2 | ||||
-rw-r--r-- | src/battle/anim/ice.c | 8 | ||||
-rw-r--r-- | src/battle/anim/normal.c | 10 | ||||
-rw-r--r-- | src/battle/anim/orbit.c | 2 | ||||
-rw-r--r-- | src/battle/anim/orbs.c | 2 | ||||
-rw-r--r-- | src/battle/anim/psychic.c | 4 | ||||
-rw-r--r-- | src/battle/anim/rock.c | 2 | ||||
-rw-r--r-- | src/battle/anim/tendrils.c | 2 | ||||
-rw-r--r-- | src/battle/anim/tile.c | 2 | ||||
-rw-r--r-- | src/battle/anim/water.c | 4 | ||||
-rw-r--r-- | src/battle/battle_anim_812C144.c | 6 | ||||
-rw-r--r-- | src/rom_8077ABC.c | 7 |
18 files changed, 40 insertions, 39 deletions
diff --git a/src/battle/anim/current.c b/src/battle/anim/current.c index fb7bc4e1c..ea73b0116 100644 --- a/src/battle/anim/current.c +++ b/src/battle/anim/current.c @@ -463,7 +463,7 @@ static void sub_80D672C(struct Sprite *sprite) void sub_80D679C(struct Sprite *sprite) { - sub_8078764(sprite, 0); + sub_8078764(sprite, FALSE); sprite->oam.tileNum += gBattleAnimArgs[3] * 4; if (gBattleAnimArgs[3] == 1) diff --git a/src/battle/anim/fight.c b/src/battle/anim/fight.c index 1a534aec7..505356a57 100644 --- a/src/battle/anim/fight.c +++ b/src/battle/anim/fight.c @@ -480,7 +480,7 @@ void AnimBasicFistOrFoot(struct Sprite *sprite) if (gBattleAnimArgs[3] == 0) InitAnimSpritePos(sprite, 1); else - sub_8078764(sprite, 1); + sub_8078764(sprite, TRUE); sprite->data[0] = gBattleAnimArgs[2]; sprite->callback = WaitAnimForDuration; @@ -553,7 +553,7 @@ static void sub_80D927C(struct Sprite *sprite) void sub_80D92D0(struct Sprite *sprite) { - sub_8078764(sprite, 1); + sub_8078764(sprite, TRUE); sprite->data[0] = 30; if (gBattleAnimArgs[2] == 0) @@ -593,7 +593,7 @@ void sub_80D9378(struct Sprite *sprite) if ((gAnimBankAttacker ^ 2) == gAnimBankTarget && GetBattlerPosition(gAnimBankTarget) < 2) gBattleAnimArgs[0] *= -1; - sub_8078764(sprite, 1); + sub_8078764(sprite, TRUE); if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER) gBattleAnimArgs[2] = -gBattleAnimArgs[2]; @@ -634,7 +634,7 @@ static void sub_80D9404(struct Sprite *sprite) // arg 3: spin duration void AnimSpinningKickOrPunch(struct Sprite *sprite) { - sub_8078764(sprite, 1); + sub_8078764(sprite, TRUE); StartSpriteAnim(sprite, gBattleAnimArgs[2]); sprite->data[0] = gBattleAnimArgs[3]; @@ -658,7 +658,7 @@ static void AnimSpinningKickOrPunchFinish(struct Sprite *sprite) // arg 2: initial wait duration void AnimStompFoot(struct Sprite *sprite) { - sub_8078764(sprite, 1); + sub_8078764(sprite, TRUE); sprite->data[0] = gBattleAnimArgs[2]; sprite->callback = AnimStompFootStep; @@ -689,7 +689,7 @@ void sub_80D9540(struct Sprite *sprite) { if (sprite->data[0] == 0) { - sub_8078764(sprite, 1); + sub_8078764(sprite, TRUE); sprite->data[1] = gBattleAnimArgs[2]; sprite->data[2] = gBattleAnimArgs[3]; sprite->data[0]++; @@ -986,7 +986,7 @@ void sub_80D9BD4(struct Sprite *sprite) if (gBattleAnimArgs[2] == 0) InitAnimSpritePos(sprite, 0); else - sub_8078764(sprite, 0); + sub_8078764(sprite, FALSE); if (IsContest()) { diff --git a/src/battle/anim/flying.c b/src/battle/anim/flying.c index 5c2f3a357..646c80c53 100644 --- a/src/battle/anim/flying.c +++ b/src/battle/anim/flying.c @@ -371,7 +371,7 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA65C = void sub_80DA034(struct Sprite *sprite) { - sub_8078764(sprite, 0); + sub_8078764(sprite, FALSE); sprite->pos1.y += 20; sprite->data[1] = 0xBF; sprite->callback = sub_80DA05C; @@ -2178,7 +2178,7 @@ void sub_80DB000(struct Sprite *sprite) } else { - sub_8078764(sprite, 0); + sub_8078764(sprite, FALSE); } if ((!gBattleAnimArgs[2] && !GetBattlerSide(gAnimBankAttacker)) diff --git a/src/battle/anim/ghost.c b/src/battle/anim/ghost.c index c11cea5a0..124ff1c4e 100644 --- a/src/battle/anim/ghost.c +++ b/src/battle/anim/ghost.c @@ -320,7 +320,7 @@ static void sub_80DDCC8(struct Sprite *sprite) static void sub_80DDD58(struct Sprite *sprite) { - sub_8078764(sprite, 1); + sub_8078764(sprite, TRUE); sprite->callback = sub_80DDD78; sub_80DDD78(sprite); } @@ -463,7 +463,7 @@ static void sub_80DDFE8(struct Sprite *sprite) static void sub_80DE0FC(struct Sprite *sprite) { - sub_8078764(sprite, 1); + sub_8078764(sprite, TRUE); sprite->callback = sub_80DE114; } diff --git a/src/battle/anim/ground.c b/src/battle/anim/ground.c index cf73ead2f..407abeddc 100644 --- a/src/battle/anim/ground.c +++ b/src/battle/anim/ground.c @@ -196,7 +196,7 @@ static void AnimBonemerangProjectileEnd(struct Sprite *sprite) // arg 4: duration static void AnimBoneHitProjectile(struct Sprite *sprite) { - sub_8078764(sprite, 1); + sub_8078764(sprite, TRUE); if (GetBattlerSide(gAnimBankAttacker) != B_SIDE_PLAYER) gBattleAnimArgs[2] = -gBattleAnimArgs[2]; diff --git a/src/battle/anim/heal.c b/src/battle/anim/heal.c index c2bce0e77..e0b8f9b9e 100644 --- a/src/battle/anim/heal.c +++ b/src/battle/anim/heal.c @@ -41,7 +41,7 @@ void sub_80CBAA4(struct Sprite* sprite) { if (sprite->data[0] == 0) { - sub_8078764(sprite, 0); + sub_8078764(sprite, FALSE); sprite->data[1] = gBattleAnimArgs[2]; } diff --git a/src/battle/anim/hop_2.c b/src/battle/anim/hop_2.c index ab239f3c4..108b06c60 100644 --- a/src/battle/anim/hop_2.c +++ b/src/battle/anim/hop_2.c @@ -35,7 +35,7 @@ void sub_80CBAE8(struct Sprite* sprite) { s16 p1; s16 p2; - sub_8078764(sprite, 0); + sub_8078764(sprite, FALSE); p1 = GetBattlerSpriteCoord(gAnimBankAttacker, 0); p2 = GetBattlerSpriteCoord(gAnimBankAttacker, 1); if ((gAnimBankTarget ^ 2) == gAnimBankAttacker) diff --git a/src/battle/anim/ice.c b/src/battle/anim/ice.c index 0ff236523..e2288e704 100644 --- a/src/battle/anim/ice.c +++ b/src/battle/anim/ice.c @@ -851,7 +851,7 @@ static void AnimIceEffectParticle(struct Sprite *sprite) { if (gBattleAnimArgs[2] == 0) { - sub_8078764(sprite, 1); + sub_8078764(sprite, TRUE); } else { @@ -1087,7 +1087,7 @@ static void AnimWaveFromCenterOfTarget(struct Sprite *sprite) { if (gBattleAnimArgs[2] == 0) { - sub_8078764(sprite, 0); + sub_8078764(sprite, FALSE); } else { @@ -1144,7 +1144,7 @@ static void InitSwirlingFogAnim(struct Sprite *sprite) { if (gBattleAnimArgs[5] == 0) { - sub_8078764(sprite, 0); + sub_8078764(sprite, FALSE); } else { @@ -2282,7 +2282,7 @@ static void InitIceBallParticle(struct Sprite *sprite) s16 randA, randB; sprite->oam.tileNum += 8; - sub_8078764(sprite, 1); + sub_8078764(sprite, TRUE); randA = (Random() & 0xFF) + 256; randB = Random() & 0x1FF; diff --git a/src/battle/anim/normal.c b/src/battle/anim/normal.c index 7564c529c..596eb919f 100644 --- a/src/battle/anim/normal.c +++ b/src/battle/anim/normal.c @@ -854,7 +854,7 @@ static void sub_80E27A0(struct Sprite *sprite) if (gBattleAnimArgs[2] == 0) InitAnimSpritePos(sprite, 1); else - sub_8078764(sprite, 1); + sub_8078764(sprite, TRUE); sprite->callback = sub_80785E4; StoreSpriteCallbackInData(sprite, DestroyAnimSprite); @@ -866,7 +866,7 @@ static void sub_80E27E8(struct Sprite *sprite) if (gBattleAnimArgs[2] == 0) InitAnimSpritePos(sprite, 1); else - sub_8078764(sprite, 1); + sub_8078764(sprite, TRUE); sprite->data[0] = gBattleAnimArgs[4]; sprite->callback = sub_80785E4; @@ -890,7 +890,7 @@ static void sub_80E2870(struct Sprite *sprite) if (gBattleAnimArgs[0] == 0) InitAnimSpritePos(sprite, 0); else - sub_8078764(sprite, 0); + sub_8078764(sprite, FALSE); sprite->pos2.x += (Random() % 48) - 24; sprite->pos2.y += (Random() % 24) - 12; @@ -916,7 +916,7 @@ static void sub_80E2978(struct Sprite *sprite) if (gBattleAnimArgs[2] == 0) InitAnimSpritePos(sprite, 1); else - sub_8078764(sprite, 1); + sub_8078764(sprite, TRUE); sprite->data[0] = gBattleAnimArgs[3]; StoreSpriteCallbackInData(sprite, DestroyAnimSprite); @@ -929,7 +929,7 @@ static void sub_80E29C0(struct Sprite *sprite) if (gBattleAnimArgs[2] == 0) InitAnimSpritePos(sprite, 1); else - sub_8078764(sprite, 1); + sub_8078764(sprite, TRUE); sprite->callback = sub_80E29FC; } diff --git a/src/battle/anim/orbit.c b/src/battle/anim/orbit.c index f938a2707..5d82b2842 100644 --- a/src/battle/anim/orbit.c +++ b/src/battle/anim/orbit.c @@ -89,7 +89,7 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D6440 = void sub_80CABF8(struct Sprite* sprite) { - sub_8078764(sprite, 1); + sub_8078764(sprite, TRUE); StartSpriteAnim(sprite, gBattleAnimArgs[4]); if (gBattleAnimArgs[4] == 1) { diff --git a/src/battle/anim/orbs.c b/src/battle/anim/orbs.c index b97f0c246..d4886d1f8 100644 --- a/src/battle/anim/orbs.c +++ b/src/battle/anim/orbs.c @@ -267,7 +267,7 @@ void sub_80CA928(u8 taskId) void sub_80CA9A8(struct Sprite* sprite) { - sub_8078764(sprite, 1); + sub_8078764(sprite, TRUE); sprite->data[0] = gBattleAnimArgs[3]; sprite->data[2] = GetBattlerSpriteCoord(gAnimBankAttacker, 2); sprite->data[4] = GetBattlerSpriteCoord(gAnimBankAttacker, 3); diff --git a/src/battle/anim/psychic.c b/src/battle/anim/psychic.c index 704fa0306..ef263b971 100644 --- a/src/battle/anim/psychic.c +++ b/src/battle/anim/psychic.c @@ -562,9 +562,9 @@ void sub_80DBA4C(struct Sprite *sprite) if (sprite->data[0] == 0) { int arg3 = gBattleAnimArgs[3]; - u8 var0 = 0; + bool8 var0 = FALSE; if (arg3 == 0) - var0 = 1; + var0 = TRUE; if (!IsContest() && IsDoubleBattle()) { diff --git a/src/battle/anim/rock.c b/src/battle/anim/rock.c index 7738e4d0c..a4d2441f3 100644 --- a/src/battle/anim/rock.c +++ b/src/battle/anim/rock.c @@ -387,7 +387,7 @@ void sub_80DCFE4(struct Sprite *sprite) if (gBattleAnimArgs[6] == 0) InitAnimSpritePos(sprite, 0); else - sub_8078764(sprite, 0); + sub_8078764(sprite, FALSE); sprite->data[0] = gBattleAnimArgs[3]; sprite->data[1] = gBattleAnimArgs[2]; diff --git a/src/battle/anim/tendrils.c b/src/battle/anim/tendrils.c index 55e2c21bb..cee45b648 100644 --- a/src/battle/anim/tendrils.c +++ b/src/battle/anim/tendrils.c @@ -70,7 +70,7 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D65A0 = void sub_80CB25C(struct Sprite* sprite) { - sub_8078764(sprite, 0); + sub_8078764(sprite, FALSE); sprite->affineAnimPaused = 1; StartSpriteAffineAnim(sprite, gBattleAnimArgs[2]); sprite->data[6] = gBattleAnimArgs[2]; diff --git a/src/battle/anim/tile.c b/src/battle/anim/tile.c index 12cfd53b3..0442321d6 100644 --- a/src/battle/anim/tile.c +++ b/src/battle/anim/tile.c @@ -157,7 +157,7 @@ void sub_80CE108(u8 taskId) void sub_80CE17C(struct Sprite* sprite) { - sub_8078764(sprite, 0); + sub_8078764(sprite, FALSE); sprite->animPaused = 1; sprite->data[0] = gBattleAnimArgs[2]; sprite->callback = sub_80CE1AC; diff --git a/src/battle/anim/water.c b/src/battle/anim/water.c index 1c354d916..487624224 100644 --- a/src/battle/anim/water.c +++ b/src/battle/anim/water.c @@ -192,7 +192,7 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_83D9438 = void sub_80D37FC(struct Sprite *sprite) { - sub_8078764(sprite, 1); + sub_8078764(sprite, TRUE); sprite->data[0] = gBattleAnimArgs[4]; sprite->data[2] = sprite->pos1.x + gBattleAnimArgs[2]; @@ -206,7 +206,7 @@ void sub_80D3838(struct Sprite *sprite) { if (gBattleAnimArgs[3] != 0) { - sub_8078764(sprite, 1); + sub_8078764(sprite, TRUE); } else { diff --git a/src/battle/battle_anim_812C144.c b/src/battle/battle_anim_812C144.c index 6edc56549..495632fee 100644 --- a/src/battle/battle_anim_812C144.c +++ b/src/battle/battle_anim_812C144.c @@ -190,7 +190,7 @@ void sub_812C2BC(struct Sprite *sprite) u8 x = GetBattlerSpriteCoord(gAnimBankTarget, 2); u8 y = GetBattlerSpriteCoord(gAnimBankTarget, 3); - sub_8078764(sprite, 1); + sub_8078764(sprite, TRUE); rotation = ArcTan2Neg(sprite->pos1.x - x, sprite->pos1.y - y); rotation += 0x6000; @@ -494,7 +494,7 @@ void sub_812C990(struct Sprite *sprite) REG_WIN0H = 0; REG_WIN0V = 0; - sub_8078764(sprite, 0); + sub_8078764(sprite, FALSE); sprite->oam.objMode = ST_OAM_OBJ_WINDOW; sprite->invisible = 1; @@ -2037,7 +2037,7 @@ void sub_812ED84(struct Sprite *sprite) REG_WIN0V = 0; sprite->data[0] = gBattleAnimArgs[2]; - sub_8078764(sprite, 0); + sub_8078764(sprite, FALSE); sprite->oam.objMode = ST_OAM_OBJ_WINDOW; sprite->invisible = 1; sprite->callback = sub_812EE00; diff --git a/src/rom_8077ABC.c b/src/rom_8077ABC.c index e81d02251..8e8e6ef8a 100644 --- a/src/rom_8077ABC.c +++ b/src/rom_8077ABC.c @@ -1445,16 +1445,17 @@ void sub_8079518(struct Sprite *sprite) void sub_8079534(struct Sprite *sprite) { - u8 r4, slot, r7; + bool8 r4; + u8 slot, r7; if (!gBattleAnimArgs[6]) { - r4 = 1; + r4 = TRUE; r7 = 3; } else { - r4 = 0; + r4 = FALSE; r7 = 1; } if (!gBattleAnimArgs[5]) |