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

4829 Commits

Author SHA1 Message Date
RoamerX
d5de350eb6
Merge branch 'rh-hideout:master' into master 2026-02-20 12:43:36 +08:00
Kildemal
07fa2e2751
fix(bttl-anim): remove unused battle selector to silence warning (#9218) 2026-02-17 18:59:02 +01:00
Alex
ce15e5486d
Fixes Gulp Missile crash on targets that can be statused (#9179) 2026-02-10 20:13:27 +01:00
GGbond
20a986519d
Fix Aqua Ring reuse failure check and add Aqua Ring/Ingrain tests (#9174) 2026-02-10 10:00:42 +01:00
RoamerX
af2b69f7e5 Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into rh-hideout-master 2026-02-07 22:07:24 +08:00
Eduardo Quezada
32d1777b7a
Use direct config names instead of enum names (#8824) 2026-02-06 11:57:33 +01:00
hedara90
83be28dc37
Fix migration script output from move anim documentation (#9140) 
Co-authored-by: Hedara <hedara90@gmail.com>
 2026-02-06 11:53:41 +01:00
Hedara
e758d55a03 Merge remote-tracking branch 'pret/master' into pret-merge 
Manual cleanups to the Magma Storm animation and AnimTask_InvertScreenColor

 Conflicts:
	asm/macros/battle_anim_script.inc
	data/battle_anim_scripts.s
	include/constants/battle_anim.h
	src/battle_anim_bug.c
	src/battle_anim_dragon.c
	src/battle_anim_effects_1.c
	src/battle_anim_normal.c
 2026-01-31 19:20:54 +01:00
Alex
c8eb55969e
Add accuracy check to BattleScript_EffectNightmare (#9032) 2026-01-27 16:17:25 +01:00
GGbond
aafc581460
Fix Psych Up wrong battler message and Gen 6+ crit ratio copying (#9015) 2026-01-27 15:44:42 +01:00
RoamerX
e94050f53c Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into rh-hideout-master 2026-01-27 12:26:20 +08:00
GGbond
21492e0f23
Fix Foresight/Miracle Eye repeated-use behavior (#9025) 2026-01-26 14:48:39 +01:00
Eduardo Quezada
89da62b02d
Remove trailing whitespace - Master (#9011) 2026-01-25 10:12:41 +01:00
GGbond
e871913e22
Fix Magnetic Flux target handling in singles (#9007) 2026-01-24 08:45:19 +01:00
GGbond
128beb39e1
Fixed several issues with Parting Shot (#8928) 2026-01-20 22:06:50 +01:00
hedara90
f9c826ca57
Merge pull request #2228 from hedara90/fix-spaces 
Fix spaces instead of tabs in battle_anim_scripts.s
 2026-01-20 11:13:48 +00:00
Martin Griffin
22eed3f4bf Partially document battle_anim_effects_1.c 2026-01-19 09:16:37 +00:00
Martin Griffin
0e415dde46 Document battle_anim_dragon.c 2026-01-19 09:16:37 +00:00
Martin Griffin
5d713ad9bb Document battle_anim_dark.c 2026-01-19 09:16:37 +00:00
Martin Griffin
050a9415c7 Document battle_anim_bug.c 2026-01-19 09:16:37 +00:00
Martin Griffin
e09423fadf Document battle_anim_normal.c 2026-01-19 09:16:37 +00:00
RoamerX
270f498300 Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into rh-hideout-master 2026-01-18 19:41:13 +08:00
GGbond
b671adf85f
Fixes Nightmare not affecting Comatose and adds various missing tests (#8859) 2026-01-11 15:02:41 +00:00
RoamerX
06bf56b008 fix: 解决合并冲突 2026-01-09 21:01:43 +08:00
Bassoonian
eba17e6860
Remove credits from code (#8748) 2026-01-03 18:21:13 +01:00
moostoet
0e33bf916e
Fix berry activation timing for Yawn sleep and Leech Seed damage (#8776) 2026-01-03 08:50:17 +01:00
grintoul
e82ed111ba
Misc style and whitespace cleanup (#8681) 2026-01-02 18:01:43 +01:00
RoamerX
c80ee88388 Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into rh-hideout-master 2025-12-30 12:28:03 +08:00
grintoul
dcc584c6d6
Fixes incorrect battler used in STRINGID_USEDINSTRUCTEDMOVE (#8704) 2025-12-29 21:57:10 +01:00
RoamerX
dc41d1cab9 Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into rh-hideout-master 2025-12-29 23:03:47 +08:00
spindrift64
582a643d1f
fix poisons absorbing toxic spikes when fainting from other hazards (#8644) 2025-12-23 21:47:42 +01:00
RoamerX
93ebf98e37 汉化补充 2025-12-22 21:41:08 +08:00
RoamerX
4cde1f63ec 补充汉化 2025-12-18 20:01:56 +08:00
RoamerX
013c7ad7fd 补充汉化 2025-12-18 11:25:55 +08:00
RoamerX
0f4d49aeb3 Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into rh-hideout-master 2025-12-17 21:21:49 +08:00
Steve
1e9cddd848 Align gSpecialVars 2025-12-14 23:03:33 -05:00
Eduardo Quezada
a0a5947590
Added tests for stat-changing moves (#8278) 
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2025-12-14 16:24:39 +01:00
FosterProgramming
86ba8c3191
Fix potential issue when destiny knot fail after proccing from cute charm (#8459) 2025-12-07 18:35:39 +01:00
amiosi
328ec9d708
Generational Move Changes (#8405) 2025-12-06 23:50:58 +01:00
hedara90
22492a6494
Make TRUE and 1 behave the same in config/species_enabled.h (#8421) 
Co-authored-by: Hedara <hedara90@gmail.com>
 2025-12-04 15:27:50 +01:00
FosterProgramming
f3d43e286d
Fix substitute/defog interactions (#8418) 2025-12-04 15:24:53 +01:00
FosterProgramming
142a5ef08c
Fix illusion not breaking properly when behind substitute (#8423) 
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
 2025-12-04 00:35:38 +01:00
Eduardo Quezada
115694675f
Renamed Config Test system to more general names (#7283) 2025-12-02 11:26:44 -05:00
PhallenTree
1a6d03344a
Multiple bugfixes (mostly Dancer/called moves) (#8401) 2025-12-01 20:12:11 +01:00
AlexOn1ine
15d9342fe5 30/11/25 master to upcoming merge 2025-11-30 14:57:50 +01:00
hedara90
ce858f51b2
27/11/25 Master to upcoming merge (#8359) 2025-11-27 21:07:59 +01:00
PhallenTree
c36fc5c4b7
Fixes Beak Blast burning after Beak Blast was already used (#8361) 2025-11-27 20:07:45 +01:00
FosterProgramming
7085d30263
Fix substitute graphic not disappearing after using a pivor move (#8340) 2025-11-27 19:09:40 +01:00
Alex
2d628aca0e
Move end clear bits clean up (#8354) 
Co-authored-by: PhallenTree <168426989+PhallenTree@users.noreply.github.com>
 2025-11-27 17:42:16 +01:00
AlexOn1ine
68300e0f9a 27/11/25 Master to upcoming merge 2025-11-27 13:39:12 +01:00