ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-06 09:33:22 +01:00
Code Issues Packages Projects Releases Wiki Activity
8,655 Commits 1 Branch 0 Tags 235 MiB
9df66f4ac1
Commit Graph

1333 Commits

Author SHA1 Message Date
ghoulslash
bbd09fdcf7 add wandering spirit 2021-10-12 10:32:51 -04:00
ghoulslash
06bcfea3b8 merge with be 2021-10-10 19:56:33 -04:00
Eduardo Quezada D'Ottone
c3f8b77d82 Setting for pre-Gen6 Hidden Power Damage. 2021-10-10 20:26:38 -03:00
Eduardo Quezada D'Ottone
7798468ce9
Merge pull request #1738 from BuffelSaft/safety-googles 
Fix Safety Googles
 2021-10-10 18:34:20 -03:00
Eduardo Quezada D'Ottone
cf6e3873b4 Moved Electrified to Status4. 2021-10-10 01:13:23 -03:00
Eduardo Quezada D'Ottone
903c4cbf68 Config for Blizzard + Hail 2021-10-09 23:52:37 -03:00
Eduardo Quezada D'Ottone
004f705607
Merge pull request #1549 from ghoulslash/last_ball 
add last used ball
 2021-10-09 17:27:28 -03:00
LOuroboros
91a68cd5db Implemented Primal Reversion 2021-10-09 00:36:41 -03:00
BuffelSaft
274e964d91 Fix Safety Googles 
Fix typo and update gLastUsedItem before calling the safety goggles battle script.
 2021-10-09 15:05:01 +13:00
BuffelSaft
fbc4d7584e
Merge pull request #1610 from LOuroboros/primalAbilities 
Implement Desolate Land, Primordial Sea and Delta Stream
 2021-10-08 20:01:09 +13:00
ghoulslash
4aeadd96c9 merge with be 2021-10-06 14:49:23 -04:00
ghoulslash
391cfabcac merge with be 2021-10-06 14:31:21 -04:00
ghoulslash
ee3a2c97ee Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into last_ball 2021-10-06 13:54:40 -04:00
ghoulslash
4382420dd2 merge with be 2021-10-06 13:32:59 -04:00
ultima-soul
ce4375a10c Ported new Ball catch rate modifier effects from Item Expansion. 2021-10-06 10:28:18 -07:00
ghoulslash
1f4844c7f5
Merge pull request #1710 from AsparagusEduardo/BE_Struggle 
Implemented modern effect of struggle with config
 2021-10-06 09:27:10 -04:00
ghoulslash
245ef1ad2d
Merge pull request #1715 from AsparagusEduardo/BE_ShadowTag 
Config for Shadow Tag vs Shadow Tag
 2021-10-06 09:02:58 -04:00
