Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,265 Commits 1 Branch 0 Tags
Commit Graph

11265 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ExpoSeed
ef6a7fbf43 Add Galarian Form mon flags 2020-12-18 18:25:24 -06:00
LOuroboros
cb9faeed3d
Corrected the ability 1 of Calyrex's forms 
There isn't an `ABILITY_AS_ONE` defined in the `include/constants/abilities.h` of the battle_engine branch, so this wasn't building a ROM correctly.
https://github.com/rh-hideout/pokeemerald-expansion/blob/pokemon_expansion/src/data/pokemon/base_stats.h#L34158
https://github.com/rh-hideout/pokeemerald-expansion/blob/battle_engine/include/constants/abilities.h#L290
 2020-12-18 08:17:49 -03:00
ghoulslash
a842f35428
Merge pull request #1301 from ultima-soul/gen_8_mon_data 
Add Gen 8 Pokémon Data
 2020-12-17 20:52:15 -07:00
Pyredrid
467a977590
Merge pull request #1297 from LOuroboros/mandibuzz 
Corrected the icon sprite of Mandibuzz
 2020-12-17 16:36:03 -05:00
LOuroboros
d4a1a573cb I am so very sorry for my own stupidity 2020-12-17 16:07:07 -03: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
ultima-soul
ad67068f7e Merge branch 'pokemon_expansion' of github.com:rh-hideout/pokeemerald-expansion into gen_8_mon_data 2020-12-16 13:28:42 -08:00
ultima-soul
c675c92a1d Add Gen 8 Pokemon data. 2020-12-16 12:57:36 -08: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
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
LOuroboros
83ffb80379 Restored abilities.h 2020-12-14 16:31:46 -03:00
LOuroboros
1c5b514a67 Temporarily removed abilities.h 2020-12-14 16:30:56 -03:00
Evan
259e59bae0 fix early mummy activation on two-turn moves 2020-12-14 12:27:48 -07:00
LOuroboros
77871c5eda Dealt with Cacophony 
By copy-pasting back in the BE's include/constants/abilities.h and commenting out the 2 instances where ABILITY_CACOPHONY is normally used in this branch.
 2020-12-14 16:26:00 -03:00
LOuroboros
c8cf0a09a0 Corrected the icon sprite of Mandibuzz 
It was Mienfoo's, for some odd reason.
 2020-12-14 16:19:38 -03:00
Evan
e70e2bcd65 merge with be 2020-12-14 09:09:51 -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
ghoulslash
476acbb339
Merge pull request #1274 from Jaizu/patch-7 
Change Pidgey front animation
 2020-12-13 17:16:39 -07: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