ghoulslash
0d246af3db
Merge pull request #1324 from ExpoSeed/PE/sync
...
Sync Pokemon Expansion
2021-01-07 11:49:51 -07:00
ExpoSeed
10f4b48215
Merge branch 'master' of https://github.com/pret/pokeemerald into HEAD
2021-01-01 14:14:51 -08: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
ghoulslash
660ee76452
Merge pull request #1318 from LOuroboros/patch-1
...
Tweaked evolution.h
2020-12-27 19:56:33 -07:00
LOuroboros
32cb306b85
Tweaked evolution.h
...
Litleo doesn't need to have 2 different evolutions into Pyroar.
2020-12-27 00:10:14 -03: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
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
ghoulslash
6f05ef01ac
Merge pull request #1306 from ExpoSeed/galar-mon-flags
...
Add Galarian Form mon flags
2020-12-21 10:05:19 -07:00
ghoulslash
a1e3700d10
Merge pull request #1299 from LOuroboros/cacophony
...
Cacophony
2020-12-21 09:47:52 -07:00
ghoulslash
547d602524
Merge pull request #1304 from LOuroboros/patch-2
...
Corrected the ability 1 of Calyrex's forms
2020-12-20 21:56:26 -07:00
Kurausukun
3203bac053
fix struct
2020-12-20 23:15:35 -05:00
Kurausukun
14e2898a29
fix structs and some function logic
...
(currently does not match)
2020-12-20 02:54:33 -05:00
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
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
GriffinR
49bdaeb940
Remove redundant modern CFLAGS
2020-12-16 14:10:30 -05: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
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
ghoulslash
476acbb339
Merge pull request #1274 from Jaizu/patch-7
...
Change Pidgey front animation
2020-12-13 17:16:39 -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
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
