diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/battle.h | 8 | ||||
| -rw-r--r-- | include/battle_controllers.h | 2 | ||||
| -rw-r--r-- | include/constants/trainers.h | 6 | ||||
| -rw-r--r-- | include/gba/io_reg.h | 2 |
4 files changed, 10 insertions, 8 deletions
diff --git a/include/battle.h b/include/battle.h index fba5fb460..3843bc5e6 100644 --- a/include/battle.h +++ b/include/battle.h @@ -214,8 +214,8 @@ struct SpecialStatus { u8 statLowered:1; // 0x1 u8 lightningRodRedirected:1; // 0x2 - u8 restoredBankSprite: 1; // 0x4 - u8 intimidatedPoke:1; // 0x8 + u8 restoredBattlerSprite: 1; // 0x4 + u8 intimidatedMon:1; // 0x8 u8 traced:1; // 0x10 u8 flag20:1; u8 flag40:1; @@ -607,8 +607,8 @@ struct BattleScripting // rom_80A5C6C u8 GetBattlerSide(u8 battler); -u8 GetBattlerPosition(u8 bank); -u8 GetBattlerAtPosition(u8 bank); +u8 GetBattlerPosition(u8 battler); +u8 GetBattlerAtPosition(u8 battler); struct BattleSpriteInfo { diff --git a/include/battle_controllers.h b/include/battle_controllers.h index 8ba45fad1..ff5a629af 100644 --- a/include/battle_controllers.h +++ b/include/battle_controllers.h @@ -81,7 +81,7 @@ enum #define INSTANT_HP_BAR_DROP 32767 // Special return values in gBattleBufferB from Battle Controller functions. -#define RET_VALUE_LEVELLED_UP 11 +#define RET_VALUE_LEVELED_UP 11 struct UnusedControllerStruct { diff --git a/include/constants/trainers.h b/include/constants/trainers.h index eb695e4ab..43ea6d0b6 100644 --- a/include/constants/trainers.h +++ b/include/constants/trainers.h @@ -862,9 +862,9 @@ // Special Trainer Ids. #define TRAINER_FRONTIER_BRAIN 1022 #define TRAINER_SECRET_BASE 1024 -#define TRAINER_LINK_OPPONENT 0x800 -#define TRAINER_OPPONENT_C00 0xC00 -#define TRAINER_STEVEN_PARTNER 0xC03 +#define TRAINER_LINK_OPPONENT 2048 +#define TRAINER_OPPONENT_C00 3072 +#define TRAINER_STEVEN_PARTNER 3075 #define TRAINER_PIC_HIKER 0 #define TRAINER_PIC_AQUA_GRUNT_M 1 diff --git a/include/gba/io_reg.h b/include/gba/io_reg.h index 6498c6a99..01d8c311e 100644 --- a/include/gba/io_reg.h +++ b/include/gba/io_reg.h @@ -582,6 +582,7 @@ #define BLDCNT_TGT1_BG3 (1 << 3) #define BLDCNT_TGT1_OBJ (1 << 4) #define BLDCNT_TGT1_BD (1 << 5) +#define BLDCNT_TGT1_ALL (BLDCNT_TGT1_BG0 | BLDCNT_TGT1_BG1 | BLDCNT_TGT1_BG2 | BLDCNT_TGT1_BG3 | BLDCNT_TGT1_OBJ | BLDCNT_TGT1_BD) // Bits 6-7 select the special effect #define BLDCNT_EFFECT_NONE (0 << 6) // no special effect #define BLDCNT_EFFECT_BLEND (1 << 6) // 1st+2nd targets mixed (controlled by BLDALPHA) @@ -594,6 +595,7 @@ #define BLDCNT_TGT2_BG3 (1 << 11) #define BLDCNT_TGT2_OBJ (1 << 12) #define BLDCNT_TGT2_BD (1 << 13) +#define BLDCNT_TGT2_ALL (BLDCNT_TGT2_BG0 | BLDCNT_TGT2_BG1 | BLDCNT_TGT2_BG2 | BLDCNT_TGT2_BG3 | BLDCNT_TGT2_OBJ | BLDCNT_TGT2_BD) // BLDALPHA #define BLDALPHA_BLEND(target1, target2) (((target2) << 8) | (target1)) |