diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2021-04-28 18:54:52 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2021-04-28 18:57:01 -0400 |
| commit | 46a98a8f8dd73586a6ea77670d74a534dca30419 (patch) | |
| tree | 2f171ed33f2c508513aabd09aa47b2ea0b621b1d /src | |
| parent | a60d6675d7f802215150e6df4c771b965e5df3dc (diff) | |
Modern gcc is just as dumb as agbcc
Diffstat (limited to 'src')
| -rw-r--r-- | src/trainer_tower_sets.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/trainer_tower_sets.c b/src/trainer_tower_sets.c index ceadafa08..b0bf0838a 100644 --- a/src/trainer_tower_sets.c +++ b/src/trainer_tower_sets.c @@ -1,14 +1,16 @@ #include "global.h" #include "cereader_tool.h" #include "trainer_tower.h" +#include "text.h" #include "constants/easy_chat.h" #include "constants/items.h" #include "constants/moves.h" #include "constants/trainer_tower.h" #include "constants/facility_trainer_classes.h" -#define DUMMY_TOWER_MON(iv) ((struct BattleTowerPokemon){.hpIV = iv, .attackIV = iv, .defenseIV = iv, .speedIV = iv, .spAttackIV = iv, .spDefenseIV = iv, .nickname = _("$$$$$$$$$$")}) -#define DUMMY_TOWER_TEAM(iv) ((struct TrainerTowerTrainer){.name = _(), .textColor = 1, .speechBefore = {0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF}, .speechWin = {0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF}, .speechLose = {0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF}, .speechAfter = {0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF}, .mons = {DUMMY_TOWER_MON(iv), DUMMY_TOWER_MON(iv), DUMMY_TOWER_MON(iv), DUMMY_TOWER_MON(iv), DUMMY_TOWER_MON(iv), DUMMY_TOWER_MON(iv)}}) +// Dummy strings must be declared explicitly for the sake of modern gcc +#define DUMMY_TOWER_MON(iv) {.hpIV = iv, .attackIV = iv, .defenseIV = iv, .speedIV = iv, .spAttackIV = iv, .spDefenseIV = iv, .nickname = _("$$$$$$$$$$")} +#define DUMMY_TOWER_TEAM(iv) {.name = _(""), .textColor = 1, .speechBefore = {0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF}, .speechWin = {0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF}, .speechLose = {0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF}, .speechAfter = {0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF}, .mons = {DUMMY_TOWER_MON(iv), DUMMY_TOWER_MON(iv), DUMMY_TOWER_MON(iv), DUMMY_TOWER_MON(iv), DUMMY_TOWER_MON(iv), DUMMY_TOWER_MON(iv)}} static const struct TrainerTowerFloor sTrainerTowerFloor_Single_4 = { .flags = 0x01, |