diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2017-10-03 15:37:21 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-03 15:37:21 -0500 |
| commit | 09d5d81c9cd2295ec1a52323c7a8337313a3b021 (patch) | |
| tree | 18e58bee1c267234dc827b8994cc1746f4bf7c9c | |
| parent | d32ec8bf7246468625ab68a2d62835d70b7ac98c (diff) | |
| parent | c8114eb3a5c9ca2b63fbed90e0e6715b4957b2b7 (diff) | |
Merge pull request #60 from DizzyEggg/branchname
Create battle_transition.h
| -rw-r--r-- | include/battle.h | 3 | ||||
| -rw-r--r-- | include/battle_transition.h | 6 | ||||
| -rw-r--r-- | src/tileset_anims.c | 2 |
3 files changed, 7 insertions, 4 deletions
diff --git a/include/battle.h b/include/battle.h index bc70b86ea..67d3d873d 100644 --- a/include/battle.h +++ b/include/battle.h @@ -927,9 +927,6 @@ u8 GetBankSide(u8 bank); u8 GetBankIdentity(u8 bank); u8 GetBankByIdentity(u8 bank); -// battle_transition -void sub_8149DFC(u8 a1); - // Move this somewhere else #include "sprite.h" diff --git a/include/battle_transition.h b/include/battle_transition.h new file mode 100644 index 000000000..1603f5c93 --- /dev/null +++ b/include/battle_transition.h @@ -0,0 +1,6 @@ +#ifndef GUARD_BATTLE_TRANSITION_H +#define GUARD_BATTLE_TRANSITION_H + +void sub_8149DFC(u8 a1); + +#endif // GUARD_BATTLE_TRANSITION_H diff --git a/src/tileset_anims.c b/src/tileset_anims.c index e53461e02..4ad787e1c 100644 --- a/src/tileset_anims.c +++ b/src/tileset_anims.c @@ -3,7 +3,7 @@ #include "global.h" #include "palette.h" #include "blend_palette.h" -#include "battle.h" +#include "battle_transition.h" #include "task.h" // Static type declarations |