17293 Commits

Author SHA1 Message Date
Alex
87cbb457f1
Fixes AI not seeing primal weather and partner absorbing abilities (#6936) 2025-05-22 17:25:29 -04:00
Alex
f9400332fc
Fixes AI repeated use of weather set up moves (#6963) 2025-05-22 16:50:13 -04:00
Eduardo Quezada
2e3ae0d167
Added check for gBattleStringsTable (#6948) 2025-05-22 21:05:22 +02:00
Alex
48100e9593
Fixes Unnerve activation not limited to 1 per switch-in (#6960) 2025-05-22 19:15:01 +02:00
Alex
8ec998abff
Fixes ate type being ignored after checking summary screen (#6888) 2025-05-22 14:07:36 +02:00
Alex
8ad1f329c9
Fixes Dazzling abilities activating on all multi hit move hits (#6943) 2025-05-22 10:37:00 +02:00
Eduardo Quezada
be4b8ca3d0
Fix KNOWN_FAILING Bestow tests (#6947) 2025-05-22 10:23:15 +02:00
hedara90
e9ba4b5db0
Added type: documentation to required labels for the label check (#6957)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-05-22 00:45:25 -07:00
Alex
ce079cfcc8
Fixes Life Orb damage still happening after attacker was unable to attack (#6940) 2025-05-21 16:16:33 +02:00
jfb1337
ce9bbcc3b7
Fix trainers.party parser failing on apostrophes (#6938) 2025-05-21 10:41:18 +02:00
ghoulslash
c485ae4e90
add fail ptr arg to JumpIfMoveFailed, fix tryworryseed (#6925)
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2025-05-20 17:07:29 +02:00
allcontributors[bot]
8f88cfad5b
add surskitty as a contributor for code (#6924)
Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>
Co-authored-by: psf <77138753+pkmnsnfrn@users.noreply.github.com>
2025-05-20 06:25:26 -07:00
Pawkkie
3f89abea74
Fix test not referencing AI_TRAINER_NAME (#6926) 2025-05-19 22:17:46 -07:00
allcontributors[bot]
100121ad06
add grintoul1 as a contributor for code (#6920)
Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>
Co-authored-by: psf <77138753+pkmnsnfrn@users.noreply.github.com>
2025-05-19 22:14:59 -07:00
allcontributors[bot]
00bc660727
add RubyRaven6 as a contributor for code, and doc (#6918)
Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>
Co-authored-by: psf <77138753+pkmnsnfrn@users.noreply.github.com>
2025-05-19 19:35:38 -07:00
allcontributors[bot]
fe7425235a
add wiz1989 as a contributor for code (#6902)
Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>
Co-authored-by: psf <77138753+pkmnsnfrn@users.noreply.github.com>
2025-05-19 15:47:16 -07:00
allcontributors[bot]
f8d31a7410
add PCG06 as a contributor for code (#6900)
Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>
Co-authored-by: psf <77138753+pkmnsnfrn@users.noreply.github.com>
2025-05-19 07:41:39 +02:00
allcontributors[bot]
6df68c4dd3
add mudskipper13 as a contributor for code, and doc (#6915)
Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>
Co-authored-by: psf <77138753+pkmnsnfrn@users.noreply.github.com>
2025-05-18 21:08:43 -07:00
allcontributors[bot]
6bdec079c0
add kittenchilly as a contributor for code (#6898)
Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>
Co-authored-by: psf <77138753+pkmnsnfrn@users.noreply.github.com>
2025-05-18 17:49:50 -07:00
allcontributors[bot]
ec58de2b6a
add ExpoSeed as a contributor for code, and maintenance (#6899)
Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>
Co-authored-by: psf <77138753+pkmnsnfrn@users.noreply.github.com>
2025-05-18 15:00:00 -07:00
allcontributors[bot]
c83e7bda23
add LinathanZel as a contributor for code (#6901)
Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>
Co-authored-by: psf <77138753+pkmnsnfrn@users.noreply.github.com>
2025-05-18 08:42:48 -07:00
allcontributors[bot]
7b679a6feb
add AsparagusEduardo as a contributor for code, data, and 10 more (#6905)
Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>
Co-authored-by: psf <77138753+pkmnsnfrn@users.noreply.github.com>
2025-05-18 07:07:59 -07:00
Bassoonian
f1a655366b
Fix typo in the readme (#6908) 2025-05-18 06:47:35 -07:00
allcontributors[bot]
6a726d9821
add agsmgmaster64 as a contributor for code (#6906)
Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>
Co-authored-by: psf <77138753+pkmnsnfrn@users.noreply.github.com>
2025-05-18 06:47:00 -07:00
psf
5164c40e49
Update .all-contributorsrc to skip CI (#6907) 2025-05-18 00:36:52 +02:00
allcontributors[bot]
5fdc7f9283
add khbsd as a contributor for doc, and code (#6903)
Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>
Co-authored-by: psf <77138753+pkmnsnfrn@users.noreply.github.com>
2025-05-17 15:15:28 -07:00
allcontributors[bot]
c0b70dd35b
add Cafeei as a contributor for design (#6904)
Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>
2025-05-17 14:54:23 -07:00
psf
9145132377
Fixed URL for contributors badge on README.md (#6897) 2025-05-17 16:38:49 -04:00
allcontributors[bot]
6cbb7b31af
add Pawkkie as a contributor for doc (#6896)
Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>
2025-05-17 13:25:53 -07:00
kittenchilly
75f6d85582
Improve a few Gen 9 Pokemon sprites (#6885) 2025-05-17 19:48:44 +02:00
psf
b8b73bf219
Add CREDITS.md & FEATURES.md, rewrite README.md & INSTALL.md (#6700) 2025-05-17 19:33:22 +02:00
Eduardo Quezada
6711df36a3
Create missing ability and move effect test files (#6845) 2025-05-16 12:20:44 +02:00
Eduardo Quezada
3a3c246509
Consolidated stat-priority ability tests (#6863) 2025-05-16 12:09:39 +02:00
kittenchilly
7359d234c8
PokeCommunity sprites batch (April 2025) (#6840) 2025-05-16 09:35:30 +02:00
Alex
fb1737ddbf
Pret merge (15th of May, 2025) (#6870) 2025-05-16 08:00:07 +02:00
Hedara
6896750921 Merge commit '0aae36984f2561f075b2b7e7d2a0924a912f6af7' into pret-merge 2025-05-15 21:48:17 +02:00
Hedara
468454d810 Merge commit '51b000860be6d26da989c8b2e51a3f66c664083e' into pret-merge
Conflicts:
	src/battle_controllers.c
	src/battle_gfx_sfx_util.c
2025-05-15 21:38:57 +02:00
Hedara
578c5f96cd Merge commit 'baf5be20354c9dfde182c0a2dd23ab40643fe57b' into pret-merge
Conflicts:
	include/battle_gfx_sfx_util.h
	src/apprentice.c
	src/battle_controller_recorded_opponent.c
	src/battle_controller_recorded_player.c
	src/battle_dome.c
	src/battle_gfx_sfx_util.c
	src/battle_script_commands.c
	src/battle_tv.c
	src/item_menu.c
	src/move_relearner.c
	src/pokemon.c
	src/scrcmd.c
2025-05-15 21:31:54 +02:00
Hedara
2945c83bbc Merge commit '2044bea883d08ec9266d21ac0cd6a56c3e0d5962' into pret-merge
Conflicts:
	include/battle.h
	include/battle_ai_script_commands.h
	include/battle_anim.h
	include/battle_controllers.h
	include/battle_gfx_sfx_util.h
	include/battle_main.h
	include/battle_script_commands.h
	include/battle_util.h
	include/pokemon.h
	include/recorded_battle.h
	src/battle_ai_script_commands.c
	src/battle_anim.c
	src/battle_anim_mons.c
	src/battle_anim_sound_tasks.c
	src/battle_anim_status_effects.c
	src/battle_controller_link_opponent.c
	src/battle_controller_link_partner.c
	src/battle_controller_opponent.c
	src/battle_controller_player.c
	src/battle_controller_player_partner.c
	src/battle_controller_recorded_opponent.c
	src/battle_controller_recorded_player.c
	src/battle_controller_wally.c
	src/battle_controllers.c
	src/battle_gfx_sfx_util.c
	src/battle_interface.c
	src/battle_main.c
	src/battle_message.c
	src/battle_records.c
	src/battle_script_commands.c
	src/battle_tv.c
	src/battle_util.c
	src/battle_util2.c
	src/pokeball.c
	src/pokemon.c
	src/recorded_battle.c
	src/reshow_battle_screen.c
2025-05-15 21:15:37 +02:00
Hedara
a001e36f1c Merge commit '384b8f127e6a18aef0a3' into pret-merge
Conflicts:
	src/battle_anim_mons.c
2025-05-15 17:36:48 +02:00
Hedara
49906a81f7 Merge commit 'c39ef1a03002a7af94' into pret-merge
Conflicts:
	src/battle_ai_switch_items.c
	src/battle_controller_link_opponent.c
	src/battle_controller_link_partner.c
	src/battle_controller_opponent.c
	src/battle_controller_player.c
	src/battle_controller_player_partner.c
	src/battle_controller_recorded_opponent.c
	src/battle_controller_recorded_player.c
	src/battle_controller_safari.c
	src/battle_controller_wally.c
	src/battle_controllers.c
	src/battle_main.c
	src/battle_script_commands.c
	src/battle_util.c
	src/battle_util2.c
	src/pokemon.c
2025-05-15 17:31:50 +02:00
Hedara
659473760c Merge commit '263026e4320c' into pret-merge
Conflicts:
	src/battle_anim_rock.c
	src/battle_anim_water.c
2025-05-15 16:21:33 +02:00
Alex
a086d5f592
Reverts wrongly done gem fix and renames struggle effect (#6806) 2025-05-15 10:45:48 +02:00
Alex
75cd16dae0
Fix potential bug in BattleScript_FriskActivates (#6850) 2025-05-15 10:44:37 +02:00
kittenchilly
4474bd5b80
Add move description data for Z-Moves and Max/G-Max moves (#6852) 2025-05-15 10:44:09 +02:00
hedara90
9924ae3391
Make make clean work again (#6848)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-05-15 10:40:35 +02:00
GriffinR
0aae36984f
Merge pull request #2136 from mrgriffin/pret-remove-files
Remove files that should not have been committed in #2126
2025-05-13 12:15:58 -04:00
Martin Griffin
484c41c49d Remove files that should not have been committed 2025-05-13 14:56:31 +01:00
Alex
444e77b7f6
BattleScript_BerryStatRaiseRet Ripen checks berry and cleanup (#6835) 2025-05-13 15:53:36 +02:00
ghoulslash
5ad8d852fd Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into expansion/ripenfix 2025-05-13 08:01:41 -04:00