From ead21250a6e1ef3ebb4f7e69fd22dcb09be31ef8 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 1 Sep 2018 19:05:06 +0200 Subject: Label all battle ai scripts --- include/constants/battle_ai.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include/constants') diff --git a/include/constants/battle_ai.h b/include/constants/battle_ai.h index 7d2c70307..4c3a45dc6 100644 --- a/include/constants/battle_ai.h +++ b/include/constants/battle_ai.h @@ -35,8 +35,8 @@ // script's table id to bit #define AI_SCRIPT_CHECK_BAD_MOVE (1 << 0) -#define AI_SCRIPT_CHECK_VIABILITY (1 << 1) -#define AI_SCRIPT_TRY_TO_FAINT (1 << 2) +#define AI_SCRIPT_TRY_TO_FAINT (1 << 1) +#define AI_SCRIPT_CHECK_VIABILITY (1 << 2) #define AI_SCRIPT_SETUP_FIRST_TURN (1 << 3) #define AI_SCRIPT_RISKY (1 << 4) #define AI_SCRIPT_PREFER_STRONGEST_MOVE (1 << 5) -- cgit v1.2.3 From 44ba432dadc1d370cf02d4e6d64dbb55afdc3e0f Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 1 Sep 2018 20:00:13 +0200 Subject: Label various battle scripts --- include/constants/battle.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/constants') diff --git a/include/constants/battle.h b/include/constants/battle.h index b3f9d919a..e5ca9d7ae 100644 --- a/include/constants/battle.h +++ b/include/constants/battle.h @@ -252,7 +252,7 @@ #define MOVE_EFFECT_RAPIDSPIN 0x23 #define MOVE_EFFECT_REMOVE_PARALYSIS 0x24 #define MOVE_EFFECT_ATK_DEF_DOWN 0x25 -#define MOVE_EFFECT_RECOIL_33_PARALYSIS 0x26 +#define MOVE_EFFECT_RECOIL_33 0x26 #define MOVE_EFFECT_ATK_PLUS_2 0x27 #define MOVE_EFFECT_DEF_PLUS_2 0x28 #define MOVE_EFFECT_SPD_PLUS_2 0x29 -- cgit v1.2.3 From f505ba1bc7b34c67d7b3b7aef01006def5947639 Mon Sep 17 00:00:00 2001 From: ultima-soul Date: Wed, 5 Sep 2018 01:13:17 +0000 Subject: Implemented gRegionMapSectionId_To_PopUpThemeIdMapping array to be dependent on Map Section ID enum rather than order dependent. --- include/constants/region_map_sections.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'include/constants') diff --git a/include/constants/region_map_sections.h b/include/constants/region_map_sections.h index 8ff75dfa9..35c92d7e4 100644 --- a/include/constants/region_map_sections.h +++ b/include/constants/region_map_sections.h @@ -220,4 +220,6 @@ #define MAPSEC_IN_GAME_TRADE 0xFE #define MAPSEC_FATEFUL_ENCOUNTER 0xFF +#define MAPSEC_SUBSTRACT_KANTO (MAPSEC_SPECIAL_AREA - MAPSEC_DYNAMIC) + #endif //GUARD_REGIONMAPSEC_H -- cgit v1.2.3 From 857ac33adb1ba3c189cf7b006d7da28df2291157 Mon Sep 17 00:00:00 2001 From: ultima-soul Date: Wed, 5 Sep 2018 17:25:44 +0000 Subject: Fixed a typo. --- include/constants/region_map_sections.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/constants') diff --git a/include/constants/region_map_sections.h b/include/constants/region_map_sections.h index 35c92d7e4..12c894367 100644 --- a/include/constants/region_map_sections.h +++ b/include/constants/region_map_sections.h @@ -220,6 +220,6 @@ #define MAPSEC_IN_GAME_TRADE 0xFE #define MAPSEC_FATEFUL_ENCOUNTER 0xFF -#define MAPSEC_SUBSTRACT_KANTO (MAPSEC_SPECIAL_AREA - MAPSEC_DYNAMIC) +#define MAPSEC_SUBTRACT_KANTO (MAPSEC_SPECIAL_AREA - MAPSEC_DYNAMIC) #endif //GUARD_REGIONMAPSEC_H -- cgit v1.2.3