summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorDizzyEggg <jajkodizzy@wp.pl>2017-08-20 17:27:54 +0200
committerDizzyEggg <jajkodizzy@wp.pl>2017-08-20 17:27:54 +0200
commitf84d0541314b043fa3ef4e2b9a56809f278787f9 (patch)
tree898f014b96b25d9b3cce610babff6523ca89cae4 /include
parentc87e2d89e33b07ea9cbb9c73ecfdb95d7bc8d4b9 (diff)
mugshots tasks done
Diffstat (limited to 'include')
-rw-r--r--include/battle_transition.h16
-rw-r--r--include/songs.h2
2 files changed, 16 insertions, 2 deletions
diff --git a/include/battle_transition.h b/include/battle_transition.h
index bc78bd06e..a709a2f7b 100644
--- a/include/battle_transition.h
+++ b/include/battle_transition.h
@@ -5,6 +5,20 @@ void sub_811AABC(u8);
void sub_811AAD8(u8);
bool8 IsBattleTransitionDone(void);
-#define B_TRANSITION_WILD 8
+enum // TRANSITION_MUGSHOT
+{
+ MUGSHOT_SYDNEY,
+ MUGSHOT_PHOEBE,
+ MUGSHOT_GLACIA,
+ MUGSHOT_DRAKE,
+ MUGSHOT_STEVEN,
+};
+
+#define B_TRANSITION_WILD 8
+#define B_TRANSITION_SYDNEY 12
+#define B_TRANSITION_PHOEBE 13
+#define B_TRANSITION_GLACIA 13
+#define B_TRANSITION_DRAKE 14
+#define B_TRANSITION_STEVEN 15
#endif // GUARD_BATTLE_TRANSITION_H
diff --git a/include/songs.h b/include/songs.h
index 8cf7ee5e9..a287f6436 100644
--- a/include/songs.h
+++ b/include/songs.h
@@ -107,7 +107,7 @@ enum
SE_C_PIKON,
SE_REAPOKE,
SE_OP_BASYU,
- SE_BT_START,
+ /*0x68*/ SE_BT_START,
SE_DENDOU,
SE_JIHANKI,
SE_TAMA,