diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-06-21 20:47:58 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-21 20:47:58 +0200 |
| commit | c84bb67156d6ab822b6ff1b508e9fae73f054675 (patch) | |
| tree | 5973f1e72156bb75cb6561a11dd7f333b90fcb3f /include/rom_8077ABC.h | |
| parent | 11ad653b57d811dbe8df831d4987128da39bdcb5 (diff) | |
| parent | 42ae04c74fe07d05175efb4df143dbcf1b2752bc (diff) | |
Merge pull request #2 from pret/master
be up to date with master2
Diffstat (limited to 'include/rom_8077ABC.h')
| -rw-r--r-- | include/rom_8077ABC.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/include/rom_8077ABC.h b/include/rom_8077ABC.h index 26c89d4cc..11e94e1f5 100644 --- a/include/rom_8077ABC.h +++ b/include/rom_8077ABC.h @@ -12,16 +12,16 @@ void sub_8078314(struct Sprite *sprite); void sub_8078364(struct Sprite *sprite); void sub_8078458(struct Sprite *sprite); void sub_80784A8(struct Sprite *sprite); -u8 battle_side_get_owner(u8); -u8 battle_side_get_owner(u8); -u8 battle_side_get_owner(u8 side); -u8 battle_side_get_owner(u8 slot); -u8 battle_side_get_owner(u8); -u8 battle_get_per_side_status(u8); -u8 battle_get_per_side_status(u8 slot); -u8 battle_get_side_with_given_state(u8); -u8 battle_get_side_with_given_state(u8); -u8 battle_get_side_with_given_state(u8 state); +u8 GetBankSide(u8); +u8 GetBankSide(u8); +u8 GetBankSide(u8 side); +u8 GetBankSide(u8 slot); +u8 GetBankSide(u8); +u8 GetBankIdentity(u8); +u8 GetBankIdentity(u8 slot); +u8 GetBankByPlayerAI(u8); +u8 GetBankByPlayerAI(u8); +u8 GetBankByPlayerAI(u8 state); u8 sub_8078874(u8); bool8 sub_8078874(u8); bool8 IsDoubleBattle(); @@ -50,7 +50,7 @@ void sub_8079BF4(s16 *bottom, s16 *top, void *ptr); void *sub_8079BFC(s16 bottom, s16 top); void sub_8079E24(); u8 sub_8079E90(u8 slot); -u8 battle_get_per_side_status_permutated(u8 slot); +u8 GetBankIdentity_permutated(u8 slot); void sub_807A784(u8 taskId); void sub_807A850(struct Task *task, u8 taskId); void sub_807A8D4(struct Sprite *sprite); |