ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-10 05:35:05 +01:00
Code Issues Packages Projects Releases Wiki Activity
7,717 Commits 1 Branch 0 Tags 235 MiB
ec2c140ecb
Commit Graph

7717 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
GriffinR
22e2c0a47c Document Berry Crush 2021-03-18 15:18:23 -04: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
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
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
GriffinR
6c297d19e8
Merge pull request #1356 from GriffinRichards/doc-dodrioberrypicking 
Document Dodrio Berry Picking
 2021-03-10 18:55:41 -05:00
LOuroboros
aa4c28dcf3 Added a check for the Mega Bracelet in CanMegaEvolve 2021-03-10 09:10:58 -03: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
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
ghoulslash
68388f633f merge with be 2021-03-08 18:58:16 -07:00
ExpoSeed
685c8283ed
Merge pull request #1411 from BuffelSaft/Batte_Engine_Only 
Fix Spiky Shield/Jump Kick freeze
 2021-03-08 17:24:36 -06:00
ExpoSeed
9ec04fcce8
Merge pull request #1397 from ghoulslash/escape 
Fix Ghost Types Unable to Escape
 2021-03-08 17:24:00 -06:00
GriffinR
6274acfe5f Fix out of bounds access for fighting anims 2021-03-08 14:32:20 -05:00
GriffinR
ba1e006a64 Move webhook env vars, drop unnecessary secrets 2021-03-07 22:40:09 -05:00
GriffinR
fd42e02af4 Move webhook event check to workflow 2021-03-07 17:35:56 -05:00
GriffinR
2bba2ce1a1 Link .text.unlikely for modern 2021-03-07 17:24:30 -05:00
GriffinR
1dc12890d1 Update event name in webhook 2021-03-07 15:33:14 -06:00
GriffinR
c05f529a19 Replace Travis CI with Github workflow 2021-03-07 15:33:14 -06:00
BuffelSaft
1f54233953 Fix powder immunity for self-targeting moves 
Example: Because Rage Powder targets the user, this check is needed to allow grass types to use it.
 2021-03-07 11:00:52 +13:00
N
94a883d600 Fix space 2021-03-04 19:36:44 -06:00
N
99c6a504e0 Finish renaming functions 2021-03-04 19:36:44 -06:00
N
b9b33b6f2b Some renaming 2021-03-04 19:36:44 -06:00
N
7b046ebd1d rename gBerryCrushGame 2021-03-04 19:36:44 -06:00
N
e79048e8ee Remove unneeded bitwise operations 2021-03-04 19:35:25 -06:00
N
d5a63681e8 Fixed faulty define 2021-03-04 19:33:40 -06:00
N
d63431ae88 Fix comment 2021-03-04 19:33:40 -06:00
N
a2f757c7a6 Document BG_PLTT usage in Agb_Main 2021-03-04 19:33:40 -06:00
N
b86b66660c Revert void change 2021-03-04 19:32:36 -06:00
N
8f5bd2fb33 Fix prefixes of variable names 
Many static variables in this function are falsely labeled with a g prefix, as if it were global, when they are in fact state variables.
 2021-03-04 19:32:36 -06:00