Alex
|
2b2d703c8a
|
Fixes Static Assert from pr #6174 (#6258)
|
2025-02-13 19:31:50 +01:00 |
|
Frank DeBlasio
|
d1b2b045d0
|
Moved sValidApprenticeMove into gMovesInfo (#6254)
|
2025-02-13 14:58:12 -03:00 |
|
moostoet
|
a42de40eb2
|
Add function to adjust AI scoring for generalized item effects (#6247)
|
2025-02-13 12:51:25 -05:00 |
|
Eduardo Quezada
|
9c4fbbf274
|
Merge branch '_RHH/master' into _RHH/upcoming
|
2025-02-13 13:06:32 -03:00 |
|
Pawkkie
|
f851fb536a
|
Improve Yawn and Status Switching (#6202)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
|
2025-02-13 17:34:40 +01:00 |
|
Alex
|
8448e745ea
|
Adds a follower flag define to disable followers on the fly (#6174)
|
2025-02-13 17:33:59 +01:00 |
|
Alex
|
0438b66f63
|
Minor Clean up for CanAbilityX. Follow up for #6183 (#6252)
|
2025-02-13 17:33:21 +01:00 |
|
Eduardo Quezada
|
845679471f
|
Added missing Dream Eater and Reflect Type tests (#6245)
|
2025-02-13 17:32:08 +01:00 |
|
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 |
|
Zatsu
|
4f3326f3f4
|
fix for battle ui for add to party menu (#6229) (#6240)
|
2025-02-12 22:02:25 +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 |
|
Frank DeBlasio
|
0f0c8325c5
|
Replaced hardcoded numbers in DexNav with variables (#6241)
|
2025-02-12 09:44:45 -03: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 |
|
Eduardo Quezada
|
860c2f6cbc
|
Remove whitespace from trainers data file (#6234)
|
2025-02-12 00:27:33 +01:00 |
|
Alex
|
075cd4e924
|
Revert unintentional change (#6239)
|
2025-02-12 00:27:00 +01:00 |
|
Alex
|
72de12609c
|
Fixes BATTLER_TURN_DAMAGED battler id (#6236)
|
2025-02-11 16:18:00 -03:00 |
|
Alex
|
cc9ca81c29
|
Add abstraction layer for battler positions (#6212)
|
2025-02-11 11:32:34 -05: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 |
|
Pawkkie
|
579fa6410d
|
Switch chance config support (#6187)
|
2025-02-10 00:30:54 +01:00 |
|
hedara90
|
174bc2f29f
|
Fixed typo in requests_effects (#6215)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-02-09 16:59:31 -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 |
|
Pawkkie
|
bd50fe6014
|
Fix AI switching in absorbing mon incorrectly (#6227)
|
2025-02-09 22:28:06 +01:00 |
|
Frank DeBlasio
|
3be1d1d91e
|
Consolidated Frontier teams into battle_frontier_trainers.h (#5892)
|
2025-02-09 22:17:10 +01:00 |
|
Eduardo Quezada
|
d510a3957d
|
Fixed Future Sight not being affected by Electrify (#6213)
|
2025-02-09 21:57:29 +01:00 |
|
Eduardo Quezada
|
a2ad5d2ca3
|
Heal Bell/Aromatherapy/Sparkly Swirl improvements and fixes (#6210)
|
2025-02-09 21:54:03 +01:00 |
|
Alex
|
5f13f9545f
|
Redefine IsBattlerAlive in battle.h as a static inline (#6211)
|
2025-02-09 14:09:23 -05:00 |
|
Eduardo Quezada
|
621d2ef83d
|
Fixed missing move encapsulation in upcoming (#6226)
|
2025-02-09 20:03:53 +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 |
|
psf
|
a8c9857a56
|
Prevented fanfares from playing in headless mode (#6219)
|
2025-02-09 09:06:22 -03: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 |
|
ghoulslash
|
6f541bb449
|
Fix Liquid Ooze + Leech Seed Test (#6217)
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
|
2025-02-08 22:42:25 +01:00 |
|
Frank DeBlasio
|
41882b267d
|
Consolidate duplicate dialogue of nature girl in Battle Frontier (#6195)
|
2025-02-08 12:51:22 -08: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 |
|
Bassoonian
|
82b0eff16c
|
Fix typo in Nuzzle's description (#6209)
|
2025-02-07 15:26:16 -03:00 |
|
Eduardo Quezada
|
f9ad409715
|
Adjusted G-Max Depletion test (#6201)
|
2025-02-07 17:37:36 +01:00 |
|
Pawkkie
|
e77fe32dec
|
Fix Choice'd mons referring to incorrect move when switching (#6204)
|
2025-02-07 16:42:08 +01:00 |
|