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
luckytyphlosion
aad94c3433
Fix asmdiff.sh to work without DKP, also improve the makefile command for recognizing a toolchain.
...
The new command requires the toolchain binary path to exist in the file system before building using a toolchain (to handle the case where gba-dev is uninstalled but $(DEVKITARM) still exists))
2020-12-16 13:15:54 -05:00
luckytyphlosion
4ecbb91ccb
Simplify macOS instructions, clarify Linux instructions, general cleanup of macOS and Linux instructions, also some other minor clarifications.
2020-12-16 12:46:10 -05: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
Kurausukun
69cfe5ad01
use direction constant
2020-12-14 21:54:19 -05:00
Kurausukun
68b456e7f9
name a2
2020-12-14 21:51:38 -05:00
Kurausukun
266a23b327
fix indentation
2020-12-14 21:44:25 -05:00
Kurausukun
6faa63347a
document reuse of variables in link mode
2020-12-14 21:41:30 -05:00
GriffinR
c611421882
Merge pull request #1267 from ipatix/m4a_names
...
refactor m4a.c/m4a_1.s constant/variable/type naming
2020-12-14 20:03:53 -05:00
GriffinR
18a5feb413
Merge pull request #1269 from GriffinRichards/bugfix
...
Use BUGFIX for some inline fixes
2020-12-14 20:00:59 -05:00
Evan
259e59bae0
fix early mummy activation on two-turn moves
2020-12-14 12:27:48 -07:00
Evan
09496abef0
reset VAR_TERRAIN on whiteout
2020-12-14 08:59:57 -07:00
Evan
b85dacce9d
fix conflicts
2020-12-14 08:50:41 -07:00
luckytyphlosion
30bd712fd4
Temporarily change repo links to mine for people testing builds.
2020-12-14 02:20:07 -05:00
luckytyphlosion
680187d7d9
Add more detailed notes on Windows terminal comparisons, fix Cygwin instructions (didn't export devkitpro), add macOS and Linux instructions.
...
macOS and Linux instructions untested.
2020-12-14 02:16:25 -05:00
Evan
9c64635ebe
remove redundant permanent terrain check
2020-12-13 19:50:02 -07:00
Evan
67fefd0261
var terrain, surge fixes
2020-12-13 19:42:48 -07:00
Eduardo Quezada D'Ottone
8ffd9bfcca
Merge pull request #1271 from LOuroboros/drives_and_anims
...
Fixed softlock caused by the majority of Techno Blast's animations
2020-12-13 21:40:10 -03:00
Evan
97172fc5b5
merge with be
2020-12-13 17:21:22 -07:00
LOuroboros
785e23222b
Review correction
2020-12-13 21:20:27 -03:00
Evan
ead8637e4f
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into infestation
2020-12-13 17:09:04 -07:00
Evan
36b0e6dedc
fix shake duration
2020-12-13 17:08:35 -07:00
GriffinR
6dea3374d2
Merge pull request #1271 from Sierraffinity/pkmn_affine_anim_bugfix
...
Add bugfix for Pokémon with affine transforms as part of their entry animation glitching when being sent out/put back in ball
2020-12-13 18:43:55 -05:00
Evan
ac332d5e98
check bad move
2020-12-13 15:02:21 -07:00
GriffinR
f7a729df30
BUGFIX implies UBFIX
2020-12-13 16:16:48 -05:00
GriffinR
5fa47dc895
Merge pull request #1270 from timgates42/bugfix_typo_redundant
...
docs: fix simple typo, redunant -> redundant
2020-12-13 08:53:50 -05:00
Tim Gates
581306db7b
docs: fix simple typo, redunant -> redundant
...
There is a small typo in include/constants/battle_frontier.h.
Should read `redundant` rather than `redunant`.
2020-12-13 22:14:50 +11:00
Sierra A
7031068641
Update bugs_and_glitches.md
2020-12-12 22:42:29 -08:00
Sierra A
f24307346f
Update bugs_and_glitches.md
2020-12-12 22:42:02 -08:00
Sierra A
56ec5c65a8
Update bugs_and_glitches.md
2020-12-12 22:41:46 -08:00
Sierraffinity
1aca378634
Fix name of SetDexNumberColor
2020-12-12 21:08:15 -08:00
GriffinR
b1197ac2da
UBFIX for if_status_not_in_party
2020-12-12 23:57:25 -05:00
GriffinR
81d95b9325
Use BUGFIX for some inline fixes
2020-12-12 23:30:51 -05:00
Sierraffinity
abef3065d0
Fix affine anim bug with Pokémon going in and out of balls without an intermediate screen transition
2020-12-12 20:29:20 -08:00
Eduardo Quezada D'Ottone
47d96aed3c
Merge pull request #1285 from LOuroboros/spite
...
Updated Spite
2020-12-12 22:27:26 -03:00
Eduardo Quezada D'Ottone
ea1dca3024
Merge pull request #1270 from LOuroboros/drives_and_types
...
Made Techno Blast's animation change depending on the Drive held
2020-12-12 21:43:45 -03:00
LOuroboros
dc34ad7e83
Tweaked abilitypopup usage on Cotton Down's BattleScript
2020-12-12 21:24:39 -03:00
LOuroboros
1f10b94a11
Implemented Power Spot
2020-12-12 21:22:42 -03:00
Eduardo Quezada D'Ottone
db9933ce67
Merge pull request #1244 from ghoulslash/popup
...
toggleable manual ability popup destruction
2020-12-12 20:36:55 -03:00
LOuroboros
305bea32df
Added missing check to Flower Gift (offensive)
2020-12-12 20:32:52 -03:00
LOuroboros
8e187d1d5b
Implemented Ice Scales
2020-12-12 19:39:35 -03:00
Eduardo Quezada D'Ottone
2d742dc879
Merge pull request #1286 from LOuroboros/B_STANCE_CHANGE_FAIL
...
Improved the comment of B_STANCE_CHANGE_FAIL
2020-12-12 16:56:24 -03:00
GriffinR
ba3021db64
Merge pull request #1268 from LOuroboros/move_flags
...
Corrected small inconsistency in move flag names
2020-12-12 11:14:48 -05:00
LOuroboros
55bc2b4bb9
Corrected small inconsistency in move flag names
2020-12-12 12:18:56 -03:00
LOuroboros
e9c6c96b9d
Corrected Final Gambit's move data
...
It didn't have its own working effect assigned, and it wasn't being affected by King's Rock even though it should.
2020-12-12 11:57:49 -03:00
LOuroboros
31d483ef44
Some more battle_config.h tweaks
2020-12-12 11:35:05 -03:00
Michael Panzlaff
eaff64e223
remove trailing spaces
2020-12-12 13:19:08 +01:00