Eduardo Quezada D'Ottone
43d42c95cf Terrain Pulse effect implemented 2021-10-04 22:45:37 -03:00
LOuroboros
b85b3094c8 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into primalAbilitiesDev 2021-10-03 07:05:56 -03:00
Eduardo Quezada D'Ottone
978f73475b Config for Shadow Tag vs Shadow Tag 2021-10-02 19:01:11 -03:00
Eduardo Quezada D'Ottone
57ea20bc6d Implemented modern effect of struggle with config 2021-10-02 13:32:36 -03:00
LOuroboros
c464b1b5dd STRINGID_ATTACKERBECAMEASHGRENINJA -> STRINGID_ATTACKERBECAMEASHSPECIES 2021-10-01 23:12:59 -03:00
LOuroboros
f3ded43a88 Implemented Battle Bond 2021-10-01 22:49:17 -03:00
ghoulslash
761006a164 merge with be 2021-09-26 19:19:32 -04:00
LOuroboros
1b039062da Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gulp_missile 2021-09-25 22:20:34 -03:00
Syreldar
4c05520bf3 Fixed Retaliate's naming. 2021-09-24 16:02:26 +02:00
ghoulslash
2f69748e0d merge with be 2021-09-23 14:38:01 -04:00
ghoulslash
94ec25319f syntax fixes. Use BlocksPrankster for perish song battle script 2021-09-23 14:35:37 -04:00
ghoulslash
33972b5493 merge with be 2021-09-23 12:04:13 -04:00
ghoulslash
d738297f24 merge with be 2021-09-22 16:26:09 -04:00
ghoulslash
1309eea8ec Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen8_move_effects 2021-09-22 09:43:48 -04:00
ghoulslash
13062b5a8f fix lash out, obstruct, and decorate 2021-09-22 09:43:40 -04:00
Eduardo Quezada D'Ottone
287ffff2e2
Merge branch 'battle_engine' into burmy-form-change 2021-09-21 22:34:37 -03:00
ghoulslash
0ea6c65b83 merge with be 2021-09-17 09:10:09 -04:00
ghoulslash
faa963fd04 merge with be 2021-09-17 09:07:38 -04:00
ghoulslash
b916d7991c merge with be 2021-09-16 21:52:29 -04:00
ghoulslash
e756b0accc merge with be 2021-09-16 21:41:29 -04:00
ghoulslash
af8d86f0c9 merge with be 2021-09-16 13:33:35 -04:00
ghoulslash
c2e0990aab fix some merge conflicts 2021-09-16 13:29:36 -04:00
ghoulslash
9d8672e3df merge with be 2021-09-16 13:12:59 -04:00
ghoulslash
ac42b19de7 some formatting fixes 2021-09-16 11:54:27 -04:00
ghoulslash
aac7ae3595 add MOVE_TARGET_ALL_BATTLERS 2021-09-16 10:45:33 -04:00
ghoulslash
9c94eb6140 but it failed check for rototiller 2021-09-16 10:24:32 -04:00
ghoulslash
f61d516aad some syntax/format fixes 2021-09-15 17:15:50 -04:00
ghoulslash
aa475ab300 merge with be 2021-09-15 16:42:23 -04:00
ghoulslash
0bca01cb74 mental herb fixes 2021-09-15 12:56:58 -04:00
ghoulslash
b85586a33a merge with be 2021-09-15 12:54:39 -04:00
ghoulslash
60713a8f2d fix room service activation msg, stat target 2021-09-14 12:50:36 -04:00
ghoulslash
95af97593b fix some comment styling. fix throat spray for multi-target moves 2021-09-14 11:53:35 -04:00
ghoulslash
f3f26d1a6f merge with be 2021-09-13 19:40:28 -04:00
ghoulslash
d7938bc2dc Merge branch 'prankster' of github.com:ghoulslash/pokeemerald into prankster 2021-09-09 09:44:25 -04:00
ghoulslash
b8a71cabd1 merge with be 2021-09-09 09:44:18 -04:00
BuffelSaft
a4b630e6b5 Fix MOVE_EFFECT_REMOVE_STATUS 
Wake-Up Slap and Sparkling Aria now print the correct message when the target is cured.

Also, fix Ice Hammer's effect chance.
 2021-09-07 16:34:32 +12:00
DizzyEggg
cdec3077b2
Merge pull request #1630 from BuffelSaft/disguise2 
Fix many Disguise bugs
 2021-09-06 10:32:37 +02:00
BuffelSaft
bdbb4b5f7e Fix many Disguise bugs 
Use an unused hitmarker flag to indicate that an HP change shouldn't break Disguise.
 2021-09-06 18:27:42 +12:00
ghoulslash
933696b3cd merge with be 2021-09-03 17:41:00 -04:00
ghoulslash
6ce1227447 fix throat spray bugs. move shell bell, throat spray etc to life orb moveend case 2021-09-03 11:05:11 -04:00
ghoulslash
7c53214dad merge with be 2021-09-02 15:33:42 -04:00
ultima-soul
a10a02a536
Merge pull request #1221 from ghoulslash/battle_engine 
Implement Pickpocket
 2021-09-02 11:33:34 -07:00
ghoulslash
dfe59992d3 merge with be 2021-09-01 07:37:45 -04:00
LOuroboros
d2bcc2ad5b Added configs for modern post-battle stat calcs 2021-09-01 00:31:50 -03:00
LOuroboros
69b7910f47 Gave an entrance animation to Delta Stream 2021-08-31 00:15:17 -03:00
LOuroboros
9e4f33d09e Implemented Desolate Land, Primordial Sea and Delta Stream 2021-08-27 17:56:43 -03:00
ultima-soul
b620349da0 Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-08-16 15:43:27 -07:00
ghoulslash
c7c0fbc296 merge with be, make AI CanBeStatused functions separate from general util ones 2021-08-12 13:37:53 -06:00
ghoulslash
d218322b2c merge with be 2021-08-12 01:26:13 -04:00
ultima-soul
02c9e040df Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-08-11 16:33:10 -07:00
GriffinR
80348e7188
Merge branch 'master' into doc-itemmenu2 2021-08-11 19:01:47 -04:00
GriffinR
28a8fe191a Document item menu 2021-08-10 22:13:02 -04:00
BuffelSaft
30c983d9ca Define Burmy forms in battle engine 
Title. BE needs these to compile on its own.
 2021-08-08 13:14:51 +12:00
