4905 Commits

Author SHA1 Message Date
Evan
5ae1e3c25b Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into ai 2021-01-04 11:43:36 -07:00
LOuroboros
adf039fe12 Made BufferStatRoseMessage print an extra string if B_X_ITEMS_BUFF == GEN_7
Also turned sText_StatSharply into gText_StatSharply.
2021-01-04 07:41:56 -03:00
LOuroboros
be46ed84ea Made the old X Items buff code make use of B_X_ITEMS_BUFF 2021-01-04 04:15:58 -03:00
LOuroboros
dbc3690282 Tweaked preprocessor directives
Changed #ifdef X_ITEMS_REWORK == FALSE to #ifndef ITEM_EXPANSION
Changed #ifdef X_ITEMS_REWORK == TRUE to #ifdef ITEM_EXPANSION
2021-01-04 03:58:31 -03:00
LOuroboros
517c8ffdd0 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen8_abilities_BE 2021-01-03 22:05:14 -03:00
ExpoSeed
7dadcb94b8 Merge branch 'master' of https://github.com/pret/pokeemerald into HEAD 2021-01-03 17:14:43 -06:00
BuffelSaft
10cf5b3673 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into Batte_Engine_Only 2021-01-04 10:55:30 +13:00
LOuroboros
da1f525d45 Made Alolan Marowak be affected by Thick Club 2021-01-03 09:58:19 -03:00
ultima-soul
c2a3c5687b Add Fairy-type icon to fix Fairy TM info icon being blank. 2021-01-02 21:11:47 -08:00
surskitty
a96179a308 Changed Neutralizing Gas. 2021-01-02 17:16:44 -05:00
Evan
f172245ad6 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into totem 2021-01-01 08:49:43 -07:00
ExpoSeed
8cfdbaefeb
Merge pull request #1294 from LOuroboros/flower_gift
Added missing check to Flower Gift (offensive)
2020-12-31 18:41:50 -06:00
ExpoSeed
b7b1b26b57
Merge pull request #1289 from LOuroboros/final_gambit
Corrected Final Gambit's move data and tweaked its effect
2020-12-31 18:39:00 -06:00
ExpoSeed
24362e8bed
Merge pull request #1250 from ghoulslash/infestation
infestation between turn anim
2020-12-31 18:06:13 -06:00
surskitty
aa9796a6ae Renaming constants for High Jump Kick, Faint Attack, Smelling Salts, and Vise Grip. 2020-12-31 18:57:36 -05:00
surskitty
533d9f1c54 Updating move names and ability names. 2020-12-31 18:45:25 -05:00
Sierraffinity
ef7832a55c Change how mon affine transform fix is handled 2020-12-30 17:36:53 -08:00
Sierraffinity
127bb97c0e Add UBFIX for division by zero in SpriteCB_PokedexListMonSprite 2020-12-26 18:25:21 -08:00
Sierraffinity
bafbf9240d Add UBFIX for null deref in sub_80D08CC 2020-12-26 17:47:36 -08:00
Sierraffinity
86fdd033c6 Add UBFIX for null derefs in sub_8088950 2020-12-26 17:39:52 -08:00
Sierraffinity
b155c307ea Add UBFIX for null deref in CameraObjectReset2 2020-12-26 17:25:51 -08:00
GriffinR
d74f739e05
Merge pull request #1277 from GriffinRichards/doc-tower
Label remaining subs in battle_tower.c
2020-12-25 00:19:24 -05:00
GriffinR
769ddf22c2 Label remaining subs in battle_tower.c 2020-12-24 16:18:47 -05:00
Evan
59813c9ce7 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into be_config 2020-12-23 10:27:54 -07:00
LOuroboros
320cc37ac9 USE_BATTLE_DEBUG -> B_ENABLE_DEBUG 2020-12-23 14:04:14 -03:00
ghoulslash
0af8cab87e
Merge pull request #1283 from LOuroboros/ct_moves_data
Added the data of SwSh's Crown Tundra's moves
2020-12-21 23:13:23 -07:00
Kurausukun
254b4e621c change "filler" to "unk", remove newline 2020-12-22 00:08:15 -05:00
Kurausukun
45a1156dc8 fix remaining functions, finally matches 2020-12-21 22:36:28 -05:00
Kurausukun
01ea479390 oops 2020-12-21 20:25:59 -05:00
Kurausukun
b3f9a08ba6 fix sub_8021A28 2020-12-21 20:24:36 -05:00
Kurausukun
3203bac053 fix struct 2020-12-20 23:15:35 -05:00
Evan
21e7d6d318 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into ai 2020-12-20 16:33:43 -07:00
Evan
19b1d4bfa2 speed stat increases based on current stat stage 2020-12-20 15:15:33 -07:00
Evan
62fc47881d smaller score bonus to speed increase 2020-12-20 15:10:57 -07:00
Evan
7988a1f41d Ai_TryOnAlly and reorganize files 2020-12-20 14:47:20 -07:00
Kurausukun
14e2898a29 fix structs and some function logic
(currently does not match)
2020-12-20 02:54:33 -05:00
Evan
c5597e2e18 fix first battle bug 2020-12-19 22:57:08 -07:00
Evan
a504199ea6 ai prefer baton pass 2020-12-19 22:51:25 -07:00
Evan
b2e5760479 risky ai script -> c 2020-12-19 22:12:31 -07:00
Evan
cd119ed6c3 first turn ai script 2020-12-19 22:07:21 -07:00
Evan
31ec3e8479 non-partner good move checks 2020-12-19 21:58:23 -07:00
LOuroboros
0aae069db8 Made Fiery Wrath unaffected by King's Rock 2020-12-19 21:11:17 -03:00
LOuroboros
819001c102 Removed redundant check in Punk Rock's effect 2020-12-19 19:15:12 -03:00
LOuroboros
a417a1b2b9 Corrected Punk Rock's checks 2020-12-19 16:18:39 -03:00
LOuroboros
ffa35a33c1 Review corrections 2020-12-19 07:44:34 -03:00
ultima-soul
1b1b2ff0a3
Merge pull request #1281 from NamNguyenUTSA/patch-2
Allow player partner NPC's to mega evolve
2020-12-18 23:39:15 -08:00
ultima-soul
aefa35a04f
Merge pull request #1275 from ghoulslash/battle_anims
Fix Shadow Sneak Animation
2020-12-18 23:15:07 -08:00
Evan
8a544665e4 move common ai params to preloaded struct 2020-12-16 22:56:10 -07:00
Evan
916d0416e3 outline AI_CheckGoodMove 2020-12-15 21:57:33 -07:00
GriffinR
15c2856b24
Merge pull request #1265 from Kurausukun/berry_crush
fakematch fixes, begin documenting Berry Crush (based on #1187)
2020-12-14 23:22:41 -05:00