From bad5323642a0db0875ca6213370b1947c1fc105a Mon Sep 17 00:00:00 2001 From: Melody Date: Sun, 2 Dec 2018 07:17:54 -0500 Subject: cleans up trainer battle scripts * adds battle type macros * adds `trainerbattle_normal` macro * adds `trainerbattle_double` macro * adds rematch macros * adds no intro macro --- src/battle_setup.c | 1 + src/trainer_see.c | 1 + 2 files changed, 2 insertions(+) (limited to 'src') diff --git a/src/battle_setup.c b/src/battle_setup.c index ab2a12fb7..6db787a5f 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -1,6 +1,7 @@ #include "global.h" #include "constants/trainers.h" #include "battle.h" +#include "constants/battle_setup.h" #include "battle_setup.h" #include "battle_transition.h" #include "main.h" diff --git a/src/trainer_see.c b/src/trainer_see.c index b74608d0b..d3d450de4 100644 --- a/src/trainer_see.c +++ b/src/trainer_see.c @@ -1,4 +1,5 @@ #include "global.h" +#include "constants/battle_setup.h" #include "battle_setup.h" #include "event_data.h" #include "event_object_movement.h" -- cgit v1.2.3 From 10725def8e356a6ea9346b1ea3170e1429314db3 Mon Sep 17 00:00:00 2001 From: Melody Date: Sun, 2 Dec 2018 13:54:48 -0500 Subject: =?UTF-8?q?trainerbattle=5Fnormal=20=E2=86=92=20trainerbattle=5Fsi?= =?UTF-8?q?ngle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * trainerbattle_normal → trainerbattle_single * TRAINER_BATTLE_NORMAL → TRAINER_BATTLE_SINGLE * improves the macro documentation a little --- src/battle_setup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/battle_setup.c b/src/battle_setup.c index 6db787a5f..4243d2f3f 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -1086,7 +1086,7 @@ const u8 *BattleSetup_ConfigureTrainerBattle(const u8 *data) switch (sTrainerBattleMode) { - case TRAINER_BATTLE_NORMAL_NO_INTRO_TEXT: + case TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT: TrainerBattleLoadArgs(sOrdinaryNoIntroBattleParams, data); return EventScript_2713C2; case TRAINER_BATTLE_DOUBLE: -- cgit v1.2.3