LOuroboros
b4c4650186 Corrected inconsistent flag label spelling 2021-08-05 17:26:03 -03:00
ghoulslash
ab529b4e89 add stuff cheeks 2021-07-27 10:31:48 -06:00
LOuroboros
f1195e1884 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gulp_missile 2021-07-27 09:08:52 -03:00
LOuroboros
8012f4b25a Re-ordered the hidden item flags list 
Instead of sorting them by location, it makes more sense to sort them by their value.
 2021-07-26 20:18:11 -03:00
ghoulslash
4ca6d76160 add bug bite 2021-07-25 14:55:52 -06:00
ghoulslash
c914ed8572 fix sucker punch, surging strikes, obstruct, and snipe shot 2021-07-25 09:38:54 -06:00
ghoulslash
a37d4c3da9 merge with be, give life dew jungle healing effect 2021-07-25 08:22:05 -06:00
LOuroboros
bfa824f761
Removed unused status ailment constants 2021-07-23 13:18:24 -03:00
ghoulslash
45d4cee243 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into last_ball 2021-07-18 11:11:03 -06:00
GriffinR
72bb2bd160
Merge pull request #1474 from GriffinRichards/clean-miragetower 
Clean up Mirage Tower
 2021-07-10 23:26:41 -04:00
GriffinR
0f538102d9 Add local id constants for C 2021-07-05 13:54:43 -04:00
ExpoSeed
fb69b65337 Fix redefinition error in battle_config.h 2021-07-02 14:36:55 -05:00
GriffinR
64d06f4c8f Condense battle AI scripts, minor clean up 2021-07-02 02:46:01 -04:00
GriffinR
8f43d1ebeb Document smart shopper TV show 2021-07-02 01:45:23 -04:00
GriffinR
10886a586b Clean up mirage tower 2021-07-01 23:46:15 -04:00
ghoulslash
c06029bc72 add last used ball 2021-06-25 13:37:59 -06:00
GriffinR
810b51f96c Clarify contest heart tiles 2021-06-21 13:48:03 -04:00
BuffelSaft
4c18cb7fe7 Remove EFFECT_THAW_HIT 2021-06-19 11:49:00 +12:00
MissingNoL
721dbe9178 Implemented all PLG effects 2021-06-12 18:01:35 -07:00
MissingNoL
610b18bfdb Implemented Double Iron Bash's effect 2021-06-12 14:27:50 -07:00
MissingNoL
beb126b534 Implemented Zippy Zap's effect 2021-06-12 13:58:54 -07: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
ultima-soul
092f02f119 Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-06-07 12:00:23 -07:00
MissingNoL
bfc66a21cc gBattlescriptCurrInstr[3] is not reading species parameter 2021-06-06 19:14:11 -07:00
MissingNoL
9cd522d254
Merge branch 'battle_engine' into Photon_Geyser 2021-06-05 16:46:28 -07:00
MissingNoL
921b80de7c
Update battle_script_commands.h 
Properly aligned the list of number IDs
 2021-06-05 16:40:03 -07:00
ultima-soul
3448e19275
Merge pull request #1459 from ExpoSeed/BE/rename-flags 
Rename flags
 2021-06-04 19:33:45 -07: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
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
LOuroboros
6ccb493f12 Adjusted the list of item hold effects 2021-06-02 17:23:58 -03:00
BuffelSaft
2a6b989c92 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into body-press 2021-06-02 12:41:28 +12:00
amiosi
b588e94395 more requested changes 2021-05-28 15:05:33 -04:00
MissingNoL
f30a9542ee Problem: Photon Geyser is calculating as Shell Side Arm?? Needs: Poison effect, contact move for Shell Side Arm 2021-05-27 22:21:55 -07:00
amiosi
f7651fd592 most fixes from requested changes 2021-05-27 15:55:19 -04:00
amiosi
fc81994579 Merge branch 'battle_engine' into old_findings 2021-05-27 15:28:02 -04:00
ghoulslash
5840b1f0ed utility umbrella effect 2021-05-24 09:52:45 -06:00
ghoulslash
c3e28e9b1a merge with be 2021-05-23 12:22:52 -06:00
ghoulslash
54b03a474d fix SIDE_STATUS_SCREEN_ANY 2021-05-23 12:22:07 -06:00
Eduardo Quezada D'Ottone
04c6331a60
Merge pull request #1432 from BuffelSaft/thousand_arrows 
Fix Thousand Arrows
 2021-05-21 11:40:13 -04:00
