ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-17 12:07:38 +01:00
Code Issues Packages Projects Releases Wiki Activity
7,866 Commits 1 Branch 0 Tags 235 MiB
a29c9f9339
Commit Graph

7866 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ghoulslash
a29c9f9339
Merge pull request #1569 from LOuroboros/cotton_down 
Fixed Cotton Down
 2021-07-13 11:06:59 -06:00
ghoulslash
ebc187c16d
Merge pull request #1536 from DizzyEggg/gravity 
Fix Gravity's animation
 2021-07-13 10:54:45 -06:00
LOuroboros
02eace4574 Fixed Cotton Down 
It will no longer affect fainted 'mons.
 2021-07-13 13:54:33 -03:00
ultima-soul
4d1c63e3d3
Merge pull request #1556 from ExpoSeed/BE/fix-redefinition-error 
Include expansion_branches.h in global.h
 2021-07-04 13:41:42 -07:00
ExpoSeed
0ed1d29ece Include expansion_branches.h in global.h 2021-07-04 12:39:30 -05:00
ghoulslash
171329aabd
Merge pull request #1552 from ExpoSeed/BE/fix-redefinition-error 
Fix redefinition error in battle_config.h
 2021-07-04 09:31:46 -06:00
ExpoSeed
fb69b65337 Fix redefinition error in battle_config.h 2021-07-02 14:36:55 -05:00
DizzyEggg
800e2395c0
Merge pull request #1542 from BuffelSaft/thaw_moves_2 
Fix Thawing Moves, Add FLAG_THAW_USER
 2021-06-19 13:47:51 +02:00
BuffelSaft
4c18cb7fe7 Remove EFFECT_THAW_HIT 2021-06-19 11:49:00 +12:00
BuffelSaft
06111bdc63 Replace EFFECT_THAW_HIT 
Both moves that used EFFECT_THAW_HIT now use EFFECT_BURN_HIT.
 2021-06-19 11:43:29 +12:00
BuffelSaft
87279ecab9 Fix CANCELLER_FROZEN 
Now checks if current move will thaw user before trying to defrost it.
 2021-06-19 11:31:46 +12:00
ghoulslash
70fd98a009
Merge pull request #1541 from rh-hideout/DizzyEggg-patch-2 
Fix Imposter looplock
 2021-06-10 11:59:29 -06:00
ghoulslash
de21636f97
Merge pull request #1539 from rh-hideout/DizzyEggg-patch-1 
Fix mon shadow when caught and learn new move
 2021-06-10 11:59:10 -06:00
BuffelSaft
e6a8faec1e Fix thawing moves 
Replace IsThawingMove with a move flag and add a check for it to CANCELLER_FROZEN. This makes thawing moves actually thaw the user.
 2021-06-10 23:48:18 +12:00
DizzyEggg
179ac9c1e1
Fix Imposter looplock 2021-06-10 13:45:24 +02:00
DizzyEggg
c6f3b7f571
Merge pull request #1532 from LOuroboros/emergency_exit 
Fixed Emergency Exit
 2021-06-10 10:41:07 +02:00
DizzyEggg
1e855cf469
Fix mon shadow when caught and learn new move 
Fixes #1477
 2021-06-09 09:49:42 +02:00
ultima-soul
1ff3718d1f
Merge pull request #1446 from LOuroboros/inner_focus 
Tweaked Inner Focus
 2021-06-08 13:18:35 -07:00
LOuroboros
d849c31ee8 Followed Ghoulslash's suggestion 2021-06-08 11:56:03 -03:00
ghoulslash
a683c698fb
Merge pull request #1524 from Jaizu/patch-13 
Change the ability popup sound
 2021-06-08 08:41:41 -06:00
DizzyEggg
e2f14d43db Fix Gravity's animation 2021-06-08 12:13:40 +02:00
LOuroboros
2c1237365b Fixed Emergency Exit 
The ability was getting triggered even if the user was the only Pokémon alive in the party.
 2021-06-07 22:39:53 -03:00
