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 |
|
AlexOn1ine
|
35dff24c9b
|
Master to upcoming merge
|
2025-05-15 20:37:27 +02:00 |
|
Pawkkie
|
0ea1ebe8de
|
Fix AI_FLAG_PREDICT_MOVES scoring bug (#6867)
|
2025-05-15 13:53:51 -04:00 |
|
Pawkkie
|
39022f3e6a
|
Fix FindMonThatAbsorbsOpponentsMove not seeing Mold Breaker or choice items (#6864)
|
2025-05-15 19:42:06 +02:00 |
|
Pawkkie
|
0cfcc7fb87
|
Add prediction function (#6858)
|
2025-05-15 11:55:26 -04: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
|
44d9b9c9e6
|
Further moveend changes (move blocks) (#6820)
|
2025-05-15 12:43:50 +02:00 |
|
Bassoonian
|
e42890e954
|
Consolidates a bunch of battle controller functions (#6838)
|
2025-05-15 11:26:18 +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 |
|
Martin Griffin
|
54e9505d2b
|
Warn on suspicious setvar usages
|
2025-05-15 09:42:59 +01:00 |
|
hedara90
|
9924ae3391
|
Make make clean work again (#6848)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-05-15 10:40:35 +02:00 |
|
Alex
|
34918f5f0d
|
Fixes wrongly usage of arguments without checking effect (#6859)
|
2025-05-15 10:39:31 +02:00 |
|
mudskipper13
|
ad0e98bb12
|
Prevent scaninc touching tests when make-ing non-test builds (#6812)
|
2025-05-15 10:15:22 +02:00 |
|
Jonathan Lin
|
b5fbced691
|
New animations for Mega Evolution, Primal Reversion, Ultra Burst, and Power Construct (#6834)
|
2025-05-15 09:40:02 +02:00 |
|
AlexOn1ine
|
243c43e6a4
|
Add prediction function
|
2025-05-15 08:10:19 +02:00 |
|
Pawkkie
|
d09a06561f
|
Move out ai structs out of BattleResources (#6741)
|
2025-05-14 18:11:22 -04:00 |
|
AlexOn1ine
|
56c9549bbe
|
fix test
|
2025-05-14 23:45:31 +02:00 |
|
AlexOn1ine
|
19e2bb82b5
|
clean up
|
2025-05-14 23:34:43 +02:00 |
|
AlexOn1ine
|
1a773a5916
|
conflicts
|
2025-05-14 23:21:33 +02:00 |
|
Eduardo Quezada
|
12bc5a10b7
|
Removed multiple instances of hardcoded move IDs (#6856)
|
2025-05-14 22:40:10 +02:00 |
|
GriffinR
|
929bc8b990
|
Merge branch 'master' of https://github.com/pret/pokeemerald into porymap-6
|
2025-05-14 11:50:11 -04:00 |
|
Eduardo Quezada
|
3ef61e6451
|
Combined type-enhancing hold effects (#6846)
|
2025-05-14 13:45:08 +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 |
|
Eduardo Quezada
|
face37e8f3
|
Battle TV expansion (#6826)
|
2025-05-13 15:54:54 +02: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 |
|
Alex
|
de79d6de48
|
Added IsOnPlayerSide (#6832)
|
2025-05-13 12:38:43 +02:00 |
|
Bassoonian
|
2394195123
|
Remove non-existent functions from header files (#6825)
|
2025-05-13 10:52:45 +02:00 |
|
Eduardo Quezada
|
e64d260f52
|
Added Ability TODO tests B (#6836)
|
2025-05-13 10:34:06 +02:00 |
|
Bassoonian
|
60587682e3
|
Remove redundant script declaration in battle_scripts.h (#6837)
|
2025-05-13 10:32:03 +02:00 |
|
ghoulslash
|
d4c64d3b67
|
rename berrystatraise script to consumablestatraise
|
2025-05-12 21:11:25 -04:00 |
|
ghoulslash
|
14a66d612f
|
combine BattleScript_BerryStatRaiseRet and BattleScript_BerryStatRaiseEnd2, check ripen popup doesn't trigger except on berries
|
2025-05-12 21:06:12 -04:00 |
|
Eduardo Quezada
|
5f0a853e74
|
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/isOnPlayerSide
|
2025-05-12 20:58:27 -04:00 |
|
Eduardo Quezada
|
3b6dbf38fd
|
Review changes
|
2025-05-12 20:53:14 -04:00 |
|
Alex
|
006abe097e
|
Add AI_FLAG_PREDICT_MOVES (#6551)
|
2025-05-12 23:10:10 +02:00 |
|
Alex
|
7f894ef5fb
|
Fixes a mistake made by me (#6828)
|
2025-05-12 20:08:00 +02:00 |
|
Eduardo Quezada
|
13071f7019
|
Added IsOnPlayerSide
|
2025-05-12 13:53:15 -04:00 |
|
Pawkkie
|
60666b1b13
|
rename to battlerAtk
|
2025-05-12 13:45:36 -04:00 |
|
Pawkkie
|
169d22b12c
|
Update src/battle_ai_main.c
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
|
2025-05-12 13:42:01 -04:00 |
|
Alex
|
a880cfe6d2
|
master to upcoming, 2025-05-12 (#6830)
|
2025-05-12 18:44:35 +02:00 |
|
Hedara
|
1abfa7acfa
|
Merge branch 'master' into master-upcoming
Conflicts:
include/battle.h
include/constants/battle_string_ids.h
src/battle_ai_util.c
src/battle_main.c
src/battle_util.c
test/battle/ai/ai.c
|
2025-05-12 18:21:35 +02:00 |
|
cawtds
|
be03feca94
|
Fixed double battles send out breaking (#6822)
|
2025-05-12 18:07:22 +02:00 |
|
hedara90
|
5f86fd7de6
|
Changed github CI to use arm-none-eabi-gcc (#6829)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-05-12 16:38:03 +01:00 |
|
PhallenTree
|
a6b02b00c0
|
Fixes restoretarget on empty stack when using G-Max Gravitas (#6827)
|
2025-05-12 15:16:40 +02:00 |
|