Leahnaya/pokeemerald
1
0
Fork 0
mirror of https://github.com/pret/pokeemerald.git synced 2026-09-16 15:11:38 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
17,217 Commits 3 Branches 0 Tags
d86aedfd32ebd8ce0ed57c2645ef90bfb574ea25
Commit Graph

4253 Commits

Author SHA1 Message Date
Bassoonian
d86aedfd32 Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into mastertoupcoming12apr 2025-04-12 14:59:06 +02:00
hedara90
a186ce1bff Animation fixes from lucky adapted to expansion (#6452) 
Co-authored-by: Hedara <hedara90@gmail.com>
 2025-04-11 13:15:13 +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
Hedara
2210e2d410 Merge branch 'master' into upcoming-master 2025-04-09 11:06:38 +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
8dd2fee4a9 Fixes Will-O-Wisp not being blocked by Thermal Exchange (#6534) 2025-04-04 23:01:10 +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
PhallenTree
ea59e858fb Fixes Hone Claws checking the wrong stats for its stat change animation and Stockpile drops being stopped by stat reduction prevention effects (#6522) 2025-04-01 21:03:04 +02:00
AlexOn1ine
ccebebf64f 31-03-25 Master merge 2025-03-31 18:23:46 +02:00
Alex
388389714b Rename removelishtscreenreflect to removescreens (#6495) 2025-03-30 10:52:24 +02:00
Alex
79a2ec1ce2 Fixes Emergency Exit and Eject Pack (#6459) 2025-03-29 14:04:01 +01:00
Alex
7ead90aeff Fixs Aftermath ability popup message (#6491) 2025-03-29 09:45:59 +01:00
AlexOn1ine
ae640f0714 25-03-25 master to upcoming merge 2025-03-25 21:39:58 +01:00
hedara90
bb73fb1971 Fix Jet Punch in isolated tests (#6461) 
Co-authored-by: Hedara <hedara90@gmail.com>
 2025-03-21 21:46:03 +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
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
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
Alex
3def0e751b Fixes crash damage move against absorbing abilities (#6361) 2025-03-09 20:54:58 +01: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
Hedara
06d31bc8ea Merge branch 'master' into final-1.10-master-upcoming-merge 2025-02-26 22:07:10 +01:00
hedara90
37abce1992 Made some move animations fit in VRAM (#6289) 
Co-authored-by: Hedara <hedara90@gmail.com>
 2025-02-26 14:56:36 +01:00
Alex
13acf18d74 Fixes effect paralyze not being absorbed by absorbing abilities (#6338) 2025-02-25 22:28:10 +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
fe7ed22f5b Merge branch '_RHH/master' into _RHH/upcoming 2025-02-20 19:44:00 -03:00
Alex
767ea38dbf Fixes doesnt effect message for Thunder Wave (#6304) 
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2025-02-20 19:18:27 -03:00
PhallenTree
f6ff64cdbe Fixes Brick Break/Psychic Fangs/Raging Bull breaking screens if target is immune (#6308) 2025-02-20 12:55:10 -03:00
PhallenTree
5340dc8687 Fixes non-Ghost type Curse animation (#6299) 2025-02-19 18:09:06 +01:00
Alex
b2f45fcf1f Restoretarget in Rototiller script + Tests (#6296) 2025-02-18 20:43:07 +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
Eduardo Quezada
9c4fbbf274 Merge branch '_RHH/master' into _RHH/upcoming 2025-02-13 13:06:32 -03: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
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
PhallenTree
cf5b95cee8 Fixes Expanding Force and Spectral Thief move animations (#6185) 2025-02-09 22:34:48 +01:00
Eduardo Quezada
a2ad5d2ca3 Heal Bell/Aromatherapy/Sparkly Swirl improvements and fixes (#6210) 2025-02-09 21:54:03 +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
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