From 10470ef536132c317f0c478e42ad37657a0f00aa Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Tue, 28 Nov 2017 23:02:09 +0100 Subject: start working on battle setup --- include/battle_transition.h | 46 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) (limited to 'include/battle_transition.h') diff --git a/include/battle_transition.h b/include/battle_transition.h index 1603f5c93..26b836c66 100644 --- a/include/battle_transition.h +++ b/include/battle_transition.h @@ -2,5 +2,51 @@ #define GUARD_BATTLE_TRANSITION_H void sub_8149DFC(u8 a1); +void BattleTransition_StartOnField(u8 transitionID); +void BattleTransition_Start(u8 transitionID); +bool8 IsBattleTransitionDone(void); + +#define TRANSITIONS_NO 25 + +enum // TRANSITION_MUGSHOT +{ + MUGSHOT_SYDNEY, + MUGSHOT_PHOEBE, + MUGSHOT_GLACIA, + MUGSHOT_DRAKE, + MUGSHOT_STEVEN, +}; + +#define MUGSHOTS_NO 5 + +// credits for the names go to Dyskinesia and Tetrable +// names are naturally subject to change + +#define B_TRANSITION_BLUR 0 +#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_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 +// added in Emerald +#define B_TRANSITION_AQUA 17 +#define B_TRANSITION_MAGMA 18 +#define B_TRANSITION_REGICE 19 +#define B_TRANSITION_REGISTEEL 20 +#define B_TRANSITION_REGIROCK 21 +#define B_TRANSITION_KYORGE 22 +#define B_TRANSITION_GROUDON 23 +#define B_TRANSITION_RAYQUAZA 24 #endif // GUARD_BATTLE_TRANSITION_H -- cgit v1.2.3 From 646664ff29afd8627626274a4fc12b05d584fe2c Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Fri, 1 Dec 2017 21:25:13 +0100 Subject: battle setup file is decompiled --- include/battle_transition.h | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) (limited to 'include/battle_transition.h') diff --git a/include/battle_transition.h b/include/battle_transition.h index 26b836c66..b160f3e02 100644 --- a/include/battle_transition.h +++ b/include/battle_transition.h @@ -14,7 +14,7 @@ enum // TRANSITION_MUGSHOT MUGSHOT_PHOEBE, MUGSHOT_GLACIA, MUGSHOT_DRAKE, - MUGSHOT_STEVEN, + MUGSHOT_CHAMPION, }; #define MUGSHOTS_NO 5 @@ -38,7 +38,7 @@ enum // TRANSITION_MUGSHOT #define B_TRANSITION_PHOEBE 13 #define B_TRANSITION_GLACIA 14 #define B_TRANSITION_DRAKE 15 -#define B_TRANSITION_STEVEN 16 +#define B_TRANSITION_CHAMPION 16 // added in Emerald #define B_TRANSITION_AQUA 17 #define B_TRANSITION_MAGMA 18 @@ -48,5 +48,22 @@ enum // TRANSITION_MUGSHOT #define B_TRANSITION_KYORGE 22 #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_29 29 +#define B_TRANSITION_30 30 +#define B_TRANSITION_31 31 +#define B_TRANSITION_32 32 +#define B_TRANSITION_33 33 +#define B_TRANSITION_34 34 +#define B_TRANSITION_35 35 +#define B_TRANSITION_36 36 +#define B_TRANSITION_37 37 +#define B_TRANSITION_38 38 +#define B_TRANSITION_39 39 +#define B_TRANSITION_40 40 +#define B_TRANSITION_41 41 #endif // GUARD_BATTLE_TRANSITION_H -- cgit v1.2.3 From bb82032208a328a9332839f55df92c9b73d2c5a0 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 16 Dec 2017 01:15:19 +0100 Subject: battle setup review changes --- include/battle_transition.h | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) (limited to 'include/battle_transition.h') diff --git a/include/battle_transition.h b/include/battle_transition.h index b160f3e02..84b5e37ec 100644 --- a/include/battle_transition.h +++ b/include/battle_transition.h @@ -6,19 +6,6 @@ void BattleTransition_StartOnField(u8 transitionID); void BattleTransition_Start(u8 transitionID); bool8 IsBattleTransitionDone(void); -#define TRANSITIONS_NO 25 - -enum // TRANSITION_MUGSHOT -{ - MUGSHOT_SYDNEY, - MUGSHOT_PHOEBE, - MUGSHOT_GLACIA, - MUGSHOT_DRAKE, - MUGSHOT_CHAMPION, -}; - -#define MUGSHOTS_NO 5 - // credits for the names go to Dyskinesia and Tetrable // names are naturally subject to change @@ -45,7 +32,7 @@ enum // TRANSITION_MUGSHOT #define B_TRANSITION_REGICE 19 #define B_TRANSITION_REGISTEEL 20 #define B_TRANSITION_REGIROCK 21 -#define B_TRANSITION_KYORGE 22 +#define B_TRANSITION_KYOGRE 22 #define B_TRANSITION_GROUDON 23 #define B_TRANSITION_RAYQUAZA 24 #define B_TRANSITION_25 25 -- cgit v1.2.3