Evan
1e22ae4cf2
merge with be
2021-01-10 09:08:25 -07:00
ultima-soul
b5b4efdaa0
Merge pull request #1314 from LOuroboros/battle_debug_constant
...
battle_config.h tweaks
2021-01-09 12:36:37 -08:00
ultima-soul
1caed479de
Merge pull request #1298 from ghoulslash/mummy
...
Fix Early Mummy Activation
2021-01-09 12:33:04 -08:00
ultima-soul
d2d961e447
Merge pull request #1262 from LOuroboros/gen8_abilities_BE
...
Implemented various Gen. 8 abilities
2021-01-07 13:31:17 -08:00
LOuroboros
8511ed57e4
Tweaked Steam Engine's battle string
2021-01-07 18:13:16 -03:00
LOuroboros
de9b0328ec
Corrections to Steam Engine
2021-01-07 16:33:52 -03:00
ghoulslash
c392a2011e
Merge pull request #1325 from ExpoSeed/BE/sync
...
Sync battle engine
2021-01-07 12:13:26 -07:00
LOuroboros
339aa95c1d
Review corrections
...
-Intrepid Sword and Dauntless Shield are now properly affecting the user
-Slightly tweaked Ball Fetch's effect, since an operation involving gBattleResults.catchAttempts was being done twice unnecessarily.
2021-01-07 04:31:26 -03:00
LOuroboros
3246c20be5
Moved Power Spot's effect to CalcMoveBasePowerAfterModifiers
2021-01-05 19:51:52 -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
ghoulslash
73a7800f72
Merge pull request #1272 from BuffelSaft/Batte_Engine_Only
...
Fix Jump Kick
2021-01-03 16:50:15 -07: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
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
GriffinR
dfe03618c7
Merge pull request #1284 from GriffinRichards/deadname
...
Remove deadnaming, sync BgEvent
2020-12-31 14:35:23 -05:00
GriffinR
ef60edd933
Remove deadnaming, sync BgEvent
2020-12-31 14:27:46 -05:00
GriffinR
0c74e2097f
Merge pull request #1282 from Sierraffinity/master
...
Change how mon affine transform fix is handled
2020-12-30 21:21:12 -05:00
Sierraffinity
b88922daea
Merge branch 'master' of github.com:pret/pokeemerald
2020-12-30 17:37:17 -08:00
Sierraffinity
ef7832a55c
Change how mon affine transform fix is handled
2020-12-30 17:36:53 -08:00
GriffinR
e1fd2f2a89
Merge pull request #1280 from Sierraffinity/master
...
Add fixes for undefined behavior with modern compiler
2020-12-26 22:08:48 -05: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
ghoulslash
450ac70ab2
Merge pull request #1288 from LOuroboros/comments
...
Some more small battle_config.h tweaks
2020-12-23 10:27:09 -07:00
LOuroboros
320cc37ac9
USE_BATTLE_DEBUG -> B_ENABLE_DEBUG
2020-12-23 14:04:14 -03:00
LOuroboros
b3c5613ff7
battle_config.h tweaks
...
-Moved the USE_BATTLE_DEBUG constant from include/battle_debug.h
-Slight correction to a few comments in battle_config.h
2020-12-23 13:16:01 -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
GriffinR
4ec5c888b4
Merge pull request #1275 from Kurausukun/berrycrush_nonmatching
...
[LEAK INFORMED] Correct Berry Crush Structs and Eliminate Non/Fakematchings
2020-12-22 00:16:36 -05: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
LOuroboros
3918542b3e
Corrections to Final Gambit's effect's battle script
...
-Restored the call to resultmessage
-Corrected its behavior against Endured, Focus Banded/Sashed and Sturdy foes
2020-12-20 21:31:36 -03:00
Kurausukun
14e2898a29
fix structs and some function logic
...
(currently does not match)
2020-12-20 02:54:33 -05:00
LOuroboros
9f2dc914ba
Tweaked Final Gambit's effect
...
-Made the user faint before the foe like in the official games
-Removed calls to resultmessage and critmessage as those were never needed by this move's effect
2020-12-19 22:12:17 -03: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
89989943b3
Added placeholders for the anims of CT's moves
2020-12-19 19:11:17 -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
GriffinR
49bdaeb940
Remove redundant modern CFLAGS
2020-12-16 14:10:30 -05:00
