Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,640 Commits 1 Branch 0 Tags
Commit Graph

722 Commits

Author SHA1 Message Date
Eduardo Quezada
1f23fe0dd3
Use GetPartyBattlerData where appropiate (#6779) 2025-05-06 17:13:50 +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
khbsd
971a595e4a
Evolution Refactor (#6556) 
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
 2025-04-23 16:01:33 +02:00
AlexOn1ine
fd0766c7fa 17-04-25-master-merge 2025-04-17 14:14:37 +02:00
PhallenTree
3b05d7934f
Fixes wrong battler's Illusion wearing off when the Attacker faints and fixes Illusion tests (#6596) 2025-04-14 18:17:24 +02:00
ghoulslash
81ed774c00
EndTurnEffectOrder Refactor (#6224) 2025-04-14 10:57:34 -04:00
Bassoonian
6a70f4f390
Turn battle string ids into enums (#6594) 2025-04-13 16:12:30 +02:00
hedara90
6a881f918a
Fix dynamax message (#6589) 
Co-authored-by: Hedara <hedara90@gmail.com>
 2025-04-13 11:22:44 +02:00
agsmgmaster64
1344d8e9dd
Type Effectiveness Indicators when selecting moves (#6559) 2025-04-12 01:03:45 +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
AlexOn1ine
e8cc3c81f8 conflicts 2025-04-06 14:59:12 +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
0c35879e02 conflicts 2025-04-01 19:11:55 +02:00
AlexOn1ine
3c632b8b44 19-03-25 master to upcoming merge 2025-03-19 17:12:47 +01:00
PhallenTree
cf9ee2caee
Fixes Toxic Spikes Absorbed message (#6448) 2025-03-19 13:46:23 +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
AlexOn1ine
4babfd003e rhh merge/upcoming 2025-02-09 14:04:21 +01:00
AlexOn1ine
f2bd88a7f9 EndTurnEffectsOrder Refactor 2025-02-09 13:48:08 +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
Salem
01e8d8233e
Trainer Battle Parameter Consolidation (#5982) 2025-01-25 22:02:39 +01: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
Eduardo Quezada
af884b1be4
Cleaned up Debug Menu (#6070) 2025-01-22 15:27:08 +01:00
Eduardo Quezada
f6a86a65ef Merge branch '_RHH/master' into _RHH/upcoming 2025-01-19 10:32:57 -03:00
PhallenTree
b9acfdbb81
Fixes large battle messages being cut off instead of being prompted to advance (#6052) 2025-01-19 12:04:15 +01:00
ghoulslash
37cbae5e54
Fix Symbiosis Needing battler Argument + Tests (#6039) 
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
 2025-01-18 14:44:07 +01:00
Eduardo Quezada
8821779815 Merge branch '_RHH/master' into _RHH/upcoming 2025-01-11 08:07:15 -03:00
kittenchilly
0294beddf1
Add manual breaking back to "What will (mon) do?" message (#5908) 2025-01-06 14:23:09 -03: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
Alex
af19b13195
Adds Pledge Side Statuses as Starting Statuses (#5899) 2024-12-30 09:18:23 +01:00
AlexOn1ine
74f1d7cb80 merge rhh/upcomig 2024-12-28 21:03:34 +01:00
AlexOn1ine
9c34634dd6 Draft Change 2024-12-25 11:03:32 +01:00
Eduardo Quezada
25075239a2 Merge branch '_RHH/master' into _RHH/upcoming 2024-12-21 08:46:33 -03:00
Eduardo Quezada
53aebc34dd Merge branch '_RHH/master' into _RHH/upcoming 2024-12-20 20:48:13 -03:00
Eduardo Quezada
82252251e7 Merge branch '_pret/master' into _RHH/pr/master/pretMerge20241220 2024-12-20 16:04:33 -03:00
PhallenTree
6bba281360
Fixes Clear Amulet displaying the wrong battler and Starting Status displaying the wrong message (#5831) 2024-12-19 13:54:42 +01: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
Eduardo Quezada
5483e05db6 Fixed brace style inconsistencies 2024-12-05 12:46:50 -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
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
hedara90
8d262e7bd2
Removed testing strings for automatic line breaks (#5757) 2024-12-02 15:12:09 +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
hedara90
e4ef3a440f
Automatic Line Breaks, somewhat even lines (#5689) 
Co-authored-by: Hedara <hedara90@gmail.com>
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
 2024-11-29 18:46:45 +01:00
hedara90
e7e701f8ec
Trainer class+name expansion fix for Battle Frontier (#5699) 
Co-authored-by: Hedara <hedara90@gmail.com>
 2024-11-23 23:10:34 +01:00
AlexOn1ine
97b30cb712 simultaneous hp reduction 2024-11-23 08:35:01 +01:00
Alex
81442e32e2
Changes name of B_SCR_NAME_WITH_PREFIX (#5675) 2024-11-20 09:46:50 -03:00