8445 Commits

Author SHA1 Message Date
luckytyphlosion
2fd2573c4d Merge branch 'master' of https://github.com/pret/pokeemerald 2020-12-23 17:59: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
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
Evan
a426092006 fix sticky barb theft in trainer battles 2020-12-22 08:35:11 -07: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
Evan
5bdf266000 add additional item theft check 2020-12-20 19:06:50 -07: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
Evan
a0b9ece980 merge with BE 2020-12-20 16:39:50 -07: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
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
luckytyphlosion
946faf682f
Extra clarification about remounting the C: drive 2020-12-17 09:03:14 -05:00
Evan
8a544665e4 move common ai params to preloaded struct 2020-12-16 22:56:10 -07:00
luckytyphlosion
3d686116d8 [Round 3] Apply all source related changes for the new INSTALL.md in one commit. 2020-12-16 21:24:44 -05:00
luckytyphlosion
5a5acfb0ad [Round 3] Revert multiple source change commits for re-commit. 2020-12-16 21:24:08 -05:00
luckytyphlosion
32e566def0 Don't define CPP until MODERN is defined. 2020-12-16 21:16:55 -05:00
luckytyphlosion
166183d5ed [Round 2] Apply all source related changes for the new INSTALL.md in one commit. 2020-12-16 20:31:56 -05:00
luckytyphlosion
345aab63cf [Round 2] Revert multiple source change commits for re-commit. 2020-12-16 20:31:10 -05:00
luckytyphlosion
11df2113d9 Use arm-none-eabi-cpp for modern. 2020-12-16 20:29:58 -05:00
luckytyphlosion
d597c5c883 Fix modern builds.
We actually need standard includes for modern.
2020-12-16 20:17:27 -05:00
luckytyphlosion
2783eed825 Check for $(TOOLCHAIN) before checking for $(TOOLCHAIN)/bin
if TOOLCHAIN is blank, wildcard can still detect the `/bin` directory.
2020-12-16 19:54:12 -05:00
luckytyphlosion
3b1cbc5861
Add a note on core.filemode error. 2020-12-16 18:56:03 -05:00
luckytyphlosion
8ad9730901
Make a note about the Microsoft Account dialog. 2020-12-16 15:37:08 -05:00
luckytyphlosion
936ba7f1bf Apply all source related changes for the new INSTALL.md in one commit.
For people who want to have dkPless builds in their repo.
2020-12-16 15:10:01 -05:00
luckytyphlosion
34fc9789c9 Merge branch 'master' of https://github.com/pret/pokeemerald into rebase-install-md 2020-12-16 14:51:21 -05:00
GriffinR
49bdaeb940
Remove redundant modern CFLAGS 2020-12-16 14:10:30 -05:00
luckytyphlosion
cc5db41f30 Revert multiple source change commits for rebase. 2020-12-16 13:29:02 -05:00