Commit Graph

3289 Commits

Author SHA1 Message Date
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
GriffinR
cdadd7d2ed Generate heal location constants automatically, move data back to a single file. 2025-02-03 20:25:11 -05:00
Eduardo Quezada
fe41f9eaf5
Fixed non-regional forms breeding incorrectly (#4985) 2025-02-03 17:03:29 +01:00
Eduardo Quezada
64c5113b23 Merge branch '_RHH/master' into _RHH/upcoming 2025-02-02 14:18:13 -03:00
Alex
f8c2e860d7
Remove unused PainSplit scripting global (#6164) 2025-02-02 14:50:39 +01:00
Alex
97d8bd2646
Fixes Dragon Tail missing timing against Rocky Helmet / Iron Barbs (#6154) 2025-01-31 22:02:26 +01:00
Eduardo Quezada
ee1b75614d Merge branch '_RHH/master' into _RHH/upcoming 2025-01-30 22:46:06 -03:00
Eduardo Quezada
1c3cabb52a Fix typo 2025-01-30 18:46:06 -03:00
Eduardo Quezada
370cfd5bb4 Begin 1.10.3 cycle 2025-01-30 18:40:03 -03:00
Eduardo Quezada
397e98b954
Version 1.10.2 (#6144) 2025-01-30 18:38:28 -03:00
bassforte123
72edeeffad
Update pokemon.h with nature comments (#6133) 2025-01-28 21:37:02 +01:00
Eduardo Quezada
927bb8f833
Fixed AI not handling type effectiveness beyond x8 (#6127) 2025-01-28 19:16:10 +01:00
Eduardo Quezada
00241cf569 Merge remote-tracking branch '_merrp_origin/lighting-expanded-id' into _RHH/pr/upcoming/lighting-expansion-v2
# Conflicts:
#	README.md
#	asm/macros/event.inc
#	data/scripts/pkmn_center_nurse.inc
#	include/constants/event_objects.h
#	include/constants/field_weather.h
#	include/overworld.h
#	include/palette.h
#	include/sprite.h
#	src/battle_controller_player.c
#	src/data/object_events/object_event_graphics.h
#	src/event_object_movement.c
#	src/field_effect_helpers.c
#	src/field_weather.c
#	src/overworld.c
#	src/palette.c
#	src/scrcmd.c
#	src/sprite.c
2025-01-26 12:08:10 -03:00
hedara90
e1e3bcfa91
Tera starstorm (#6073)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-01-26 11:08:46 +01:00
Ariel A
c1d105c31c Merge branch 'lighting' into lighting-expanded-id 2025-01-25 21:45:23 -05:00
Ariel A
bc034aaf73 Merge branch 'followers-expanded-id' into lighting-expanded-id 2025-01-25 21:42:02 -05:00
Pawkkie
43e41bbed8
Add Code Entry functionality (#5951) 2025-01-25 22:03:08 +01:00
Salem
01e8d8233e
Trainer Battle Parameter Consolidation (#5982) 2025-01-25 22:02:39 +01:00
Eduardo Quezada
26daf15ce0 Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2 2025-01-24 18:29:28 -03:00
psf
b109aa0c92
Cleaned up Trainer Slides, added automated Trainer Slide tests, add new Enemy Critical Hit Slide (#6018) 2025-01-23 16:28:33 +01:00
Bassoonian
a1c47a931f
Revert "Converts a bunch of defines to enums" (#6082) 2025-01-22 21:50:39 +01:00
hedara90
2a8f4b03dc
Revert "Revert map related enum conversion" (#6079) 2025-01-22 21:25:24 +01:00
hedara90
2b9c5fe4e7
Revert map related enum conversion (#6078)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-01-22 19:37:56 +01:00
Pawkkie
3c5bd4d16c
Return the universe to a state of balanced quilibrium (#6074) 2025-01-21 18:25:15 -05:00
Eduardo Quezada
ed505cfb5f Merge branch '_RHH/master' into _RHH/upcoming 2025-01-21 19:32:51 -03:00
Alex
b2f2a8c9fb
Fixes Rapid Spin / Toxic Debris interaction (#6023)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-01-21 21:43:54 +01:00
Bassoonian
a3ce3a569d
Converts a bunch of defines to enums (#6071) 2025-01-21 21:19:41 +01:00
Pawkkie
7d39dd4aae
Add AI_FLAG_PREDICT_INCOMING_MON: AI will score against predicted switchin if predicting switch (#6037) 2025-01-20 20:54:38 +01:00
khbsd
52666fb545
IV/EV Info on Summary Screen (#6027) 2025-01-20 09:41:31 +01:00
Eduardo Quezada
a756bb501c Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2 2025-01-19 22:31:33 -03:00
Eduardo Quezada
f6a86a65ef Merge branch '_RHH/master' into _RHH/upcoming 2025-01-19 10:32:57 -03:00
Eduardo Quezada
cd1482bbaa
Expanded Pokémon Follower transformation functionality (#5048) 2025-01-18 23:19:06 +01:00
Alex
9ed3b176f0
Pret merge (17 of January) (#6045) 2025-01-18 19:53:29 +01:00
Bassoonian
199760a6d3
Add known failing learnset cap test (#6046) 2025-01-17 21:04:46 -05:00
Eduardo Quezada
937b3106b4 Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2 2025-01-17 19:33:48 -03:00
Eduardo Quezada
6162628104 A bit more of addressing 2025-01-17 19:25:29 -03:00
Eduardo Quezada
ffc8903f93 More review addressing 2025-01-17 18:47:38 -03:00
Bassoonian
bcf9a1eff8 Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge17jan 2025-01-17 21:57:25 +01:00
GriffinR
2f67b17571
Document bard music (#2053)
* Missing bard song limit constants
* Index bard sound arrays with word constants
* Document bard music
2025-01-17 17:54:38 +00:00
moostoet
3b19f6972b
Rename Furfrou Species tags to match Pokemon Showdown exports (#6041) 2025-01-17 14:39:52 -03:00
Pawkkie
465d30fbd0
Add AI_FLAG_PREDICT_SWITCH (#6028) 2025-01-16 21:43:16 +01:00
Pawkkie
e8dd8da5f7
Add AI_FLAG_PREFER_HIGHEST_DAMAGE_MOVE (#6025)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-01-14 14:13:48 -05:00
DizzyEggg
f15d89893e
Allow Party Menu with 0 Pokemon (#5997) 2025-01-11 12:14:31 +01:00
Eduardo Quezada
8821779815 Merge branch '_RHH/master' into _RHH/upcoming 2025-01-11 08:07:15 -03:00
Eduardo Quezada
21bc5cfd30
Debug menu and createmon additions/cleanup (#5994) 2025-01-11 10:07:47 +01:00
Eduardo Quezada
0fefb444de
Multiple removals of hardcoded move IDs (#5964) 2025-01-10 17:07:32 -05:00
Pawkkie
b5f539ed21
Rename AI_FLAG_PREFER_STRONGEST_MOVE (#5972) 2025-01-08 14:00:20 +01:00
shachar700
a0e8753083
Update vars.h (cleanup)
Removed an extra are
2025-01-06 22:17:24 +02:00
Eduardo Quezada
40ba25dd3e
Converted 2 various to callnative (#5950) 2025-01-05 17:47:49 +01:00
psf
a7f77ed08d
Adds B_VAR_DIFFICULTY and related functions READ DESC (#5337)
Co-authored-by: sbird <sbird@no.tld>
Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com>
Co-authored-by: Martin Griffin <martinrgriffin@gmail.com>
Co-authored-by: hedara90 <90hedara@gmail.com>
2025-01-04 14:25:03 +01:00
ghoulslash
03684c6539
Battle Weather Refactor (#5833) 2025-01-04 07:33:25 -05:00
Eduardo Quezada
89f90e1f69 Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2 2025-01-03 13:58:10 -03:00
ghoulslash
d8ea4fa1ec Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into rhh/dexnav 2025-01-02 08:28:21 -05:00
Eduardo Quezada
a50c78bb1e Merge branch '_RHH/master' into _RHH/upcoming 2025-01-01 18:34:42 -03:00
Eduardo Quezada
9669a0554d
Encapsulate move data (#5852) 2025-01-01 20:34:33 +01:00
Eduardo Quezada
e040dcb0b4 Begin 1.10.2 cycle 2025-01-01 16:20:40 -03:00
Eduardo Quezada
89699939de Version 1.10.1 2025-01-01 16:17:49 -03:00
Ariel A
a6ef9c7577 Merge branch 'followers' into followers-expanded-id 2025-01-01 00:39:14 -05:00
Ariel A
a515cb3c6b Merge branch 'followers' into lighting 2025-01-01 00:37:09 -05:00
Eduardo Quezada
004efd1e5a Merge branch '_RHH/master' into _RHH/upcoming 2024-12-31 18:38:03 -03:00
Ariel A
3fffb9fac6 feat: added configuration to restrict following pokemon. Closes #42 2024-12-30 21:38:18 -05:00
Bassoonian
bf125c8f5e
Fix wrong value for NUM_MOVE_EFFECTS (#5913) 2024-12-30 23:51:48 +01:00
Alex
af19b13195
Adds Pledge Side Statuses as Starting Statuses (#5899) 2024-12-30 09:18:23 +01:00
Eduardo Quezada
009de5c98c
Setting Battle configs during tests (#5803)
Co-authored-by: sbird <sbird@no.tld>
2024-12-29 23:28:39 +01:00
AlexOn1ine
74f1d7cb80 merge rhh/upcomig 2024-12-28 21:03:34 +01:00
AlexOn1ine
6a906a3fc1 refactor done 2024-12-28 20:55:59 +01:00
Eduardo Quezada
3bc4126558 Merge branch '_RHH/master' into _RHH/upcoming 2024-12-28 15:28:07 -03:00
AlexOn1ine
0bb86e4437 struct 2024-12-28 10:23:28 +01:00
Eduardo Quezada
50d325f081
Slight contest documentation (#2078)
Some checks failed
CI / build (push) Has been cancelled
2024-12-27 11:09:33 -05:00
AlexOn1ine
9c34634dd6 Draft Change 2024-12-25 11:03:32 +01:00
Eduardo Quezada
f9fed98665
Fixed MOVE_EFFECT_FREEZE_OR_FROSTBITE not being usable in battle scripts (#5859) 2024-12-22 23:39:48 +01:00
Bassoonian
5560f339d0
Remove unused various (#5851) 2024-12-21 20:26:46 -03:00
Alex
f61a0f6a30
Sheer Force fix and move effect cleanup (#5812) 2024-12-21 19:45:50 +01:00
Eduardo Quezada
1e6628b78d Address Review comments Pt2 2024-12-21 10:49:59 -03:00
Eduardo Quezada
e175c5aca8
Changes Various defines to an Enum (#5840)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-12-21 11:48:31 +01:00
AlexOn1ine
573200d56a nobody saw anything but again 2024-12-21 11:23:30 +01:00
AlexOn1ine
ff4c2aaf78 nobody saw anything 2024-12-21 10:24:34 +01:00
AlexOn1ine
71318eca5f Revert weather order 2024-12-21 10:04:16 +01:00
AlexOn1ine
2c419ccb57 review comments 2024-12-20 22:43:05 +01:00
Eduardo Quezada
05f300f6cc Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2 2024-12-20 15:22:14 -03:00
Alex
f27bf843cb
Changes Various defines to an Enum (#5839) 2024-12-20 10:49:40 +01:00
AlexOn1ine
eb4427db94 primal weather fix 2024-12-19 21:41:32 +01:00
AlexOn1ine
99fef0260f Battle Weather Refactor 2024-12-19 20:50:08 +01:00
Alex
4bff9f8ee9
Fixes simu hp reduction when no partner was on field (#5799) 2024-12-10 21:48:31 +01:00
GriffinR
dbff8c4360
Merge branch 'porymap-6' into generate-map-constants 2024-12-09 20:25:41 -05:00
Eduardo Quezada
66a2a16bbc Merge branch '_RHH/master' into _RHH/upcoming 2024-12-08 12:00:29 -03:00
hedara90
54d372162f
Added NBSP and up+down arrows to all fonts (#5767)
Co-authored-by: Hedara <hedara90@gmail.com>
2024-12-07 07:26:23 -03:00
PhallenTree
775ea3b564
Pursuit refactor (#5707) 2024-12-06 19:14:46 +01:00
Eduardo Quezada
720b2daecc Improve Pyramid location documentaion 2024-12-05 18:25:27 -03:00
Eduardo Quezada
458bd5ad4d Review changes pt 1 2024-12-05 07:56:49 -03:00
Eduardo Quezada
d151e00c70 Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2 2024-12-04 19:15:48 -03:00
Eduardo Quezada
68b5b63ecb Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/hp_reduction 2024-12-04 12:04:47 -03:00
Eduardo Quezada
e4f8b4ccf0 Addressed review changes (minus encapsulation) 2024-12-04 11:31:28 -03:00
Pawkkie
c8b0da2493
Add AI_FLAG_WEIGH_ABILITY_PREDICTION (#5636) 2024-12-03 12:28:22 +01:00
AlexOn1ine
d95dbadccc merge rhh/upcoming 2024-12-02 19:00:55 +01:00
Eduardo Quezada
7ac7ab8f6f Merge branch '_RHH/master' into _RHH/upcoming 2024-12-02 13:49:43 -03:00
AlexOn1ine
09c9d8a800 merge rhh/upcoming 2024-12-02 17:45:00 +01:00
Pawkkie
2b7905beb1
Add B_FLAG_SLEEP_CLAUSE (#5566)
Co-authored-by: Isaac Rivera <isaacrivera2020@u.northwestern.edu>
Co-authored-by: iriv24 <40581123+iriv24@users.noreply.github.com>
Co-authored-by: Hedara <hedara90@gmail.com>
2024-12-02 09:06:03 +01:00
Eduardo Quezada
0322d51887
Split "Do nothing" move effects (#5613) 2024-12-02 09:05:04 +01:00
Eduardo Quezada
4635f0e0f8
Converted Stance Change to proper Form Change + Tests (#5749) 2024-12-01 22:36:25 +01:00
Eduardo Quezada
00cb7b36e1 Actually start 1.11.0 cycle 2024-12-01 15:36:39 -03:00