LOuroboros
588b3638d3 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into inner_focus 2021-06-07 19:22:20 -03:00
LOuroboros
8726107d42 Removed BattleScript_FlinchPrevention 
Also reverted a nonsensical change in SetMoveEffect's case MOVE_EFFECT_FLINCH.
 2021-06-07 19:18:15 -03:00
ExpoSeed
339f297949
Merge pull request #1525 from ultima-soul/battle_engine_sync 
Battle Engine Upstream Sync
 2021-06-07 15:56:43 -05:00
ultima-soul
092f02f119 Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-06-07 12:00:23 -07:00
ultima-soul
2563bc5c83
Merge pull request #1521 from DizzyEggg/largeexp 
Allow larger exp gains
 2021-06-06 13:33:33 -07:00
Jaizu
3ae783aa16
Change the ability popup sound 2021-06-06 22:19:17 +02:00
luckytyphlosion
7a7ebe1827
Merge pull request #1461 from Fontbane/patch-1 
Rename sText_WildPkmnAppeared2 to reflect its use
 2021-06-04 22:42:24 -04:00
ultima-soul
3448e19275
Merge pull request #1459 from ExpoSeed/BE/rename-flags 
Rename flags
 2021-06-04 19:33:45 -07:00
AJ Fontaine
2fe7184d10
Rename sText_WildPkmnAppeared2 to reflect its use 
sText_WildPkmnAppeared2 is used for Legendary battles, so sText_LegendaryPkmnAppeared would be more informative.
 2021-06-04 22:32:33 -04:00
ExpoSeed
12a155bd9a FLAG_DMG_2X_IN_AIR can now hit targets 2021-06-04 21:28:28 -05:00
ExpoSeed
aefd5e26d1
Update src/battle_util.c 
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
 2021-06-04 21:26:15 -05:00
ExpoSeed
8810809849 Missed one rename! 2021-06-04 19:39:03 -05:00
ExpoSeed
4bb33367df Newline 2021-06-04 19:35:16 -05:00
ExpoSeed
ec2c140ecb Disambiguate Thousand Arrows flag from other flags 2021-06-04 19:34:37 -05:00
ExpoSeed
15914d7af8 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/rename-flags 2021-06-04 19:00:29 -05:00
ultima-soul
6edec5bc3d
Merge pull request #1437 from LOuroboros/oblivious 
Tweaked Oblivious
 2021-06-04 16:51:38 -07:00
ExpoSeed
0e96b47584 Review comments 2021-06-04 18:50:11 -05:00
LOuroboros
b552db7193 Tweaked the Oblivious immunities 
Pokémon that are infatuated or taunted and obtain Oblivious through Skill Swap will now be healed of said conditions and a text string signaling it will be printed.
 2021-06-04 19:23:07 -03:00
DizzyEggg
4b744374c8 Allow larger exp gains 2021-06-03 23:17:44 +02:00
ultima-soul
2813b4f9bf
Merge pull request #1519 from DizzyEggg/flameburst 
Fix FlameBurst
 2021-06-03 09:30:50 -07:00
ultima-soul
e5a3123b8c
Merge pull request #1505 from MissingNoL/Decaps-and-Miracle-Eye-Text-Fixes 
Decaps and Miracle Eye text fixes
 2021-06-03 09:06:15 -07:00
ultima-soul
9584b8539f
Merge pull request #1492 from LOuroboros/battle_debug 
Tweaked src/battle_debug.c to comply with the PE
 2021-06-03 09:01:37 -07:00
ultima-soul
87db8c6f51
Merge pull request #1486 from LOuroboros/clanging_scales 
Implemented Clanging Scales' effect
 2021-06-03 08:51:00 -07:00
LOuroboros
b67e82c7c1
Syntax change #2 
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
 2021-06-03 05:17:52 -03:00
LOuroboros
cb4f16a178
Syntax change #1 
Though I don't like it, personally.

Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
 2021-06-03 05:17:41 -03:00
MissingNoL
1022d34218
Update src/data/text/move_descriptions.h 
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
 2021-06-03 01:16:03 -07:00
LOuroboros
b215b44951 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into clanging_scales 2021-06-03 05:09:14 -03:00
DizzyEggg
85ff866998 Fix FlameBurst 2021-06-03 09:50:43 +02:00