2870 Commits

Author SHA1 Message Date
AlexOn1ine
fd0766c7fa 17-04-25-master-merge 2025-04-17 14:14:37 +02:00
hedara90
7a35f35352
Make generated files match the current formatting (#6636) 2025-04-17 13:38:30 +02:00
GriffinR
709cfa1c9a
Merge pull request #2014 from Bassoonian/battleterrain
Rename battle terrain to environment
2025-04-13 19:32:06 -04:00
Alex
f3c76e866b
Fix potential compile error caused by sTeraIndicatorDataPtrs (#6599) 2025-04-13 19:06:44 +02:00
Hedara
9afd8800f3 Merge branch 'upcoming' into merrps-dns 2025-04-12 16:33:02 +02:00
Bassoonian
d86aedfd32 Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into mastertoupcoming12apr 2025-04-12 14:59:06 +02:00
Hedara
fff6bd3ed8 Removed legacy handling, fix if statment argument style 2025-04-11 21:27:49 +02:00
Bassoonian
3c8d5d1a57
Add hold effects for PLA Origin Trio items (#6578) 2025-04-11 16:38:08 +02:00
Hedara
301ef288f5 Review comments 2025-04-11 11:37:36 +02:00
hedara90
cf98d764ad
Gimmick Indicator refactor (#6553)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-04-10 23:56:26 +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
Hedara
08a2ad2c98 Merge branch 'upcoming' into merrps-dns 2025-04-09 10:01:51 +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
psf
69f2f9f151
Add OW_DEFOG_FIELD_MOVE to allow players to clear overworld Fog (#6477) 2025-04-08 16:21:32 +02:00
SundayMoonday
bbe8bbc45b
Replaced Blue Sky background for Rock Field (#6516) 2025-04-07 11:04:21 +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
AlexOn1ine
ccebebf64f 31-03-25 Master merge 2025-03-31 18:23:46 +02:00
aronson
68a869da99
Hide in-battle types from Union Room trade request (#6489) 2025-03-30 10:57:58 +02:00
Hedara
a3a48c59b8 Merge remote-tracking branch 'pret/master' into pret-merge-2025-03-29 2025-03-29 14:21:29 +01:00
Isaac Aronson
56947be5d6
Fix union room typo 2025-03-28 10:26:01 -05:00
Hedara
521432b269 Renamed a berry tag variable 2025-03-24 13:47:47 +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
Deokishisu
eaf7549854
Replace Incorrect Slow Stairs Movement with Correct One (#6275) 2025-03-16 14:51:36 -07:00
Alex
7df3298534
Minor Recoil Effect refactor (#6409) 2025-03-14 12:43:45 +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
40dd3a7688
Fix compile errors with OW_BATTLE_ONLY_FORMS set to FALSE (#6400)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-03-10 17:11:25 +01:00
Alex
3def0e751b
Fixes crash damage move against absorbing abilities (#6361) 2025-03-09 20:54:58 +01:00
AlexOn1ine
ba3ebc70d5 Merge remote-tracking branch 'rhh/master' into 06-03-25-Merge 2025-03-06 18:08:55 +01:00
Eduardo Quezada
3eae7a0c96
Gen 1's Special base stat (#6330) 2025-03-06 11:09:53 +01:00
kittenchilly
f747deb6ca
Fix Melmetal's weight (#6382) 2025-03-05 17:58:35 +01:00
Rachel
c7ac1a19df
Refactor teachable learnset helper (#6378) 2025-03-04 20:10:00 +01:00
Ruby
ec8344c2ad
Fixed a missing ) in trainers.party comment block. (#6367) 2025-03-02 15:00:57 +01:00
Eduardo Quezada
2b3589b44f
Moved Pokémon Jump types to gSpeciesInfo (#5602) 2025-02-27 07:46:14 -08: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
hedara90
4cf219e5c7
Resized gimmick indicators to reduce VRAM usage (#6319)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-02-22 12:28:53 -03: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
Eduardo Quezada
ff098bc520
Reverted compound literal OW mon pic tables (#6216) 2025-02-19 19:17:59 +01:00
Alex
502b1c5087
Rename SetPhotonGeyser to a more general use and clean up (#6272) 2025-02-17 22:07:30 +01:00
Alex
264e72c1a1
Use more accurate count in MovesInfo (#6260) 2025-02-13 20:22:10 -03:00
Frank DeBlasio
d1b2b045d0
Moved sValidApprenticeMove into gMovesInfo (#6254) 2025-02-13 14:58:12 -03:00
Frank
a0a8434e26 Converted apprenctice IDs from hex to decimal 2025-02-13 12:13:22 -05:00
Eduardo Quezada
845679471f
Added missing Dream Eater and Reflect Type tests (#6245) 2025-02-13 17:32:08 +01:00
Eduardo Quezada
9c4fbbf274 Merge branch '_RHH/master' into _RHH/upcoming 2025-02-13 13:06:32 -03:00
Eduardo Quezada
3507862164 Merge branch '_RHH/master' into _RHH/upcoming 2025-02-12 09:30:59 -03:00