Commit graph

7034 commits

Author SHA1 Message Date
ultima-soul
b58a8390f3 Add Fairy-type icon to fix Fairy TM info icon being blank. 2021-01-02 21:21:52 -08:00
ExpoSeed
10f4b48215 Merge branch 'master' of https://github.com/pret/pokeemerald into HEAD 2021-01-01 14:14:51 -08:00
GriffinR
4a04b16ac1
Merge pull request #1281 from GriffinRichards/index-bc
Index battle controller cmd tables
2021-01-01 17:14:34 -05:00
GriffinR
88e951bfe3 Label some ReturnToField funcs 2021-01-01 17:11:06 -05:00
GriffinR
c711a2f73b Document warp spin functions 2021-01-01 17:11:02 -05:00
GriffinR
8cad412ae2 Label a few flash effect functions 2021-01-01 13:34:25 -05: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
amiosi
6c5852c4e0 colors n stuff 2020-12-31 13:13:10 -05:00
GriffinR
84fbcc9dd6 Fix modern -> UBFIX macro change 2020-12-31 00:44:43 -05:00
GriffinR
ec85c01e7c
Merge branch 'master' into doc-factscreen 2020-12-31 00:40:45 -05:00
GriffinR
093610b46e Finish factory swap screen doc 2020-12-31 00:26:14 -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
luckytyphlosion
e744d86bf1
Fix msys2 instructions, also add more formatting to installation instructions. 2020-12-30 20:56:04 -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
luckytyphlosion
a0344a4094
Forgot to add some line breaks. 2020-12-30 18:49:04 -05:00
GriffinR
7ae78dc773 Finish factory select screen doc 2020-12-30 17:56:31 -05:00
GriffinR
0bf49198f6 Resume factory screen doc 2020-12-30 13:28:15 -05:00
GriffinR
2f426e0e7d Index battle controller cmd tables 2020-12-29 17:21:58 -05: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
luckytyphlosion
feb6befd09
Improve storage instructions as per Griffin's recommendations.
Todo actually properly proofread this.
2020-12-23 22:51:35 -05:00
luckytyphlosion
56cad5c240
Re-add note about Qt since Porymap hasn't upgraded to 6.0. 2020-12-23 18:14:33 -05:00
luckytyphlosion
9da0920969 Improve INSTALL.mds as per recommendations.
- Put "conditional" notes in quotes to better communicate which instructions are more required
- Number instructions per OS as per Griffin's advice.
2020-12-23 18:02:30 -05:00
luckytyphlosion
2fd2573c4d Merge branch 'master' of https://github.com/pret/pokeemerald 2020-12-23 17:59:47 -05:00
ultima-soul
6a0939cd4e Remove special handling for Deoxys. 2020-12-21 22:39:19 -08: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
luckytyphlosion
946faf682f
Extra clarification about remounting the C: drive 2020-12-17 09:03:14 -05:00