diff options
| author | garak <garakmon@gmail.com> | 2018-09-29 14:30:45 -0400 |
|---|---|---|
| committer | garak <garakmon@gmail.com> | 2018-09-29 14:30:45 -0400 |
| commit | ca685eb9e661523c79467a72a077775738f8bd45 (patch) | |
| tree | 4548a9981a38732085fe41b9b392f7fa79c38c0f /src/rom_8077ABC.c | |
| parent | 6876a50bc4ffb2a86658cc1a43f60df869ca3296 (diff) | |
| parent | da01d48fee341701cbec9b39bdc649c78162ed2d (diff) | |
Merge remote-tracking branch 'upstream/master' into battle-anim-labels
Diffstat (limited to 'src/rom_8077ABC.c')
| -rw-r--r-- | src/rom_8077ABC.c | 7 |
1 files changed, 4 insertions, 3 deletions
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]) |