16667 Commits

Author SHA1 Message Date
Bassoonian
5aeeb3365f
Merrp merge (12th of February) (#6244) 2025-02-13 16:19:40 +01:00
Bassoonian
35324497a6
Update src/event_object_movement.c 2025-02-13 13:35:38 +01:00
Hedara
ddc7877a94 Merge branch 'merrp-merge' of github.com:hedara90/pokeemerald-expansion into merrp-merge 2025-02-13 10:37:00 +01:00
Hedara
0da3e49889 Review comments 2025-02-13 10:36:52 +01:00
hedara90
7d1bbf62e1
Apply suggestions from code review
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-02-13 10:23:06 +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
hedara90
f20aebf878
Fixed multi battle forced switches (#6243)
Co-authored-by: Hedara <hedara90@gmail.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-02-12 21:57:51 +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
860c2f6cbc
Remove whitespace from trainers data file (#6234) 2025-02-12 00:27:33 +01:00
Alex
72de12609c
Fixes BATTLER_TURN_DAMAGED battler id (#6236) 2025-02-11 16:18:00 -03:00
Bassoonian
27f0fb068e
Pret merge (11th of February) (#6231) 2025-02-11 13:21:44 +01:00
Hedara
e0e73983c7 Merge remote-tracking branch 'pret/master' into pret-merge-2025-02-11 2025-02-11 11:20:37 +01:00
明雅
846fe64789
Try a new solution to Fix Safari #6206 (#6228) 2025-02-10 15:55:57 +01: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
PhallenTree
cf5b95cee8
Fixes Expanding Force and Spectral Thief move animations (#6185) 2025-02-09 22:34:48 +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
d510a3957d
Fixed Future Sight not being affected by Electrify (#6213) 2025-02-09 21:57:29 +01:00
Eduardo Quezada
d3417b00a2
Fixed compilation error when turning P_GENDER_DIFFERENCES off (#6223) 2025-02-09 15:37:56 +01:00
明雅
d45a6487ab
Fix Using a Safari Ball crashes the game #6206 (#6220) 2025-02-09 09:50:01 -03: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
Bassoonian
82b0eff16c
Fix typo in Nuzzle's description (#6209) 2025-02-07 15:26:16 -03:00
ghoulslash
96ee24c726
Minor Terrain Seed Test Improvement (#6207)
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2025-02-07 16:40:10 +01:00
hedara90
58eb635499
Follower Object Event refactor (#6129)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-02-06 21:20:38 +01:00
hedara90
f9d1fdcf4c
Follower Object Event refactor (#6129)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-02-06 21:12:42 +01:00
ghoulslash
3ba4e3c0c7
Sheer Force Test Fixes (#6198)
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2025-02-06 20:17:57 +01:00
hedara90
f6d1773e51
Fixed Unnerve message and wrote tests (#6192)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-02-05 22:29:13 +01:00
hedara90
ea3b81218b
Wrote tests for Electrify (#6179)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-02-04 12:37:42 -05:00
ghoulslash
b4fc611d5f
Cleanup some global battler ID usage (#6181)
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2025-02-04 18:08:32 +01:00
PhallenTree
5238665a7a
Fixes Suction Cups ability popup and Red Card + Guard Dog interaction (#6171) 2025-02-03 18:31:14 +01:00
Eduardo Quezada
fe41f9eaf5
Fixed non-regional forms breeding incorrectly (#4985) 2025-02-03 17:03:29 +01:00
moostoet
ddff2def40
Prevent sameMoveTurns from incrementing when unable to use move (#6167) 2025-02-02 22:11:25 +01:00
Bassoonian
a0097ef395
Add Poltchageist family form data (#6163) 2025-02-01 17:46:59 -03:00
Eduardo Quezada
7c6eda21b1
Added missing in-battle "Move Info" button prompt (#6155) 2025-02-01 18:47:36 +01:00
hedara90
8bb52b5727
Water Compaction tests (#6159)
Co-authored-by: Hedara <hedara90@gmail.com>
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
2025-02-01 13:34:17 -03:00
hedara90
1c821c2ff7
Tests for Big Pecks (#6158)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-02-01 10:35:11 -03:00
Alex
97d8bd2646
Fixes Dragon Tail missing timing against Rocky Helmet / Iron Barbs (#6154) 2025-01-31 22:02:26 +01:00
Alex
c5c22a0005
Fixes Dynamic Moves types in SumScreen while in Battle (#6145) 2025-01-31 21:50:26 +01:00
Alex
89cfd85b8f
Fixes battler mutation during the intim script (#6151)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-01-31 21:49:26 +01: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
Ariel A
bc421740e8 fix: fixed compilation error when OW_GFX_COMPRESS is FALSE 2025-01-29 23:12:45 -05:00
hedara90
d0bd82452f
Added some TO_DO tests (#6140)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-01-29 21:13:53 -03:00
shachar700
95aa41f0d4
Fixed switchout bug in multibattle where order of mons gets messed up (#2099) 2025-01-29 07:43:13 +00:00
lordraindance2
392a16651b
Implemented clear animation for also overworld pokemon (#5825) 2025-01-28 20:04:16 -03:00
bassforte123
72edeeffad
Update pokemon.h with nature comments (#6133) 2025-01-28 21:37:02 +01:00
Alex
49cbebd212
Remove formToChangeInto (Unused) (#6137) 2025-01-28 17:11:11 -03:00
hedara90
4041af0b05
Removed stray semi-colon in AI code (#6134)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-01-28 19:14:12 +01:00