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 |
|
Alex
|
a086d5f592
|
Reverts wrongly done gem fix and renames struggle effect (#6806)
|
2025-05-15 10:45:48 +02:00 |
|
Alex
|
51b000860b
|
Add BattlerId enum and document (#2135)
|
2025-05-11 07:36:39 +01:00 |
|
spindrift64
|
f4f82f2394
|
Toxic Spikes print whether the target is poisoned or badly poisoned (#6814)
|
2025-05-10 22:55:28 +02:00 |
|
hedara90
|
b6b6e91959
|
A lot of tests (#6734)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-05-07 16:50:12 +02:00 |
|
hedara90
|
fe2d7442af
|
Remove old slide workaround (#6754)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-05-03 10:54:49 +02:00 |
|
PhallenTree
|
fadf472157
|
Adds RNG tags and tests for Moody and Starf Berry (#6718)
|
2025-05-01 10:16:15 +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 |
|
Hedara
|
4873589c65
|
Merge remote-tracking branch 'pret/master' into new-pret-merge
Conflicts:
asm/macros/battle_script.inc
data/battle_anim_scripts.s
include/battle.h
include/battle_controllers.h
include/battle_setup.h
include/constants/battle.h
src/battle_anim_normal.c
src/battle_anim_utility_funcs.c
src/battle_bg.c
src/battle_controllers.c
src/battle_main.c
src/battle_script_commands.c
|
2025-04-29 20:27:33 +02:00 |
|
Alex
|
86969f9919
|
Remove HitmarkerSwapAttackerTarget (#6627)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
|
2025-04-20 22:49:52 +02:00 |
|
GriffinR
|
709cfa1c9a
|
Merge pull request #2014 from Bassoonian/battleterrain
Rename battle terrain to environment
|
2025-04-13 19:32:06 -04:00 |
|
Bassoonian
|
d173e42372
|
Remove redundant AI defines (#6590)
|
2025-04-13 11:22:14 +02:00 |
|
Bassoonian
|
563e094ea8
|
Add clarification for EVO_SCRIPT_TRIGGER_DMG (#6579)
|
2025-04-12 12:56:30 -04:00 |
|
Hedara
|
3615fdde29
|
START OF 1.11.2 CYCLE
|
2025-03-30 14:56:39 +02:00 |
|
Hedara
|
e350bea168
|
Expansion 1.11.1 Release
|
2025-03-30 14:55:51 +02:00 |
|
Alex
|
23841f6322
|
Fix hit escape ace mon switching (#6498)
|
2025-03-29 19:34:37 +01:00 |
|
Alex
|
adf4928fe0
|
Fixes timesGotHit not increasing on forced switch out (#6493)
|
2025-03-29 19:33:50 +01:00 |
|
Pawkkie
|
1c0e5bb0e1
|
fix hit escape switching
|
2025-03-29 14:18:20 -04:00 |
|
Alex
|
79a2ec1ce2
|
Fixes Emergency Exit and Eject Pack (#6459)
|
2025-03-29 14:04:01 +01:00 |
|
Deokishisu
|
eaf7549854
|
Replace Incorrect Slow Stairs Movement with Correct One (#6275)
|
2025-03-16 14:51:36 -07:00 |
|
Alex
|
3def0e751b
|
Fixes crash damage move against absorbing abilities (#6361)
|
2025-03-09 20:54:58 +01:00 |
|
PhallenTree
|
e750dca08a
|
Reorder Dancer activation
|
2025-03-04 11:02:33 +00:00 |
|
Hedara
|
55bf368866
|
Merge branch 'upcoming' into upcoming-to-master-merge
|
2025-02-27 13:11:16 +01:00 |
|
Hedara
|
4f6733f45d
|
1.11.0 Release
|
2025-02-27 10:07:50 +01:00 |
|
Hedara
|
dfff36f643
|
1.10.3 Release
|
2025-02-27 09:59:22 +01:00 |
|
Hedara
|
06d31bc8ea
|
Merge branch 'master' into final-1.10-master-upcoming-merge
|
2025-02-26 22:07:10 +01:00 |
|
hedara90
|
cf43787d72
|
Added MOVE_TARGET_OPPONENT and added it to Me First, (#6336)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-02-25 22:28:22 +01:00 |
|
hedara90
|
c3962c2d3b
|
Shifted the follower graphicsIds (#6329)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-02-23 22:11:41 +01:00 |
|
hedara90
|
622a7f9a85
|
Refactor testing flags and vars to not conflict with user ones (#6301)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-02-22 15:32:39 +01:00 |
|
Eduardo Quezada
|
9c4fbbf274
|
Merge branch '_RHH/master' into _RHH/upcoming
|
2025-02-13 13:06:32 -03:00 |
|
Bassoonian
|
5aeeb3365f
|
Merrp merge (12th of February) (#6244)
|
2025-02-13 16:19:40 +01:00 |
|
Hedara
|
0da3e49889
|
Review comments
|
2025-02-13 10:36:52 +01:00 |
|
hedara90
|
9aea7c8e3a
|
Changed bit order for follower graphicsId creation (#6249)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-02-12 23:36:37 +01:00 |
|
Hedara
|
a859f40e37
|
Review comments
|
2025-02-12 14:31:42 +01:00 |
|
Hedara
|
7426a98dc5
|
Merge remote-tracking branch 'merrp/followers-expanded-id' into merrp-merge
|
2025-02-12 13:34:28 +01:00 |
|
Eduardo Quezada
|
3507862164
|
Merge branch '_RHH/master' into _RHH/upcoming
|
2025-02-12 09:30:59 -03:00 |
|
Ariel A
|
c8fb56d73b
|
Merge branch 'followers' into followers-expanded-id
|
2025-02-10 00:24:50 -05:00 |
|
Ariel A
|
ef05bbf394
|
Merge remote-tracking branch 'upstream/master' into followers
|
2025-02-10 00:11:38 -05:00 |
|
Pawkkie
|
579fa6410d
|
Switch chance config support (#6187)
|
2025-02-10 00:30:54 +01:00 |
|
Eduardo Quezada
|
99cb40d896
|
Added test support for 5 battle configs (#5914)
Co-authored-by: sbird <sbird@no.tld>
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
|
2025-02-09 22:29:23 +01:00 |
|
Eduardo Quezada
|
a2ad5d2ca3
|
Heal Bell/Aromatherapy/Sparkly Swirl improvements and fixes (#6210)
|
2025-02-09 21:54:03 +01:00 |
|
Zatsu
|
43bce41796
|
Add caught mon to full party by sending a different mon to the Box (#6058)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
|
2025-02-09 00:54:58 +01:00 |
|
Alex
|
de9e9af1b7
|
Fixes Spectral Thief stealing boost at the wrong time (#6197)
Co-authored-by: Pawkkie <61265402+Pawkkie@users.noreply.github.com>
|
2025-02-07 16:24:05 -05:00 |
|
Eduardo Quezada
|
e29e1c6ca7
|
Merge branch '_RHH/master' into _RHH/upcoming
|
2025-02-07 15:33:26 -03:00 |
|
Eduardo Quezada
|
b51598c14d
|
Removed Trainer Slides footgun (#6205)
|
2025-02-07 13:30:57 +01:00 |
|
Alex
|
765a12f520
|
Convert max effects to normal move effects (#6143)
|
2025-02-06 21:02:39 -03:00 |
|
hedara90
|
f9d1fdcf4c
|
Follower Object Event refactor (#6129)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-02-06 21:12:42 +01:00 |
|
Hedara
|
27da389d1e
|
Merge branch 'master' into master-to-upcoming
|
2025-02-06 13:05:02 +01:00 |
|
hedara90
|
cad1a37566
|
Tachyon Cutter and Salt Cure animations (#6182)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-02-05 15:27:21 +01:00 |
|