13536 Commits

Author SHA1 Message Date
Alex
612c8d3ff6
Fixes heal blocked leeach seed in tests (#5700) 2024-11-21 17:18:44 +00:00
PhallenTree
596b8b20f4
Fixes Neutralizing Gas crashes + adds missing interaction, Regenerator small fix (#5694) 2024-11-21 17:35:05 +01:00
Alex
3cc048cc01
Removes redundant Decorate check (#5696) 2024-11-21 00:13:31 -05:00
Alex
81442e32e2
Changes name of B_SCR_NAME_WITH_PREFIX (#5675) 2024-11-20 09:46:50 -03:00
Martin Griffin
f775b09ae0
Merge pull request #2055 from GriffinRichards/spinda-spots
Add TRY_DRAW_SPOT_PIXEL
2024-11-20 12:22:59 +00:00
Alex
572ea141af
Fixes Absorb regression caused by #5670 (#5688) 2024-11-19 14:56:34 -05:00
Eduardo Quezada
b2ef363ac8 Merge branch '_RHH/master' into _RHH/upcoming 2024-11-19 14:19:53 -03:00
Alex
70ca5060f9
Fixes wrong Id when AI chooses mon to switch in (#5684) 2024-11-18 17:18:26 -05:00
Alex
9f1b900809
Fixes Ice Face regression (#5678) 2024-11-17 16:36:55 -03:00
AERDU
5388ed0cad
Mimicry updates typing with RemoveAllTerrains() (#5666)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-11-17 10:21:01 +01:00
Alex
67c7106fee
Refactors Absorb to use Moveend (#5670) 2024-11-17 09:59:04 +01:00
kittenchilly
c4d83079a9
PokeCommunity sprites batch (October) (#5655) 2024-11-15 21:16:41 +01:00
GriffinR
039bc02546 Use size constants for MAPSEC popup theme array 2024-11-12 22:28:01 -05:00
AlexOn1ine
cd3245cbf0 maybe better names 2024-11-12 23:33:35 +01:00
AlexOn1ine
4dc784bd2d fix conflict 2024-11-12 23:30:49 +01:00
AlexOn1ine
3204454853 Critical Hit documentation and distorted match up struct switch 2024-11-12 23:27:53 +01:00
Lactozilla
b60da57d8a Remove usage of gHeap in sSpritePalettes_ContestantsTurnBlinkEffect
Those offsets into gHeap are actually just inside of eContestTempSave.
2024-11-12 14:28:33 -03:00
hedara90
1d7e4cf8fc
Cleans up Primal Reversion code (#5659) 2024-11-12 13:48:06 +01:00
Alex
b55c87f73f
Fixes Take heart (#5658)
Co-authored-by: KyleLaporte <moog272@gmail.com>
Co-authored-by: Pawkkie <61265402+Pawkkie@users.noreply.github.com>
2024-11-11 14:58:09 -05:00
Alex
a8351e305c
Fixes Red Card / Eject Pack interaction with Emergency Exit (#5657)
Co-authored-by: Pawkkie <61265402+Pawkkie@users.noreply.github.com>
2024-11-11 14:56:51 -05:00
AlexOn1ine
a3fe53dd28 Cleans up Primal Reversion code 2024-11-11 20:31:21 +01:00
Eduardo Quezada
b48e5770be Merge branch '_RHH/master' into _RHH/upcoming 2024-11-11 15:58:42 -03:00
ghoulslash
418d127325 initialize weight in inner loop of DexNavPickTile 2024-11-11 12:39:26 -05:00
ghoulslash
931a05f12b Mrcrge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into rhh/dexnav 2024-11-11 12:38:52 -05:00
Alex
afc7795afc
Removes duplicate Booster Energy code (#5656) 2024-11-11 17:48:23 +01:00
kittenchilly
7409b87d17
Add merged placeholder text for trainer name with class (#5622) 2024-11-10 21:21:27 -03:00
Eduardo Quezada
5f87d2e8a7
Convert gBattleStringsTable to COMPOUND_STRINGs (#5649) 2024-11-10 00:22:37 +01:00
GriffinR
b89fda79ea Generate MAPSEC constants from JSON 2024-11-06 21:43:13 -05:00
Eduardo Quezada
e005ffb576 Merge branch '_RHH/master' into _RHH/upcoming 2024-11-06 10:01:48 -03:00
Alex
8581646c22
Convert 3 variouses to callnatives (#5646) 2024-11-06 10:09:49 +01:00
Alex
dc740b4e9a
Fixes Magic Coat message (#5645) 2024-11-06 10:09:00 +01:00
Bassoonian
6d38e260d6 Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge5nov 2024-11-05 10:31:40 +01:00
cawtds
57e771c8b8
Improve line breaks/scrolls (#5641) 2024-11-03 22:05:58 -03:00
Eduardo Quezada
ee2535be96 Merge branch '_RHH/master' into _RHH/upcoming 2024-11-03 12:21:22 -03:00
ghoulslash
de9c6ea0cd remove unecessary preprocs, comment fixes 2024-11-03 07:53:23 -05:00
ghoulslash
b488ff9b53 merge w upcoming 2024-11-03 07:11:40 -05:00
Alex
45d063dcf8
Fixes Dragon Tail using the effect twice during a Parental Bond attack (#5630)
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
2024-11-02 09:38:29 -03:00
Eduardo Quezada
ac1dd857f7
Fixed text wrap obtaining the incorrect glyph width (#5620) 2024-11-01 15:07:58 +01:00
Alex
56331abbb4
AI_CalcDamage clean up (#5629)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-11-01 12:57:09 +01:00
Alex
2aef530bfa
Fixes dynamicMoveType global not being reset during AI calcs (#5628) 2024-11-01 11:10:17 +01:00
Philipp AUER
52514350e9
Unwind TRAINER_CLASS macro (#5611)
Co-authored-by: sbird <sbird@no.tld>
2024-11-01 09:00:32 +01:00
Alex
35a22d6e82
Follow up for #5570 (#5625) 2024-10-31 10:58:00 +01:00
Alex
d5f8e9cc0e
Combines CalculateMoveDamage arguments into a struct (#5570) 2024-10-31 07:59:28 +01:00
Rachel
13a26c462e
Display the correct shadow size when sending out a new Pokemon (#5618) 2024-10-30 14:09:54 -03:00
Alex
8e0443f727
Moves that deal a Fixed amount don't need AI handling (#5614) 2024-10-29 16:49:56 -04:00
GhoulMage
5df6f0b753
AI_FLAG_ACE_POKEMON takes into account separate trainers (#5608) 2024-10-29 15:18:29 -04:00
Eduardo Quezada
dfa3690d74
Added config to disable gender differences (#5595) 2024-10-29 15:38:26 +01:00
Bassoonian
3d750f8770
Fixed a ball update oversight (#5609) 2024-10-29 07:17:02 -03:00
Alex
76eae8ed00
Decouple Poke Ball ids from item ids (#5560) 2024-10-28 18:03:15 +01:00
Eduardo Quezada
e8b8ca19a9 Merge branch '_RHH/master' into _RHH/upcoming 2024-10-28 12:13:55 -03:00