From ba176dfe0729e8c8c46a8f79c2f1b6e732ee13c8 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Mon, 1 Jan 2018 17:41:34 +0100 Subject: start working on battle transition --- include/battle_transition.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'include/battle_transition.h') diff --git a/include/battle_transition.h b/include/battle_transition.h index 84b5e37ec..108b6232b 100644 --- a/include/battle_transition.h +++ b/include/battle_transition.h @@ -1,6 +1,7 @@ #ifndef GUARD_BATTLE_TRANSITION_H #define GUARD_BATTLE_TRANSITION_H +void TestBattleTransition(u8 transitionId); void sub_8149DFC(u8 a1); void BattleTransition_StartOnField(u8 transitionID); void BattleTransition_Start(u8 transitionID); @@ -52,5 +53,6 @@ bool8 IsBattleTransitionDone(void); #define B_TRANSITION_39 39 #define B_TRANSITION_40 40 #define B_TRANSITION_41 41 +#define B_TRANSITION_COUNT 42 #endif // GUARD_BATTLE_TRANSITION_H -- cgit v1.2.3 From eb00e8ba4acab773b5bcebbc622563c60abb512d Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Tue, 2 Jan 2018 20:38:33 +0100 Subject: more work on battle transition --- include/battle_transition.h | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'include/battle_transition.h') diff --git a/include/battle_transition.h b/include/battle_transition.h index 108b6232b..2ad27dc29 100644 --- a/include/battle_transition.h +++ b/include/battle_transition.h @@ -7,6 +7,16 @@ void BattleTransition_StartOnField(u8 transitionID); void BattleTransition_Start(u8 transitionID); bool8 IsBattleTransitionDone(void); +enum // TRANSITION_MUGSHOT +{ + MUGSHOT_SYDNEY, + MUGSHOT_PHOEBE, + MUGSHOT_GLACIA, + MUGSHOT_DRAKE, + MUGSHOT_CHAMPION, + MUGSHOTS_COUNT +}; + // credits for the names go to Dyskinesia and Tetrable // names are naturally subject to change -- cgit v1.2.3 From 9106d8df1856c65b2bc85da6d61b6968669814ea Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 13 Jan 2018 21:03:07 +0100 Subject: up to groudon transition --- include/battle_transition.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'include/battle_transition.h') diff --git a/include/battle_transition.h b/include/battle_transition.h index 2ad27dc29..bb8505edb 100644 --- a/include/battle_transition.h +++ b/include/battle_transition.h @@ -17,7 +17,7 @@ enum // TRANSITION_MUGSHOT MUGSHOTS_COUNT }; -// credits for the names go to Dyskinesia and Tetrable +// credits for the names go to Dyskinesia, Tetrable and Farore // names are naturally subject to change #define B_TRANSITION_BLUR 0 @@ -47,9 +47,9 @@ enum // TRANSITION_MUGSHOT #define B_TRANSITION_GROUDON 23 #define B_TRANSITION_RAYQUAZA 24 #define B_TRANSITION_25 25 -#define B_TRANSITION_26 26 -#define B_TRANSITION_27 27 -#define B_TRANSITION_28 28 +#define B_TRANSITION_BLACKHOLE1 26 +#define B_TRANSITION_BLACKHOLE2 27 +#define B_TRANSITION_RECTANGULAR_SPIRAL 28 #define B_TRANSITION_29 29 #define B_TRANSITION_30 30 #define B_TRANSITION_31 31 -- cgit v1.2.3 From fdbe7fa7de9b2e1f8a22efca87201901fcea32b4 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 14 Jan 2018 20:45:44 +0100 Subject: up to 30 battle transitions --- include/battle_transition.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'include/battle_transition.h') diff --git a/include/battle_transition.h b/include/battle_transition.h index bb8505edb..cd4cdd1b3 100644 --- a/include/battle_transition.h +++ b/include/battle_transition.h @@ -6,6 +6,7 @@ void sub_8149DFC(u8 a1); void BattleTransition_StartOnField(u8 transitionID); void BattleTransition_Start(u8 transitionID); bool8 IsBattleTransitionDone(void); +void Phase1_Task_RunFuncs(u8 taskId); enum // TRANSITION_MUGSHOT { @@ -46,7 +47,7 @@ enum // TRANSITION_MUGSHOT #define B_TRANSITION_KYOGRE 22 #define B_TRANSITION_GROUDON 23 #define B_TRANSITION_RAYQUAZA 24 -#define B_TRANSITION_25 25 +#define B_TRANSITION_SHRED_SPLIT 25 #define B_TRANSITION_BLACKHOLE1 26 #define B_TRANSITION_BLACKHOLE2 27 #define B_TRANSITION_RECTANGULAR_SPIRAL 28 -- cgit v1.2.3 From d7644cd3d8070cb12c84263a4707ec0211bd434a Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 14 Jan 2018 22:09:35 +0100 Subject: battle transition is decompiled --- include/battle_transition.h | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'include/battle_transition.h') diff --git a/include/battle_transition.h b/include/battle_transition.h index cd4cdd1b3..0d6ef3c83 100644 --- a/include/battle_transition.h +++ b/include/battle_transition.h @@ -2,11 +2,14 @@ #define GUARD_BATTLE_TRANSITION_H void TestBattleTransition(u8 transitionId); -void sub_8149DFC(u8 a1); -void BattleTransition_StartOnField(u8 transitionID); -void BattleTransition_Start(u8 transitionID); +void BattleTransition_StartOnField(u8 transitionId); +void BattleTransition_Start(u8 transitionId); bool8 IsBattleTransitionDone(void); -void Phase1_Task_RunFuncs(u8 taskId); +bool8 FldEff_Pokeball(void); +void TransitionPhase1_Task_RunFuncs(u8 taskId); +void sub_8149F58(u16 **a0, u16 **a1); + +extern const struct SpritePalette gFieldEffectObjectPaletteInfo10; enum // TRANSITION_MUGSHOT { -- cgit v1.2.3