agsmgmaster64
|
1344d8e9dd
|
Type Effectiveness Indicators when selecting moves (#6559)
|
2025-04-12 01:03:45 +02:00 |
|
Hedara
|
3c2cc35158
|
Match expansion formatting for some preproc
|
2025-04-11 21:17:52 +02:00 |
|
Hedara
|
301ef288f5
|
Review comments
|
2025-04-11 11:37:36 +02:00 |
|
Bassoonian
|
708bb4a831
|
Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge10apr
|
2025-04-10 23:57:57 +02:00 |
|
hedara90
|
cf98d764ad
|
Gimmick Indicator refactor (#6553)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-04-10 23:56:26 +02:00 |
|
Hedara
|
d78afca94f
|
More shadow options and documentation
|
2025-04-10 22:41:38 +02:00 |
|
khbsd
|
c1ad43b1cc
|
Adds SHOW_TYPES_SEEN to the B_SHOW_TYPES option (#6561)
|
2025-04-10 21:43:21 +02:00 |
|
Hedara
|
b075163c57
|
Cleanup and config options
|
2025-04-10 21:17:20 +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 |
|
cawtds
|
1672d99060
|
make linkDirection more robust to member reordering
|
2025-04-09 13:40:39 +02:00 |
|
Hedara
|
e419606a10
|
Merge branch 'upcoming' into merrps-dns
|
2025-04-09 12:48:18 +02:00 |
|
hedara90
|
3d68061f23
|
Updated move animation tests (#6554)
|
2025-04-09 12:17:57 +02:00 |
|
Hedara
|
c8f227903f
|
Merge branch 'upcoming' into upcoming-master
|
2025-04-09 11:25:01 +02:00 |
|
Alex
|
f364cf9e71
|
Alcremie Evolution clean up follow up (#6557)
|
2025-04-09 11:18:07 +02:00 |
|
Hedara
|
2210e2d410
|
Merge branch 'master' into upcoming-master
|
2025-04-09 11:06:38 +02:00 |
|
Hedara
|
08a2ad2c98
|
Merge branch 'upcoming' into merrps-dns
|
2025-04-09 10:01:51 +02:00 |
|
khbsd
|
26f28103ec
|
Add Time-Based Encounters (#6454)
|
2025-04-09 09:49:09 +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 |
|
Pawkkie
|
54928726cb
|
AI smarter status handling (#6550)
|
2025-04-08 17:47:45 +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 |
|
Alex
|
7bf156be0e
|
Refactors Move absorb / block function calls to remove redundancy (#6490)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
|
2025-04-08 14:26:18 +02:00 |
|
Pawkkie
|
11d26af7a8
|
Initial attempt, doesn't see move effectiveness / damage
|
2025-04-08 00:15:28 -04: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 |
|
AlexOn1ine
|
e8cc3c81f8
|
conflicts
|
2025-04-06 14:59:12 +02:00 |
|
Pawkkie
|
9cb96235f9
|
Add basic Unaware check bad move scoring (#6524)
|
2025-04-02 18:18:33 -04:00 |
|
Alex
|
5b9077e207
|
Refactor / Simlify Cmd_adjustdamage and remove redundancy (#6499)
|
2025-04-02 23:52:54 +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 |
|
Alex
|
edb196e851
|
Fixes Red Card against Dynamaxed mons (#6526)
|
2025-04-02 14:28:53 +02:00 |
|
AlexOn1ine
|
0c35879e02
|
conflicts
|
2025-04-01 19:11:55 +02:00 |
|
hedara90
|
4f0caf8199
|
Fixes Tera Type not being carried over to during form change / evolution (#6502)
|
2025-04-01 16:52:40 +02:00 |
|
Isaac Aronson
|
74e84da571
|
Remove NDEBUG guard on cycle counter functions
|
2025-03-31 13:11:18 -05:00 |
|
AlexOn1ine
|
ccebebf64f
|
31-03-25 Master merge
|
2025-03-31 18:23:46 +02:00 |
|
AlexOn1ine
|
d767211c4a
|
helper function to get the species type based on personality
|
2025-03-31 14:49:40 +02:00 |
|
Isaac Aronson
|
926a7437da
|
Add AI thinking cycle count display to frame count
|
2025-03-30 17:24:36 -05: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 |
|
Hedara
|
a3a48c59b8
|
Merge remote-tracking branch 'pret/master' into pret-merge-2025-03-29
|
2025-03-29 14:21:29 +01:00 |
|
Alex
|
79a2ec1ce2
|
Fixes Emergency Exit and Eject Pack (#6459)
|
2025-03-29 14:04:01 +01:00 |
|
hedara90
|
b0c7d1a8ee
|
Made memory integrity checks run betweeen PARAMETRIZE runs (#6462)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-03-28 21:43:04 +01:00 |
|
Martin Griffin
|
71a5542168
|
metaprogram.h without global.h (#6469)
|
2025-03-28 21:21:58 +01:00 |
|
Alex
|
ce3d6a924a
|
Fixes clear body type effect and clear amulet against protect effects (#6482)
|
2025-03-28 11:35:06 +01:00 |
|
psf
|
b60fcc9a72
|
Add B_ANIMATE_MON_AFTER_KO - mons animate after scoring a KO (#6451)
|
2025-03-26 11:39:25 +01:00 |
|
AlexOn1ine
|
ae640f0714
|
25-03-25 master to upcoming merge
|
2025-03-25 21:39:58 +01:00 |
|
Alex
|
5ec301f04a
|
Removes unused Special Status members (#6479)
|
2025-03-25 21:15:25 +01:00 |
|
hedara90
|
a36f838d76
|
AI gimmick check changed from checking trainer data to a BattleStruct field (#6478)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-03-25 20:01:34 +01:00 |
|
Hedara
|
521432b269
|
Renamed a berry tag variable
CI / build (push) Has been cancelled
|
2025-03-24 13:47:47 +01:00 |
|
Alex
|
b93976c980
|
Fixes Cheek Pouch mutating damage (#6466)
|
2025-03-23 23:34:24 +01:00 |
|
ghoulslash
|
051adbdce2
|
Fix DexNav search level (#6421)
|
2025-03-23 11:29:51 -04:00 |
|
hedara90
|
08f11ca5c1
|
Update the All Move Animations test (#6460)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-03-21 22:33:03 +01:00 |
|
Alex
|
c707df358e
|
Clean up AI code duplication and unify checks (#6348)
|
2025-03-20 22:50:01 +01:00 |
|
Pawkkie
|
4c18e88282
|
Improve "all moves bad" switching (#6453)
|
2025-03-20 16:43:56 +01:00 |
|
Alex
|
5c05715585
|
Adds move description battle config (#6364)
|
2025-03-20 10:12:37 +01:00 |
|
Bassoonian
|
9a23f19575
|
19-03-25 master to upcoming merge (#6450)
|
2025-03-20 09:57:05 +01:00 |
|
Alex
|
adc2c61fe8
|
Unifies dynamic move category checks (#6443)
|
2025-03-19 23:06:08 +01:00 |
|
AlexOn1ine
|
3c632b8b44
|
19-03-25 master to upcoming merge
|
2025-03-19 17:12:47 +01:00 |
|
Alex
|
4c4d043c13
|
Refactor the function IsAbilityPreventingEscape (#6439)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
|
2025-03-19 16:09:36 +01:00 |
|
PhallenTree
|
cf9ee2caee
|
Fixes Toxic Spikes Absorbed message (#6448)
|
2025-03-19 13:46:23 +01:00 |
|
Pawkkie
|
411a236ce7
|
Fix AI using Scald / fire moves against frozen / frostbitten targets (#6442)
|
2025-03-19 09:32:59 +01:00 |
|
Alex
|
98a5fab898
|
Optimization / Clean up of AI move usability (#6332)
|
2025-03-18 23:42:07 -04:00 |
|
Alex
|
6031bb2a78
|
Split ai function IsBattlerTrapped (#6438)
|
2025-03-18 12:00:11 -04:00 |
|
Alex
|
4193963096
|
Fixes Cotton Spore failing if one of the targets blocks it (#6418)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
Co-authored-by: DizzyEggg <jajkodizzy@wp.pl>
|
2025-03-18 15:41:37 +01:00 |
|
Alex
|
0db9043c52
|
Rename absentBattlerFlags to absent (#6432)
|
2025-03-17 21:51:04 +01:00 |
|
Alex
|
99a3d01877
|
Fixes dynamax reversion when ejected out + anim fix (#6416)
Co-authored-by: hedara90 <90hedara@gmail.com>
|
2025-03-17 19:57:38 +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 |
|
PhallenTree
|
ddab689a07
|
Fixes Neutralizing Gas Exits, Weather Abilities and Terrain Effects order (#6435)
|
2025-03-16 23:10:20 +01:00 |
|
Deokishisu
|
eaf7549854
|
Replace Incorrect Slow Stairs Movement with Correct One (#6275)
|
2025-03-16 14:51:36 -07:00 |
|
khbsd
|
816ed0d963
|
Low Health Beeps Configuration (#6328)
|
2025-03-15 22:02:48 -07:00 |
|
GriffinR
|
04eb22f4ea
|
Fix offset for towerInterview in BattleFrontier
CI / build (push) Has been cancelled
|
2025-03-15 17:45:42 -04:00 |
|
cawtds
|
5aa85e7b8d
|
fix search level
|
2025-03-15 00:20:01 +01: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 |
|
hedara90
|
b08a5fb15a
|
Tests for checking all move animations (#6297)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-03-13 13:46:48 +01:00 |
|
AlexOn1ine
|
4adb908a6b
|
review comments
|
2025-03-12 23:41:28 +01:00 |
|
surskitty
|
7193909fa7
|
Configuration to make all Hail moves summon Snow or vis versa, to have only one ice weather (#6149)
|
2025-03-12 21:31:45 +01:00 |
|
hedara90
|
4e01ce6993
|
Moved some AI stuff out of the battlestruct (#6405)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-03-11 21:23:02 +01:00 |
|
Alex
|
3def0e751b
|
Fixes crash damage move against absorbing abilities (#6361)
|
2025-03-09 20:54:58 +01:00 |
|
cawtds
|
7eaaa1f8d4
|
remove/replace IsAlly leftovers
|
2025-03-09 15:05:05 +01:00 |
|
AlexOn1ine
|
dd8606d577
|
fix timers
|
2025-03-08 22:26:03 +01:00 |
|
Pawkkie
|
b12f32667f
|
Fix roll handling in AI damage calcs (#6396)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
|
2025-03-08 09:53:14 +01:00 |
|
Alex
|
46b821c196
|
Fix damage roll order for AI calcs (#6356)
|
2025-03-07 12:40:40 -05:00 |
|
AlexOn1ine
|
ba3ebc70d5
|
Merge remote-tracking branch 'rhh/master' into 06-03-25-Merge
|
2025-03-06 18:08:55 +01:00 |
|
wiz1989
|
e0c7b63095
|
"no additional effect" text for status Z moves without effects (#6368)
|
2025-03-06 12:47:03 +01:00 |
|
PhallenTree
|
e750dca08a
|
Reorder Dancer activation
|
2025-03-04 11:02:33 +00:00 |
|
ghoulslash
|
d44eff4e0c
|
fix red card overwriting gBattlerAttacker causing subsequent MOVEEND cases checking attacker not to trigger properly
|
2025-03-03 14:56:08 -05:00 |
|
AlexOn1ine
|
134d1e79c7
|
review comments addressed
|
2025-02-28 22:42:53 +01:00 |
|
AlexOn1ine
|
0a333dbdc8
|
merge rhh/upcoming
|
2025-02-28 00:21:07 +01:00 |
|
surskitty
|
fb28206f21
|
Configuration to scale Critical Capture odds based on local Pokedex or estimated National Pokedex (#6250)
|
2025-02-27 15:16:16 -08: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 |
|
Pawkkie
|
b109c4c36b
|
Fix Substitute / Shed Tail Switch AI (#6334)
|
2025-02-25 13:06:39 +01:00 |
|
AlexOn1ine
|
df0389fdc0
|
clean up
|
2025-02-23 23:22:31 +01:00 |
|
hedara90
|
c3962c2d3b
|
Shifted the follower graphicsIds (#6329)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-02-23 22:11:41 +01:00 |
|
PhallenTree
|
320c6cf11f
|
Fixes Coaching on semi-invulnerable ally, Air Balloon being stolen, Immunity abilities being ignored by Mold Breaker (#6327)
|
2025-02-23 20:50:52 +01:00 |
|
Eduardo Quezada
|
1895e6263b
|
Applied a proper fix to blending
|
2025-02-23 16:44:05 -03:00 |
|
PhallenTree
|
9479b67964
|
Remove pursuitSwitchByMove and additional if statement (#6326)
|
2025-02-23 11:49:00 +01:00 |
|
Alex
|
7c78053a8c
|
Clean up leftover from simu hp reduction development (#6323)
|
2025-02-22 21:56:30 +01: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 |
|
Pawkkie
|
b7df5b8c29
|
Fix Overzealous Absorber Switching (#6318)
|
2025-02-22 10:37:11 +01:00 |
|
Alex
|
3dd0f95ddd
|
Fixes Tera Shell activating on moves that have no effect on target (#6271)
|
2025-02-21 23:11:07 +01:00 |
|
Pawkkie
|
48fc44df31
|
Fix AI hold effect considerations (#6310)
|
2025-02-21 18:11:47 +01:00 |
|
Pawkkie
|
bf263efa4b
|
Fix AI hazard move handling, minor AI tweaks (#6311)
|
2025-02-21 09:58:14 +01:00 |
|
Eduardo Quezada
|
8c57172f2a
|
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2
|
2025-02-20 19:46:02 -03:00 |
|
Eduardo Quezada
|
fe7ed22f5b
|
Merge branch '_RHH/master' into _RHH/upcoming
|
2025-02-20 19:44:00 -03:00 |
|
Eduardo Quezada
|
2428af66cd
|
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2
|
2025-02-20 19:17:59 -03:00 |
|
Alex
|
82f6d477b6
|
Fix padding amount in MoveInfo (#6307)
|
2025-02-20 17:03:01 +01:00 |
|
Alex
|
502b1c5087
|
Rename SetPhotonGeyser to a more general use and clean up (#6272)
|
2025-02-17 22:07:30 +01:00 |
|
PhallenTree
|
b1c597495b
|
Fixes Called moves ignoring redirection (#6267)
|
2025-02-14 13:47:02 +01:00 |
|
Alex
|
de8d25da55
|
Expand usage of IsBattlerAlly (rename from IsAlly) (#6251)
|
2025-02-14 12:31:21 +01:00 |
|
Alex
|
53727aa23d
|
Fixes ability Embody Aspect triggering multiple times (#6259)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
|
2025-02-14 12:26:49 +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 |
|
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 |
|
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 |
|
Zatsu
|
4f3326f3f4
|
fix for battle ui for add to party menu (#6229) (#6240)
|
2025-02-12 22:02:25 +01:00 |
|
AlexOn1ine
|
5ee5aa796a
|
merge rhh/upcoming
|
2025-02-12 21:01:21 +01:00 |
|
AlexOn1ine
|
f8b45028db
|
fix grassy terrain healing
|
2025-02-12 19:33:41 +01:00 |
|
AlexOn1ine
|
3c09e43a20
|
minor reviews
|
2025-02-12 18:51:50 +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 |
|
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 |
|
AlexOn1ine
|
b4f17c7506
|
review comments
|
2025-02-11 12:06:16 +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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Pawkkie
|
4359cbb77c
|
SwitchType enum to clean up GetMostSuitableMonToSwitchInto (#6184)
|
2025-02-05 16:49:53 +01:00 |
|
ghoulslash
|
dc21befcc9
|
CanAbilityX Function Cleanup (#6183)
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
|
2025-02-05 16:48:51 +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 |
|
Alex
|
b90b1e2546
|
Clean up - Add ability args instead of calcing the ability again (#6186)
|
2025-02-04 18:04:05 -05:00 |
|
tertu
|
14178edfe3
|
Don't use SeedRng some places where it isn't necessary (#6156)
|
2025-02-03 20:03:13 +01: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 |
|
Eduardo Quezada
|
7c6eda21b1
|
Added missing in-battle "Move Info" button prompt (#6155)
|
2025-02-01 18:47:36 +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 |
|
khbsd
|
4fc56128d0
|
Add Mega Evo, Primal Reversion, and Ultra Necrozma OW sprites (#5874)
Co-authored-by: kittenchilly <mario.pikmin.zelda@gmail.com>
|
2025-01-30 22:29:20 -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 |
|
Alex
|
32eb5dfba5
|
Remove global sBattler_AI (#6128)
|
2025-01-29 19:58:16 +01:00 |
|
Alex
|
94c98e6233
|
Clean up follow up for Simultaneous Reduction HP (#6139)
|
2025-01-29 19:39:19 +01:00 |
|
Alex
|
6432027f6b
|
Replace BattleStruct members quickClawRandom/quickDrawRandom with locals (#6136)
|
2025-01-29 07:02:40 -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 |
|
Eduardo Quezada
|
927bb8f833
|
Fixed AI not handling type effectiveness beyond x8 (#6127)
|
2025-01-28 19:16:10 +01:00 |
|
DizzyEggg
|
b2448ea002
|
Fix upcoming not working on no cash (#6121)
|
2025-01-26 20:25:57 -03:00 |
|
Frank DeBlasio
|
9b96462204
|
Consolidated contest opponent filters into gContestOpponents (#6119)
|
2025-01-26 23:12:49 +01:00 |
|
kittenchilly
|
058bf58b7b
|
Match current gen behavior for battle environment after fishing (#6099)
|
2025-01-26 22:39:14 +01:00 |
|
Eduardo Quezada
|
be74612b9e
|
u32 in FadeScreenHardware
|
2025-01-26 17:17:37 -03:00 |
|
Eduardo Quezada
|
3fc9b0195d
|
Cleaned up code to align with previous review comments
|
2025-01-26 17:14:00 -03:00 |
|
Eduardo Quezada
|
11bdbfb658
|
Fix compile issues
|
2025-01-26 16:35:05 -03: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 |
|
PhallenTree
|
4158f9251f
|
Fix Powder (status) config and some terrain timers not using gBattleTurnCounter (#6109)
|
2025-01-26 13:06:11 +01: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 |
|
Ariel A
|
090c4f3936
|
feat: hardware fades now affect BLDALPHA too
|
2025-01-25 20:57:30 -05:00 |
|
Frank DeBlasio
|
4e8ddebb8d
|
Updated trainer pic tutorial (#6049)
Co-authored-by: Pawkkie <61265402+Pawkkie@users.noreply.github.com>
|
2025-01-25 19:36:19 -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 |
|
Alex
|
77b677dbf9
|
Introduces BattleTurnCounter to simplfy timer checks (#6080)
|
2025-01-25 14:26:38 -05:00 |
|
hedara90
|
88986baf5f
|
Trainer Party Pools (#5731)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-01-25 13:28:46 +01:00 |
|
Eduardo Quezada
|
26daf15ce0
|
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2
|
2025-01-24 18:29:28 -03:00 |
|
Eduardo Quezada
|
cd84e07341
|
Merge branch '_RHH/master' into _RHH/upcoming
|
2025-01-23 23:01:25 -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 |
|
DizzyEggg
|
4e0eab9e27
|
Remove gDecompressionBuffer (#6029)
|
2025-01-23 09:47:14 +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 |
|