atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

battle setup review changes

Browse source
This commit is contained in:
DizzyEggg 2017-12-16 01:15:19 +01:00
parent 44abbae60b
commit bb82032208
6 changed files with 7 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
constants/battle_constants.inc
View file

@ -28,7 +28,7 @@
.set BATTLE_TYPE_x4000000, 0x4000000 .set BATTLE_TYPE_x4000000, 0x4000000
.set BATTLE_TYPE_SECRET_BASE, 0x8000000 .set BATTLE_TYPE_SECRET_BASE, 0x8000000
.set BATTLE_TYPE_GROUDON, 0x10000000 .set BATTLE_TYPE_GROUDON, 0x10000000
.set BATTLE_TYPE_KYORGE, 0x20000000 .set BATTLE_TYPE_KYOGRE, 0x20000000
.set BATTLE_TYPE_RAYQUAZA, 0x40000000 .set BATTLE_TYPE_RAYQUAZA, 0x40000000
.set BATTLE_TYPE_x80000000, 0x80000000 .set BATTLE_TYPE_x80000000, 0x80000000

2
include/battle.h
View file

@ -62,7 +62,7 @@
#define BATTLE_TYPE_x4000000 0x4000000 #define BATTLE_TYPE_x4000000 0x4000000
#define BATTLE_TYPE_SECRET_BASE 0x8000000 #define BATTLE_TYPE_SECRET_BASE 0x8000000
#define BATTLE_TYPE_GROUDON 0x10000000 #define BATTLE_TYPE_GROUDON 0x10000000
#define BATTLE_TYPE_KYORGE 0x20000000 #define BATTLE_TYPE_KYOGRE 0x20000000
#define BATTLE_TYPE_RAYQUAZA 0x40000000 #define BATTLE_TYPE_RAYQUAZA 0x40000000
#define BATTLE_TYPE_x80000000 0x80000000 #define BATTLE_TYPE_x80000000 0x80000000

15
include/battle_transition.h
View file

@ -6,19 +6,6 @@ void BattleTransition_StartOnField(u8 transitionID);
void BattleTransition_Start(u8 transitionID); void BattleTransition_Start(u8 transitionID);
bool8 IsBattleTransitionDone(void); 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 // credits for the names go to Dyskinesia and Tetrable
// names are naturally subject to change // names are naturally subject to change
@ -45,7 +32,7 @@ enum // TRANSITION_MUGSHOT
#define B_TRANSITION_REGICE 19 #define B_TRANSITION_REGICE 19
#define B_TRANSITION_REGISTEEL 20 #define B_TRANSITION_REGISTEEL 20
#define B_TRANSITION_REGIROCK 21 #define B_TRANSITION_REGIROCK 21
#define B_TRANSITION_KYORGE 22 #define B_TRANSITION_KYOGRE 22
#define B_TRANSITION_GROUDON 23 #define B_TRANSITION_GROUDON 23
#define B_TRANSITION_RAYQUAZA 24 #define B_TRANSITION_RAYQUAZA 24
#define B_TRANSITION_25 25 #define B_TRANSITION_25 25

4
src/battle_setup.c
View file

@ -528,8 +528,8 @@ void BattleSetup_StartLegendaryBattle(void)
CreateBattleStartTask(B_TRANSITION_GROUDON, BGM_BATTLE34); CreateBattleStartTask(B_TRANSITION_GROUDON, BGM_BATTLE34);
break; break;
case SPECIES_KYOGRE: case SPECIES_KYOGRE:
gBattleTypeFlags |= BATTLE_TYPE_KYORGE; gBattleTypeFlags |= BATTLE_TYPE_KYOGRE;
CreateBattleStartTask(B_TRANSITION_KYORGE, BGM_BATTLE34); CreateBattleStartTask(B_TRANSITION_KYOGRE, BGM_BATTLE34);
break; break;
case SPECIES_RAYQUAZA: case SPECIES_RAYQUAZA:
gBattleTypeFlags |= BATTLE_TYPE_RAYQUAZA; gBattleTypeFlags |= BATTLE_TYPE_RAYQUAZA;

2
src/recorded_battle.c
View file

@ -19,7 +19,7 @@
| BATTLE_TYPE_WALLY_TUTORIAL | BATTLE_TYPE_ROAMER | BATTLE_TYPE_EREADER_TRAINER \ | BATTLE_TYPE_WALLY_TUTORIAL | BATTLE_TYPE_ROAMER | BATTLE_TYPE_EREADER_TRAINER \
| BATTLE_TYPE_KYOGRE_GROUDON | BATTLE_TYPE_LEGENDARY | BATTLE_TYPE_REGI \ | BATTLE_TYPE_KYOGRE_GROUDON | BATTLE_TYPE_LEGENDARY | BATTLE_TYPE_REGI \
| BATTLE_TYPE_RECORDED | BATTLE_TYPE_x4000000 | BATTLE_TYPE_SECRET_BASE \ | BATTLE_TYPE_RECORDED | BATTLE_TYPE_x4000000 | BATTLE_TYPE_SECRET_BASE \
| BATTLE_TYPE_GROUDON | BATTLE_TYPE_KYORGE | BATTLE_TYPE_RAYQUAZA)) | BATTLE_TYPE_GROUDON | BATTLE_TYPE_KYOGRE | BATTLE_TYPE_RAYQUAZA))
extern u32 gBattleTypeFlags; extern u32 gBattleTypeFlags;
extern u16 gTrainerBattleOpponent_A; extern u16 gTrainerBattleOpponent_A;

2
src/trainer_see.c
View file

@ -28,7 +28,7 @@ bool8 CheckForTrainersWantingBattle(void)
retVal = CheckIfTrainerWantsBattle(i); retVal = CheckIfTrainerWantsBattle(i);
if (retVal == 2) if (retVal == 2)
break; // two trainers has been found break; // two trainers have been found
if (retVal == 0) // no trainers if (retVal == 0) // no trainers
continue; continue;