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 |
|
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 |
|
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 |
|
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 |
|
hedara90
|
2bc82a886a
|
Add AUTO_GEN_TARGETS for .party files and map_groups_count, but on master (#6824)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-05-11 22:37:11 +02:00 |
|
Alex
|
0ad3f929ab
|
Fixes Berserk Gene infinite loop (#6813)
|
2025-05-11 11:34:16 +02:00 |
|
spindrift64
|
f4f82f2394
|
Toxic Spikes print whether the target is poisoned or badly poisoned (#6814)
|
2025-05-10 22:55:28 +02:00 |
|
Alex
|
8d5d7c7fca
|
Fixes ai moves being recorded without correct index (#6803)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
|
2025-05-10 19:38:48 +02:00 |
|
spindrift64
|
3b91a964c9
|
Fix Iron Ball type effectiveness check (#6794)
|
2025-05-09 22:23:44 +02:00 |
|
Alex
|
2044bea883
|
Rename battlerId to battler for consistency (#2126)
|
2025-05-09 12:43:23 +01:00 |
|
spindrift64
|
5e190d0782
|
Fix gems activating for moves that don't deal type damage (#6789)
|
2025-05-08 20:17:32 +02:00 |
|
i0brendan0
|
8cc289ef35
|
Fix rerolls overwriting Fixed Personality (#6774)
|
2025-05-08 11:28:00 +02:00 |
|
hedara90
|
b6b6e91959
|
A lot of tests (#6734)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-05-07 16:50:12 +02:00 |
|
Alex
|
7c4fb512a1
|
Fixes Symbiosis not triggering when a weakness berry was consumed (#6782)
|
2025-05-07 11:04:11 +02:00 |
|
Martin Griffin
|
384b8f127e
|
Merge pull request #2132 from AsparagusEduardo/_pret/pr/respectMonPicOffsets
`InitSpritePosToAnimAttacker` documentation
|
2025-05-07 07:02:14 +01:00 |
|
Eduardo Quezada
|
15e39339b9
|
InitSpritePosToAnimAttacker documentation
|
2025-05-06 15:11:38 -04:00 |
|
Alex
|
4e7b1f2a97
|
Fixes Stomping Tantrum not boosting damage when missed due to Accuracy (#6762)
|
2025-05-06 12:07:01 +02:00 |
|
GriffinR
|
c39ef1a030
|
Merge pull request #2125 from DavidJCobb/battle-link-re
Battle link reverse-engineering
|
2025-05-05 18:17:28 -04:00 |
|
spindrift64
|
0742741dd3
|
Fix Life Orb inflicting self damage when using status moves (#6767) (#6773)
|
2025-05-04 22:26:12 +02:00 |
|
PCG
|
904b399a81
|
Added Egg Moves for Basculin White Striped (#6769)
|
2025-05-04 11:43:57 +02:00 |
|
hedara90
|
fe2d7442af
|
Remove old slide workaround (#6754)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-05-03 10:54:49 +02:00 |
|
Alex
|
9259b7ee69
|
Bugfixes batch (#6750)
|
2025-05-02 20:14:27 +02:00 |
|
Pawkkie
|
1f5d949013
|
Pret merge (2nd of May 2025) (#6752)
|
2025-05-02 12:14:39 -04:00 |
|
GriffinR
|
263026e432
|
Merge pull request #2128 from DavidJCobb/re-battle-weather-anims
Identified task and sprite fields related to battle weather animations
|
2025-05-02 11:33:04 -04:00 |
|
Hedara
|
4fa48b6e89
|
Merge remote-tracking branch 'pret/master' into pret-merge-2025-05-02
|
2025-05-02 17:29:41 +02:00 |
|
GriffinR
|
5a036aedcf
|
Merge pull request #2131 from hedara90/fix-mapson-g++-include
Added missing include due to g++ changes
|
2025-05-02 11:28:12 -04:00 |
|
Hedara
|
c8d3a6b4df
|
Added missing include due to g++ changes
|
2025-05-02 16:03:55 +02:00 |
|
DavidJCobb
|
0f17e70371
|
Shorter names for engine/controller communication enum members
|
2025-05-02 00:01:15 -04:00 |
|
DavidJCobb
|
d83b0671f7
|
Battle anims, ice: ARRAY_COUNT works if used with a cast
|
2025-05-01 23:49:05 -04:00 |
|
PhallenTree
|
fadf472157
|
Adds RNG tags and tests for Moody and Starf Berry (#6718)
|
2025-05-01 10:16:15 +02:00 |
|
Eduardo Quezada
|
d2a4b5ef84
|
Changed Tackle for Scratch in tests (#6730)
|
2025-04-30 17:18:52 -04:00 |
|
hedara90
|
66a5ad5258
|
Updated label workflow (#6729)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-04-30 14:01:45 +02:00 |
|
Cafe
|
b451bc3606
|
New Lurantis animation (#6725)
|
2025-04-30 12:45:29 +02:00 |
|
hedara90
|
8fc62f293d
|
Release 1.11.2 (#6728)
|
2025-04-30 12:01:58 +02:00 |
|
Hedara
|
f0ecbce9c7
|
Start of 1.11.3 Cycle
|
2025-04-30 11:26:09 +02:00 |
|
Hedara
|
accb85554a
|
Expansion 1.11.2 Release
|
2025-04-30 11:23:05 +02:00 |
|
Alex
|
afcba8d9cd
|
Fixes Stomping Tantrum not doubling power if asleep or frozen (#6719)
|
2025-04-29 23:25:56 +02:00 |
|