Bassoonian
0b9cdf4716
Update README.md ( #4966 )
2024-07-14 11:59:58 +02:00
Martin Griffin
e480f73e5a
Pret Merge (13th of July) ( #4964 )
2024-07-13 19:00:10 +01:00
Bassoonian
50f368eceb
Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge13july
2024-07-13 19:42:29 +02:00
Philipp AUER
550e6688aa
Support C-Style enum in preproc ( #1984 )
...
* [preproc] C-style enums
- asm files parseable from stdin
- 2nd preproc pass
- add parser for C-style `enum`
- positional arguments at end of command
---------
Co-authored-by: sbird <sbird@no.tld>
Co-authored-by: Martin Griffin <martinrgriffin@gmail.com>
2024-07-13 18:26:33 +01:00
Bassoonian
deb2b69a76
Fix Diamond Storm's effect ( #4947 )
2024-07-11 09:28:38 -04:00
Bassoonian
f85bff6e30
Fix Basculegion's gen9 level up learnset ( #4948 )
2024-07-11 15:07:39 +02:00
Alex
7b6ff1b560
Fixes Trace turn order ( #4941 )
...
* Fixes Trace turn order
* Update battle_script_commands.c
* Update test/battle/ability/trace.c
---------
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-07-10 22:29:26 +02:00
Eduardo Quezada
0613af5604
Untag
2024-07-10 09:47:35 -04:00
Eduardo Quezada
c0eb9af2e6
Version 1.8.5 ( #4921 )
...
* Version 1.8.5
* Updated up to PR 4926 (squash)
* Fixed descriptions (squash)
* Updated up to PR4939 (squash)
2024-07-10 09:44:55 -04:00
hedara90
76d760041c
Flame Burst + Substitute fix ( #4939 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2024-07-10 13:58:32 +02:00
kleeenexfeu
e1a6876600
Bitter Malice description fix ( #4933 )
...
It always lowers the foe's attack
2024-07-08 17:37:40 -04:00
tertu
eea736c210
shop menu allows for 6 digits item prices ( #4929 )
2024-07-08 11:39:46 -05:00
DizzyEggg
40950b63f7
shop menu allows for 6 digits item prices
2024-07-08 18:12:48 +02:00
Alex
cc0a9acc7f
Fixes wrong nature on partner ( #4926 )
2024-07-08 11:47:30 +02:00
Eduardo Quezada
6404241c40
Fixed P_UPDATED_ABILITIES not reverting newly given abilities in Gens 4/6/7 ( #4922 )
2024-07-07 13:18:16 +02:00
Eduardo Quezada
de609a2f5b
Added missing redirect abilities Gen 3-4 config ( #4920 )
...
* Added missing redirect abilities Gen 3-4 config
* Combined 3 Battle Script Natives into 1
* Cleaner FindMonThatAbsorbsOpponentsMove
2024-07-07 09:52:59 +02:00
sneed
60c7588532
IsFinalStrikeEffect uses effect instead of move ( #4917 )
...
* IsFinalStrikeEffect uses effect instead of move
* Update test/battle/ability/parental_bond.c
---------
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-07-06 09:41:19 +02:00
Bassoonian
93f5ca2481
Pret Merge (5th of July) ( #4915 )
2024-07-05 23:55:33 +02:00
Bassoonian
31ee8fec80
Fix 2006 regression
2024-07-05 20:49:18 +02:00
Bassoonian
a7f786009e
Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge5july
2024-07-05 20:44:29 +02:00
kleeenexfeu
8168dd7be9
Shed tail rounds up, not down ( #4913 )
...
* Shed tail rounds up, not down
* Label
2024-07-05 19:21:30 +02:00
GriffinR
a0a02f9733
Merge pull request #2012 from DizzyEggg/patch-1
...
Berry blender's Task_HandleOpponent small fixes
2024-07-04 15:02:58 -04:00
DizzyEggg
47533e3a7e
Berry blender's Task_HandleOpponent small fixes
2024-07-04 20:56:22 +02:00
Alex
13b8daf36b
Supersweet Syrup wrong ability desc ( #4902 )
2024-07-03 22:53:41 +02:00
Alex
dd7b735211
Fixes Grassy Terrain heal turn duration ( #4903 )
2024-07-03 22:53:15 +02:00
Alex
594633aa15
Remove Duplicate ai code from battle_ai_util.c ( #4883 )
...
* Remove Duplicate ai code from battle_ai_util.c
* Add GetBattlerAbility in toxic self check
2024-07-03 10:48:31 +02:00
DizzyEggg
d81662daa2
Add parentheses to species egg macro ( #4899 )
2024-07-02 13:39:41 +01:00
GriffinR
502eedaed8
Merge pull request #2009 from abcboy101/berry-blender
...
Decode unused JP text in berry_blender.c
2024-06-29 16:31:56 -04:00
Frank DeBlasio
6957fc70c9
Allowed rematches to occur if I_VS_SEEKER_CHARGING isn't enabled ( #4866 )
2024-06-29 22:12:26 +02:00
Cafei
3ec371de05
Fixes ( #4887 )
2024-06-29 20:46:00 +02:00
abcboy101
779855ee02
Decode unused JP text in berry_blender.c
2024-06-29 14:02:50 -04:00
sneed
75be596933
fix sticky hold softlock ( #4885 )
2024-06-29 18:54:58 +02:00
DizzyEggg
26ef19d6c0
Fix wrong palette in palyer backsprite in recorded battle ( #4875 )
2024-06-27 11:33:28 +02:00
DizzyEggg
cd5a862b95
Fix Megas gaining abilities after fainting ( #4873 )
2024-06-26 23:44:01 +02:00
leo60228
566ad6d869
Don't try to deploy to GitHub Pages if it's not enabled ( #4809 )
2024-06-25 11:10:52 +02:00
DizzyEggg
f2e8482488
Fix how switch-in effects are played out after multiple faints in the same turn ( #4864 )
...
* Multiple switch-ins after fainting
* empty new lines
* Fix failing tests
2024-06-24 20:37:47 +02:00
cawtds
a8ae1a0342
added missing minior description + test for missing descriptions ( #4858 )
2024-06-24 12:19:12 +02:00
sneed
ec75a75498
Update plasma_fists.c ( #4865 )
2024-06-23 21:17:58 +02:00
Alex
e74264f6de
Ported test changes from #4857 ( #4859 )
2024-06-22 19:39:01 +02:00
DizzyEggg
f73ad41fa1
Tests for post-ko switch scenarios ( #4856 )
2024-06-22 12:07:36 +02:00
Alex
8ac739ea1a
[Update moves_info.h] wrong move names ( #4854 )
2024-06-22 09:52:39 +02:00
sneed
6893d8dbef
ignoresTargetAbility doesnt ignore the attacker's ability ( #4855 )
2024-06-22 09:52:25 +02:00
Bassoonian
9f7a83fd6a
Pret merge (20th of June) ( #4845 )
...
* Don't assume bash is at /bin/bash
* Add NixOS install instructions
* Add support for LF line endings to gbagfx
---------
Co-authored-by: leo60228 <leo@60228.dev>
Co-authored-by: Martin Griffin <martinrgriffin@gmail.com>
Co-authored-by: Alex Nash <contact@alexnash.dev>
2024-06-21 12:21:29 +02:00
DizzyEggg
438f478146
Fix comatose transform gastro acid interaction ( #4852 )
2024-06-21 12:19:43 +02:00
DizzyEggg
d0bb03e5a9
Fix AI's right slot switching-in too early ( #4851 )
...
* apply safe switching to trainer doubles battles - with a config
* get rid of the config
* make it compile
2024-06-21 12:17:12 +02:00
sneed
c31f982a7b
Fix fury cutter scaling up to 640 power ( #4846 )
...
* Fix fury cutter scaling up to 640 power
* Replace three instances of int i with one int turn
* dynamic test
2024-06-21 08:15:00 +02:00
Martin Griffin
cb1a14c9fa
Merge pull request #2006 from leo60228/oops-not-expansion
...
Fix pokeemerald-expansion reference in INSTALL.md
2024-06-21 06:41:52 +01:00
leo60228
5dac97aa5d
Fix pokeemerald-expansion reference in INSTALL.md
2024-06-20 15:55:51 -04:00
Alex Nash
c0d630ee63
Add support for LF line endings to gbagfx
2024-06-20 21:44:32 +02:00
Martin Griffin
366f8b33a3
Merge pull request #1999 from leo60228/nixos-install
...
Fix build on NixOS and add instructions to INSTALL.md
2024-06-20 19:10:57 +01:00
