From e9ec2a1a561d3041b8df2cb512a0e03ff5bca74b Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Thu, 17 Aug 2017 21:05:59 +0200 Subject: start decompiling battle transition --- include/battle_transition.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'include/battle_transition.h') diff --git a/include/battle_transition.h b/include/battle_transition.h index b01378505..bc78bd06e 100644 --- a/include/battle_transition.h +++ b/include/battle_transition.h @@ -3,6 +3,8 @@ void sub_811AABC(u8); void sub_811AAD8(u8); -u8 sub_811AAE8(void); +bool8 IsBattleTransitionDone(void); + +#define B_TRANSITION_WILD 8 #endif // GUARD_BATTLE_TRANSITION_H -- cgit v1.2.3 From f84d0541314b043fa3ef4e2b9a56809f278787f9 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 20 Aug 2017 17:27:54 +0200 Subject: mugshots tasks done --- include/battle_transition.h | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) (limited to 'include/battle_transition.h') 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 -- cgit v1.2.3 From 169714a6d4f2fcaef2f55baf6954620f8b9655e7 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 20 Aug 2017 21:32:41 +0200 Subject: mugshots done, moved some data to C --- include/battle_transition.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'include/battle_transition.h') diff --git a/include/battle_transition.h b/include/battle_transition.h index a709a2f7b..597e9724d 100644 --- a/include/battle_transition.h +++ b/include/battle_transition.h @@ -5,6 +5,8 @@ void sub_811AABC(u8); void sub_811AAD8(u8); bool8 IsBattleTransitionDone(void); +#define TRANSITIONS_NO 17 + enum // TRANSITION_MUGSHOT { MUGSHOT_SYDNEY, @@ -17,8 +19,8 @@ enum // TRANSITION_MUGSHOT #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 +#define B_TRANSITION_GLACIA 14 +#define B_TRANSITION_DRAKE 15 +#define B_TRANSITION_STEVEN 16 #endif // GUARD_BATTLE_TRANSITION_H -- cgit v1.2.3 From f3191f7aa13529f73d28bc48cf74406a204962c9 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Mon, 21 Aug 2017 23:05:56 +0200 Subject: name suggestions, phase2 data to C --- include/battle_transition.h | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) (limited to 'include/battle_transition.h') diff --git a/include/battle_transition.h b/include/battle_transition.h index 597e9724d..9082b20ef 100644 --- a/include/battle_transition.h +++ b/include/battle_transition.h @@ -16,11 +16,23 @@ enum // TRANSITION_MUGSHOT MUGSHOT_STEVEN, }; -#define B_TRANSITION_WILD 8 -#define B_TRANSITION_SYDNEY 12 -#define B_TRANSITION_PHOEBE 13 -#define B_TRANSITION_GLACIA 14 -#define B_TRANSITION_DRAKE 15 -#define B_TRANSITION_STEVEN 16 +#define MUGSHOTS_NO 5 + +// credits for the names goes to Dyskinesia + +#define B_TRANSITION_BLUR 0 +#define B_TRANSITION_SMEAR 1 +#define B_TRANSITION_SHUFFLE 2 +#define B_TRANSITION_BIG_POKEBALL 3 +#define B_TRANSITION_POKEBALLS_WIPEOUT 4 +#define B_TRANSITION_RIPPLE 6 +#define B_TRANSITION_WAVE 7 +#define B_TRANSITION_SLICE 8 +#define B_TRANSITION_SHARDS 11 +#define B_TRANSITION_SYDNEY 12 +#define B_TRANSITION_PHOEBE 13 +#define B_TRANSITION_GLACIA 14 +#define B_TRANSITION_DRAKE 15 +#define B_TRANSITION_STEVEN 16 #endif // GUARD_BATTLE_TRANSITION_H -- cgit v1.2.3 From fc9f7853a0e8dde9f80c1e16bee3a05978d29d15 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Mon, 21 Aug 2017 23:40:13 +0200 Subject: up to sub_811D584 --- include/battle_transition.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'include/battle_transition.h') diff --git a/include/battle_transition.h b/include/battle_transition.h index 9082b20ef..b2d897493 100644 --- a/include/battle_transition.h +++ b/include/battle_transition.h @@ -1,8 +1,8 @@ #ifndef GUARD_BATTLE_TRANSITION_H #define GUARD_BATTLE_TRANSITION_H -void sub_811AABC(u8); -void sub_811AAD8(u8); +void sub_811AABC(u8 transitionID); +void sub_811AAD8(u8 transitionID); bool8 IsBattleTransitionDone(void); #define TRANSITIONS_NO 17 @@ -18,7 +18,7 @@ enum // TRANSITION_MUGSHOT #define MUGSHOTS_NO 5 -// credits for the names goes to Dyskinesia +// credits for the names go to Dyskinesia #define B_TRANSITION_BLUR 0 #define B_TRANSITION_SMEAR 1 -- cgit v1.2.3 From be47f6b54bd4b586d435d6fbff56bc315ff72efc Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Tue, 22 Aug 2017 17:10:50 +0200 Subject: a really hard math function --- include/battle_transition.h | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) (limited to 'include/battle_transition.h') diff --git a/include/battle_transition.h b/include/battle_transition.h index b2d897493..63ea36b67 100644 --- a/include/battle_transition.h +++ b/include/battle_transition.h @@ -18,21 +18,25 @@ enum // TRANSITION_MUGSHOT #define MUGSHOTS_NO 5 -// credits for the names go to Dyskinesia +// credits for the names go to Dyskinesia, Tetrable and Dizzy Egg +// names are naturally subject to change -#define B_TRANSITION_BLUR 0 -#define B_TRANSITION_SMEAR 1 -#define B_TRANSITION_SHUFFLE 2 -#define B_TRANSITION_BIG_POKEBALL 3 -#define B_TRANSITION_POKEBALLS_WIPEOUT 4 -#define B_TRANSITION_RIPPLE 6 -#define B_TRANSITION_WAVE 7 -#define B_TRANSITION_SLICE 8 -#define B_TRANSITION_SHARDS 11 -#define B_TRANSITION_SYDNEY 12 -#define B_TRANSITION_PHOEBE 13 -#define B_TRANSITION_GLACIA 14 -#define B_TRANSITION_DRAKE 15 -#define B_TRANSITION_STEVEN 16 +#define B_TRANSITION_BLUR 0 +#define B_TRANSITION_SWEARL 1 +#define B_TRANSITION_SHUFFLE 2 +#define B_TRANSITION_BIG_POKEBALL 3 +#define B_TRANSITION_POKEBALLS_WIPEOUT 4 +#define B_TRANSITION_CLOCKWISE_BLACKFADE 5 +#define B_TRANSITION_RIPPLE 6 +#define B_TRANSITION_WAVE 7 +#define B_TRANSITION_SLICE 8 +#define B_TRANSITION_WHITEFADE 9 +#define B_TRANSITION_GRID_SQUARES 10 +#define B_TRANSITION_SHARDS 11 +#define B_TRANSITION_SYDNEY 12 +#define B_TRANSITION_PHOEBE 13 +#define B_TRANSITION_GLACIA 14 +#define B_TRANSITION_DRAKE 15 +#define B_TRANSITION_STEVEN 16 #endif // GUARD_BATTLE_TRANSITION_H -- cgit v1.2.3 From aa3988cc1ace31f97590b4ac3b33c4fa3a5e13dc Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Tue, 22 Aug 2017 20:51:53 +0200 Subject: move all data to C --- include/battle_transition.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/battle_transition.h') diff --git a/include/battle_transition.h b/include/battle_transition.h index 63ea36b67..34a7290fa 100644 --- a/include/battle_transition.h +++ b/include/battle_transition.h @@ -25,7 +25,7 @@ enum // TRANSITION_MUGSHOT #define B_TRANSITION_SWEARL 1 #define B_TRANSITION_SHUFFLE 2 #define B_TRANSITION_BIG_POKEBALL 3 -#define B_TRANSITION_POKEBALLS_WIPEOUT 4 +#define B_TRANSITION_POKEBALLS_TRAIL 4 #define B_TRANSITION_CLOCKWISE_BLACKFADE 5 #define B_TRANSITION_RIPPLE 6 #define B_TRANSITION_WAVE 7 -- cgit v1.2.3 From c8d77612267c04444b5318f3e058d0a77859a3db Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Tue, 22 Aug 2017 21:19:55 +0200 Subject: meaningful names to transitions given --- include/battle_transition.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'include/battle_transition.h') diff --git a/include/battle_transition.h b/include/battle_transition.h index 34a7290fa..ca6869c93 100644 --- a/include/battle_transition.h +++ b/include/battle_transition.h @@ -18,14 +18,14 @@ enum // TRANSITION_MUGSHOT #define MUGSHOTS_NO 5 -// credits for the names go to Dyskinesia, Tetrable and Dizzy Egg +// credits for the names go to Dyskinesia and Tetrable // names are naturally subject to change #define B_TRANSITION_BLUR 0 -#define B_TRANSITION_SWEARL 1 +#define B_TRANSITION_SWIRL 1 #define B_TRANSITION_SHUFFLE 2 #define B_TRANSITION_BIG_POKEBALL 3 -#define B_TRANSITION_POKEBALLS_TRAIL 4 +#define B_TRANSITION_POKEBALLS_TRAIL 4 #define B_TRANSITION_CLOCKWISE_BLACKFADE 5 #define B_TRANSITION_RIPPLE 6 #define B_TRANSITION_WAVE 7 -- cgit v1.2.3