Jonathan Lin
|
b5fbced691
|
New animations for Mega Evolution, Primal Reversion, Ultra Burst, and Power Construct (#6834)
|
2025-05-15 09:40:02 +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 |
|
Alex
|
006abe097e
|
Add AI_FLAG_PREDICT_MOVES (#6551)
|
2025-05-12 23:10:10 +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 |
|
Alex
|
d00563d830
|
Changed White Herb hold effect name (#6815)
|
2025-05-11 11:34:47 +02:00 |
|
Alex
|
51b000860b
|
Add BattlerId enum and document (#2135)
CI / build (push) Has been cancelled
|
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 |
|
Alex
|
4342bfb91d
|
Refactor stockpile resets (#6810)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
|
2025-05-10 20:09:38 +02:00 |
|
Pawkkie
|
c7ee329433
|
Full functionality
|
2025-05-08 16:45:10 -04:00 |
|
Pawkkie
|
1e57670b34
|
Merge remote-tracking branch 'upstream/upcoming' into move-prediction
|
2025-05-08 13:58:18 -04:00 |
|
hedara90
|
b6b6e91959
|
A lot of tests (#6734)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-05-07 16:50:12 +02:00 |
|
Alex
|
6fe5f6530a
|
General MoveEnd clean up and Fell Stinger adjustments (#6674)
|
2025-05-07 00:30:43 +02:00 |
|
Pawkkie
|
3f5335c4ba
|
Refactor AI flags to u64 (#6753)
Co-authored-by: DizzyEggg
|
2025-05-04 17:16:34 +02:00 |
|
Eduardo Quezada
|
96650ffd27
|
Add "Move Item" option in party menu (#6758)
|
2025-05-04 11:40:31 +02:00 |
|
hedara90
|
fe2d7442af
|
Remove old slide workaround (#6754)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-05-03 10:54:49 +02:00 |
|
AlexOn1ine
|
40bf9ae087
|
conflicts
|
2025-05-03 10:26:07 +02:00 |
|
Bivurnum
|
668cd7e413
|
Rename follower npc macros for better specificity and to match documentation (#6742)
|
2025-05-02 21:08:42 +02:00 |
|
hedara90
|
ccda2308a3
|
Add AI_FLAG_PP_STALL_PREVENTION (#6743)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-05-02 11:30:09 -04:00 |
|
PhallenTree
|
fadf472157
|
Adds RNG tags and tests for Moody and Starf Berry (#6718)
|
2025-05-01 10:16:15 +02:00 |
|
Alex
|
4ff2f3de42
|
Centralizes non volatile status effect checks (#6533)
Co-authored-by: PhallenTree <168426989+PhallenTree@users.noreply.github.com>
|
2025-04-30 11:34:19 -04:00 |
|
Hedara
|
0eeba00d1b
|
Merge branch 'master' into master-upcoming-2025-04-30
Conflicts:
include/battle.h
include/constants/expansion.h
include/graphics.h
src/battle_bg.c
src/battle_util.c
src/data/graphics/battle_terrain.h
src/data/graphics/pokemon.h
src/pokeblock_feed.c
src/pokemon_sprite_visualizer.c
|
2025-04-30 15:22:37 +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 |
|
Pawkkie
|
4970b3bd95
|
Merge remote-tracking branch 'upstream/upcoming' into move-prediction
|
2025-04-28 00:33:42 -04:00 |
|
Bivurnum
|
47723c34e5
|
Follower NPCs (follow-me) (#6500)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
|
2025-04-27 14:56:18 +02:00 |
|
khbsd
|
971a595e4a
|
Evolution Refactor (#6556)
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
|
2025-04-23 16:01:33 +02:00 |
|
Alex
|
d3fe5c4640
|
Some Me First tests plus minor clean up (#6678)
|
2025-04-23 12:18:57 +02:00 |
|
Alex
|
dfb1cd2ec0
|
Refactor hit escape moves to use moveend (#6671)
|
2025-04-21 22:52:55 +02:00 |
|
AlexOn1ine
|
e2e012c3a9
|
conflicts
|
2025-04-21 15:50:57 +02:00 |
|
Alex
|
86969f9919
|
Remove HitmarkerSwapAttackerTarget (#6627)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
|
2025-04-20 22:49:52 +02:00 |
|
AlexOn1ine
|
fd0766c7fa
|
17-04-25-master-merge
|
2025-04-17 14:14:37 +02:00 |
|
Bassoonian
|
1c3d346d4f
|
Make form change methods into enum + type checking (#6631)
|
2025-04-16 23:45:41 +02:00 |
|
Bassoonian
|
cca969b04d
|
Adds move effect type checking (#6618)
|
2025-04-16 00:08:57 +02:00 |
|
GriffinR
|
709cfa1c9a
|
Merge pull request #2014 from Bassoonian/battleterrain
CI / build (push) Waiting to run
Rename battle terrain to environment
|
2025-04-13 19:32:06 -04:00 |
|
Bassoonian
|
6a70f4f390
|
Turn battle string ids into enums (#6594)
|
2025-04-13 16:12:30 +02:00 |
|
Bassoonian
|
d173e42372
|
Remove redundant AI defines (#6590)
|
2025-04-13 11:22:14 +02:00 |
|
Pawkkie
|
540744024d
|
"Aerilate"-esque Ability Tests and Config (#6313)
|
2025-04-12 14:48:58 -04:00 |
|
Bassoonian
|
563e094ea8
|
Add clarification for EVO_SCRIPT_TRIGGER_DMG (#6579)
|
2025-04-12 12:56:30 -04:00 |
|
Hedara
|
9afd8800f3
|
Merge branch 'upcoming' into merrps-dns
|
2025-04-12 16:33:02 +02:00 |
|
Hedara
|
301ef288f5
|
Review comments
|
2025-04-11 11:37:36 +02:00 |
|
Alex
|
4aca2fdcd3
|
Refactor fixed damage moves (#6449)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
|
2025-04-10 15:01:02 +02:00 |
|
psf
|
17d851e1f9
|
Add B_RUN_TRAINER_BATTLE - players can run from Trainer Battles (#6456)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
|
2025-04-10 14:59:58 +02:00 |
|
Hedara
|
e419606a10
|
Merge branch 'upcoming' into merrps-dns
|
2025-04-09 12:48:18 +02:00 |
|
Alex
|
f364cf9e71
|
Alcremie Evolution clean up follow up (#6557)
|
2025-04-09 11:18:07 +02:00 |
|
Hedara
|
08a2ad2c98
|
Merge branch 'upcoming' into merrps-dns
|
2025-04-09 10:01:51 +02:00 |
|
Eduardo Quezada
|
2b417bfeed
|
Implemented Alcremie Evolution Method (#6530)
Co-authored-by: khbsd <khb.dev@gmail.com>
|
2025-04-08 19:50:21 +02:00 |
|
psf
|
69f2f9f151
|
Add OW_DEFOG_FIELD_MOVE to allow players to clear overworld Fog (#6477)
|
2025-04-08 16:21:32 +02:00 |
|
Pawkkie
|
d7a6e0bea8
|
Initialize move scores
|
2025-04-07 23:22:01 -04:00 |
|
SundayMoonday
|
bbe8bbc45b
|
Replaced Blue Sky background for Rock Field (#6516)
|
2025-04-07 11:04:21 +02:00 |
|
Alex
|
c1f18d0765
|
Refactor protect to allow at least 126 different types of protect eff… (#6506)
|
2025-04-02 17:26:05 +02:00 |
|
Alex
|
ae62c80d0f
|
Refactors faint target abilities and adds Battle Bond config (#6519)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
|
2025-04-02 16:00:23 +02:00 |
|
AlexOn1ine
|
ccebebf64f
|
31-03-25 Master merge
|
2025-03-31 18:23:46 +02: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 |
|
AlexOn1ine
|
3c632b8b44
|
19-03-25 master to upcoming merge
|
2025-03-19 17:12:47 +01:00 |
|
wiz1989
|
1e2aa18ffe
|
Added Dynamax/Gigantamax battle messages (#6440)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
|
2025-03-17 19:16:43 +01:00 |
|
Deokishisu
|
eaf7549854
|
Replace Incorrect Slow Stairs Movement with Correct One (#6275)
|
2025-03-16 14:51:36 -07:00 |
|
Alex
|
5965c08326
|
Create move end Sheer Force (#6411)
|
2025-03-14 20:11:42 +01:00 |
|
Alex
|
7df3298534
|
Minor Recoil Effect refactor (#6409)
|
2025-03-14 12:43:45 +01:00 |
|
Alex
|
3def0e751b
|
Fixes crash damage move against absorbing abilities (#6361)
|
2025-03-09 20:54:58 +01:00 |
|
AlexOn1ine
|
ba3ebc70d5
|
Merge remote-tracking branch 'rhh/master' into 06-03-25-Merge
|
2025-03-06 18:08:55 +01:00 |
|
PhallenTree
|
e750dca08a
|
Reorder Dancer activation
|
2025-03-04 11:02:33 +00:00 |
|
Eduardo Quezada
|
2b3589b44f
|
Moved Pokémon Jump types to gSpeciesInfo (#5602)
|
2025-02-27 07:46:14 -08:00 |
|
Hedara
|
8df457452a
|
Start of 1.12 cycle
|
2025-02-27 14:34:58 +01: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 |
|
Eduardo Quezada
|
1895e6263b
|
Applied a proper fix to blending
|
2025-02-23 16:44:05 -03: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
|
2428af66cd
|
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2
|
2025-02-20 19:17:59 -03: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
|
a4e032c28d
|
Merge branch 'followers' into lighting
|
2025-02-10 00:19:48 -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 |
|