GriffinR
65fd334256 Name map groups 2021-05-11 10:16:04 -05:00
LOuroboros
95d41524a2 Implemented Clanging Scales' effect 2021-05-09 18:20:03 -03:00
Flametix
a8fab62c89 Fix Substitute typo 2021-05-06 20:49:04 -04:00
ultima-soul
e864c39a5d Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into battle_engine_sync 2021-05-04 10:04:35 -07:00
ultima-soul
56fc420187 Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-04-28 21:34:30 -07:00
GriffinR
f7a699c686
Merge pull request #1421 from GriffinRichards/doc-tvrecordmix 
Document TV
 2021-04-29 00:25:01 -04:00
GriffinR
58cef0ae52
Merge pull request #1418 from GriffinRichards/sync-ereaderhelp 
Sync e-reader helpers, document trainer hill e-reader
 2021-04-28 06:08:57 -04:00
ultima-soul
14a0303e2f Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-04-27 18:36:37 -07:00
GriffinR
aad090e154 Document TV 2021-04-26 12:35:35 -04:00
GriffinR
86475c5ded Document trainer hill ereader 2021-04-24 18:04:27 -04:00
GriffinR
bc9fc38254 Misc contest cleanup 2021-04-22 15:51:04 -04:00
GriffinR
dbe24f0baa Clean up contest_painting 2021-04-21 20:04:12 -04:00
ExpoSeed
27c6964a05 Merge branch 'num_ability_slots' into BE/num_ability_slots 2021-04-16 20:45:34 -05:00
ExpoSeed
49bb345338 Introduce NUM_ABILITY_SLOTS 2021-04-16 20:36:45 -05:00
GriffinR
82f870091e
Merge pull request #1400 from GriffinRichards/doc-pokemonanim 
Document Pokémon animation
 2021-04-13 01:36:15 -04:00
GriffinR
09a9efd5c5
Merge pull request #1398 from GriffinRichards/doc-field 
Document field
 2021-04-10 13:05:51 -04:00
GriffinR
f6016838b1
Merge pull request #1397 from GriffinRichards/doc-moremisc 
Clean up battle scripts
 2021-04-10 12:41:35 -04:00
GriffinR
72ba8cf58d Document pokemon animation types 2021-04-10 00:50:28 -04:00
ExpoSeed
8494306d1d Rename flags 2021-04-07 16:07:30 -05:00
GriffinR
4a1cfbead2 Document remaining overworld 2021-04-06 16:55:43 -04:00
GriffinR
86a9d94ce1 Document fieldmap 2021-04-06 16:05:43 -04:00
GriffinR
756fad0e61 Document some event object movement 2021-04-06 14:34:36 -04:00
GriffinR
00c3044c96 Clarify Groudon/Kyogre/Rayquaza gfx names 2021-04-06 02:38:15 -04:00
GriffinR
f4d8a91ba4 Misc battle script cleanup 2021-04-03 14:07:31 -04:00
GriffinR
9ea9ffde09 Add remaining multistring chooser constants 2021-04-03 11:49:06 -04:00
ultima-soul
939608f5b8 Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-04-02 13:16:40 -07:00
GriffinR
1b8d405b5e Add missing include guard suffixes 2021-04-02 12:54:40 -04:00
GriffinR
c9d3b26ff7 Label miss string indexes 2021-04-02 02:12:46 -04:00
GriffinR
8be2c5d60b Document Contest Lady TV Show 2021-04-02 01:49:38 -04:00
GriffinR
a0b3d4df12
Merge pull request #1390 from GriffinRichards/doc-introcred 
Document intro and credits sequences
 2021-04-01 23:13:59 -04:00
GriffinR
771a434730 Label Trend Watcher TV show texts 2021-03-31 16:29:42 -04:00
GriffinR
86856098a3 Document Dewford Trend 2021-03-31 16:08:42 -04:00
BuffelSaft
35add44a90 Thousand Arrows hits airborne targets 
Thousand Arrows now hits flying types, Pokémon with Levitate, Pokémon holding an Air Balloon, and Pokémon under the effect of Magnet Rise, Telekinesis etc.
Also fixed its effect chance, which was 0 instead of 100.
 2021-03-31 23:05:30 +13:00
GriffinR
50e9666e16
Merge branch 'master' into doc-introcred 2021-03-29 20:56:15 -04:00
GriffinR
c40fb9288c
Merge pull request #1378 from GriffinRichards/doc-berrycrush 
Document Berry Crush
 2021-03-29 12:38:16 -04:00
GriffinR
62968895ca Add MON_PIC_SIZE constant 2021-03-29 09:38:19 -04:00