18854 Commits

Author SHA1 Message Date
GriffinR
dfc6ee0e9e Add SAFE_DIV 2021-03-21 13:43:14 -05:00
GriffinR
28aff5b179 Correct ClearRankingHallRecords bugfix 2021-03-21 13:43:14 -05:00
GriffinR
557152b06e Minor link cleanup 2021-03-21 13:40:40 -05:00
Kurausukun
0691632ac6 oops 2021-03-19 18:52:37 -04:00
Kurausukun
7198d40ec8 port some documentation from FR 2021-03-19 18:49:19 -04:00
Kurausukun
5b910a11b4 port miscellaneous fr documentation 2021-03-18 20:35:39 -04:00
GriffinR
8eafe1fd4e Move pointillism points array to src 2021-03-18 17:36:18 -05:00
GriffinR
22e2c0a47c Document Berry Crush 2021-03-18 15:18:23 -04:00
LOuroboros
dea69a48ef Decapped nature names 2021-03-18 08:31:38 -03:00
ghoulslash
539806d176 ability pop up apostrophes 2021-03-17 14:26:33 -06:00
BuffelSaft
937c24ca51 Remove special Body Press effect
Only include the official effect for Body Press to stay faithful to the gen 8 games.
2021-03-16 23:37:02 +13:00
BuffelSaft
7d237d8ff6 Implement Body Press' effect
Body Press calculates damage using the user's defense stat instead of its attack. Also adds a special variant of the effect that uses the special defense stat.
2021-03-16 22:56:44 +13:00
GriffinR
3cb9300744
Merge pull request #1377 from Kurausukun/temp
Port Some Missed Berry Crush Documentation
2021-03-16 00:02:27 -04:00
Kurausukun
3baac6ef3c port some missed berry crush documentation 2021-03-15 23:55:10 -04:00
Ariel Antonitis
c15ae199aa Fixed glitch pokemon follower sprites. 2021-03-15 23:04:19 -04:00
GriffinR
ecd269ba2c
Merge pull request #1372 from GriffinRichards/doc-countdown
Document minigame countdown
2021-03-15 21:39:58 -04:00
GriffinR
9242ec30de
Merge pull request #1376 from PikalaxALT/battle_multi_buffer
Resolve link comm buffers in gBattleStruct
2021-03-15 21:35:16 -04:00
PikalaxALT
925e68c03f Update newly named fields 2021-03-15 15:22:41 -04:00
PikalaxALT
8352ebcc48 Merge branch 'master' of github.com:pret/pokeemerald into battle_multi_buffer 2021-03-15 09:46:57 -04:00
GriffinR
780e49dbc8
Merge pull request #1375 from GriffinRichards/bugfix-end
Note missing end in Trainer Hill
2021-03-14 19:08:36 -04:00
Eduardo Quezada D'Ottone
d270dee6bc
Merge pull request #1421 from LOuroboros/patch-1
Fix src/battle_anim.c
2021-03-14 13:11:55 -03:00
LOuroboros
d6e89a99ce Corrected the name of an included header file
include/constants/battle_moves.h doesn't exist.
The right header file to include was include/constants/moves.h instead.
2021-03-14 12:54:57 -03:00
Blackforest92
badf8945d8 Added missing gen8 battle sprites and available icons - Fix Arceus, Palkia, Kyurem White and Black - Implement 1 tile 10 palettes system for Alcremie 2021-03-14 18:31:24 +07:00
GriffinR
cc9d54bf6d
Merge pull request #1374 from SethBarberee/berry_crush_sync
berry_crush: sync some pokefirered names with pokeemerald
2021-03-13 16:52:11 -05:00
GriffinR
fd3175bde4 Note missing end in Trainer Hill 2021-03-13 16:40:29 -05:00
amiosi
b081a00891 Merge branch 'battle_engine' into old_findings 2021-03-13 09:59:09 -05:00
Eduardo Quezada D'Ottone
292993e360
Merge pull request #1338 from ghoulslash/ripen
Add Ripen and Finish Gen4 Berries
2021-03-13 11:16:42 -03:00
Seth Barberee
4158f07dee move bgBuffers back to unk138 2021-03-12 19:24:03 -06:00
Seth Barberee
fda56d6f47 berry_crush: sync some pokefirered names with pokeemerald 2021-03-12 18:39:25 -06:00
PikalaxALT
8d4dcb228a More documentation in battle_main 2021-03-12 16:55:58 -05:00
PikalaxALT
e32a1571af Resolve link comm buffers in gBattleStruct 2021-03-12 15:37:31 -05:00
GriffinR
665dffe048
Merge pull request #1373 from PikalaxALT/fix_nonmatchings
Nonmatching resoltuion
2021-03-12 14:03:39 -05:00
PikalaxALT
e6b1b97aa1 Nonmatching resoltuion
- Fix fakematch in Cmd_get_used_held_item
- Remove `static` overrides in MODERN in four objects
2021-03-12 13:55:07 -05:00
GriffinR
b1a69d95ea Document minigame countdown 2021-03-11 14:25:22 -05:00
Ariel Antonitis
3a0795d862 Followers disappear properly when using Surf.
Removed leftover palette 31.
2021-03-10 20:48:20 -05:00
GriffinR
6c297d19e8
Merge pull request #1356 from GriffinRichards/doc-dodrioberrypicking
Document Dodrio Berry Picking
2021-03-10 18:55:41 -05:00
Ariel Antonitis
89774dfc48 Merge branch 'lighting' into romhack 2021-03-10 17:50:25 -05:00
Ariel Antonitis
7bcd2c8fb5 Fixed bird fly sprite shadow position.
Object event shadows are now displayed by default.
2021-03-10 17:49:18 -05:00
Ariel Antonitis
d05a5a0857 Temporarily removed follower fly script. 2021-03-10 15:06:59 -05:00
LOuroboros
aa4c28dcf3 Added a check for the Mega Bracelet in CanMegaEvolve 2021-03-10 09:10:58 -03:00
LOuroboros
68980cf18c Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gulp_missile 2021-03-10 03:58:21 -03:00
ghoulslash
208b964a56
Update src/battle_util.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2021-03-09 16:35:56 -07:00
ghoulslash
d5004638a9
Update include/constants/battle_config.h
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2021-03-09 16:35:47 -07:00
Eduardo Quezada D'Ottone
acf9bb0a17
Merge pull request #1365 from ghoulslash/memento
Update Memento Fail Conditions to Gen4+
2021-03-09 17:57:43 -03:00
ExpoSeed
c0040b5ce5 Form change on daycare withdraw 2021-03-09 12:20:13 -06:00
ExpoSeed
3655fe52f3 Prison Bottle and Reveal Glass don't exist yet 2021-03-09 11:54:56 -06:00
ExpoSeed
f8dfd8f353 Remove special casing 2021-03-09 11:53:01 -06:00
GriffinR
4620992f07
Merge pull request #1368 from GriffinRichards/fix-fightanim
Fix out of bounds access for fighting anims
2021-03-09 12:48:01 -05:00
ghoulslash
3f9bf5acc0 merge with be 2021-03-09 10:33:48 -07:00
Eduardo Quezada D'Ottone
c91413300d
Merge pull request #1392 from ghoulslash/hp_boxes
Fix HP Boxes not Dissapearing with Certian Moves
2021-03-09 08:11:53 -03:00