From e37e10854230c3b0f2b96dfe4e8626a1352ac1c9 Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Tue, 23 Jul 2019 09:16:59 +0800 Subject: document battle transition symbols --- include/battle_transition.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include/battle_transition.h') diff --git a/include/battle_transition.h b/include/battle_transition.h index 91e564790..8f29d40b3 100644 --- a/include/battle_transition.h +++ b/include/battle_transition.h @@ -4,7 +4,7 @@ #include "global.h" void sub_8149DFC(u8 a0); -bool8 sub_80D08F8(void); -void sub_80D08B8(u8 a0); +bool8 BT_IsDone(void); +void BT_StartOnField(u8 a0); #endif // GUARD_BATTLE_TRANSITION_H -- cgit v1.2.3 From a674ba2749871cb1c26c4c17719cc784e329f815 Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Tue, 23 Jul 2019 09:31:54 +0800 Subject: updated battle transition header --- include/battle_transition.h | 33 +++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) (limited to 'include/battle_transition.h') diff --git a/include/battle_transition.h b/include/battle_transition.h index 8f29d40b3..4e9d0029c 100644 --- a/include/battle_transition.h +++ b/include/battle_transition.h @@ -3,8 +3,37 @@ #include "global.h" -void sub_8149DFC(u8 a0); bool8 BT_IsDone(void); -void BT_StartOnField(u8 a0); +void BT_StartOnField(u8 transitionId); +bool8 FldEff_Pokeball(void); + +enum +{ + MUGSHOT_LORELEI, + MUGSHOT_BRUNO, + MUGSHOT_AGATHA, + MUGSHOT_LANCE, + MUGSHOT_BLUE, + MUGSHOTS_COUNT +}; + +#define B_TRANSITION_BLUR 0 +#define B_TRANSITION_DISTORTED_WAVE 1 +#define B_TRANSITION_HORIZONTAL_CORRUGATE 2 +#define B_TRANSITION_BIG_POKEBALL 3 +#define B_TRANSITION_SLIDING_POKEBALLS 4 +#define B_TRANSITION_CLOCKWISE_BLACKFADE 5 +#define B_TRANSITION_FULLSCREEN_WAVE 6 +#define B_TRANSITION_BLACK_WAVE_TO_RIGHT 7 +#define B_TRANSITION_SLICED_SCREEN 8 +#define B_TRANSITION_WHITEFADE_IN_STRIPES 9 +#define B_TRANSITION_GRID_SQUARES 10 +#define B_TRANSITION_BLACK_DOODLES 11 +#define B_TRANSITION_LORELEI 12 +#define B_TRANSITION_BRUNO 13 +#define B_TRANSITION_AGATHA 14 +#define B_TRANSITION_LANCE 15 +#define B_TRANSITION_BLUE 16 +#define B_TRANSITION_ANTI_CLOCKWISE_SPIRAL 17 #endif // GUARD_BATTLE_TRANSITION_H -- cgit v1.2.3 From e150a620450a17bb2ab3905c04c33777dc6bf0cc Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Tue, 23 Jul 2019 14:07:10 +0800 Subject: battle transition data decomp --- include/battle_transition.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'include/battle_transition.h') diff --git a/include/battle_transition.h b/include/battle_transition.h index 4e9d0029c..4ef5f19d9 100644 --- a/include/battle_transition.h +++ b/include/battle_transition.h @@ -3,10 +3,6 @@ #include "global.h" -bool8 BT_IsDone(void); -void BT_StartOnField(u8 transitionId); -bool8 FldEff_Pokeball(void); - enum { MUGSHOT_LORELEI, @@ -36,4 +32,10 @@ enum #define B_TRANSITION_BLUE 16 #define B_TRANSITION_ANTI_CLOCKWISE_SPIRAL 17 +extern const struct SpritePalette sSpritePalette_SlidingPokeball; + +bool8 BT_IsDone(void); +void BT_StartOnField(u8 transitionId); +bool8 FldEff_Pokeball(void); + #endif // GUARD_BATTLE_TRANSITION_H -- cgit v1.2.3