ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-02 15:50:45 +01:00
Code Issues Packages Projects Releases Wiki Activity
8,738 Commits 1 Branch 0 Tags 235 MiB
adecc77fe8
Commit Graph

1354 Commits

Author SHA1 Message Date
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
ghoulslash
a595b213b4 merge with be 2021-03-28 17:29:22 -06:00
GriffinR
7a5c6d4d86 Standardize Friendship/Happiness 2021-03-27 17:27:20 -05:00
ultima-soul
5bab9474dc Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-03-22 23:08:19 -07:00
GriffinR
6127c6f32e Misc labels in battle facilities 2021-03-22 15:30:19 -05:00
GriffinR
22e2c0a47c Document Berry Crush 2021-03-18 15:18:23 -04:00
BuffelSaft
7d237d8ff6 Implement Body Press' effect 
Body Press calculates damage using the user's defense stat instead of its attack. Also adds a special variant of the effect that uses the special defense stat.
 2021-03-16 22:56:44 +13:00
amiosi
b081a00891 Merge branch 'battle_engine' into old_findings 2021-03-13 09:59:09 -05:00
Eduardo Quezada D'Ottone
292993e360
Merge pull request #1338 from ghoulslash/ripen 
Add Ripen and Finish Gen4 Berries
 2021-03-13 11:16:42 -03:00
LOuroboros
68980cf18c Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gulp_missile 2021-03-10 03:58:21 -03:00
ghoulslash
d5004638a9
Update include/constants/battle_config.h 
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2021-03-09 16:35:47 -07:00
ghoulslash
3f9bf5acc0 merge with be 2021-03-09 10:33:48 -07:00
GriffinR
55a40b901f Label battle tower link script 2021-03-04 19:30:19 -06:00
Evan
2ccdf1d89e merge with be. magic guard checks 2021-03-03 09:21:06 -07:00
ghoulslash
3a30fe900a
Update include/constants/hold_effects.h 
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
 2021-03-03 09:13:49 -07:00
ultima-soul
e5fa583a08
Merge pull request #1334 from ghoulslash/gen8_abilities 
More Gen 8 Abilities
 2021-03-01 10:40:09 -08:00
Evan
6cb8c6309a merge with be 2021-03-01 11:28:51 -07:00
Evan
55649a67cc Merge branch 'terrain' of https://github.com/ghoulslash/pokeemerald into terrain 2021-03-01 11:23:05 -07:00
Evan
55b8538f68 merge with be 2021-03-01 11:22:37 -07:00
ultima-soul
f6147ee054
Merge pull request #1356 from ghoulslash/tailwind_turns 
Update tailwind timer To Gen5
 2021-03-01 08:51:40 -08:00
GriffinR
c6141fea83 Document easy chat 2021-02-24 11:03:45 -05:00
GriffinR
1cac608dbe Document mail 2021-02-24 11:03:39 -05:00
GriffinR
06ae5a37e2
Merge pull request #1336 from GriffinRichards/giftribbons 
Document some ribbon usage
 2021-02-24 10:07:59 -05:00
GriffinR
fc3d6eb178
Merge pull request #1328 from GriffinRichards/doc-pokeuseitem 
Document PokemonUseItemEffects
 2021-02-22 12:15:19 -05:00
SphericalIce
381116b3c4 Add labels for cracked floor metatiles 2021-02-22 15:29:14 +00:00
GriffinR
02c1fbd733 Document ribbon TV show, add new ribbon IDs/size 2021-02-18 09:59:24 -05:00
GriffinR
e059c4fdfa Use new gift ribbons size, label unused ribbons 2021-02-17 14:11:45 -05:00
GriffinR
ee4af94a36
Merge pull request #1324 from GriffinRichards/doc-sb 
Document remainder of secret_base.c
 2021-02-15 17:41:55 -05:00
Deokishisu
7b2bf8c7e2 Rename obedient/fatefulEncounter to eventLegal 
Per discussion on pret, `obedient`/`fatefulEncounter` has been renamed to `eventLegal`, and all related functions and constants have been modified with this in mind.

Additionally, fixed some whitespace alignment issues in `script_cmd_table.h`, `pokemon.h`, and `tv.c` from the last commit.
 2021-02-15 14:54:35 -05:00
Deokishisu
b89c3e901e Fix giftRibbons Field in SaveBlock1 & Relabel Gift Ribbons in pokemon.h 
The giftRibbons field has been split out into proper subfields. The new ExternalEvent structs deal with interconnectivity between external games/peripherals and Emerald, such as PokéCoupon storage and the flag for receiving Wishmaker Jirachi.

The giftRibbon fields in `PokemonSubstruct3` have also been renamed to their appropriate ribbons, and commented with distribution info if applicable. The previous `fatefulEncounter` field was actually filler, and relabeled as such, while the obedient bit was renamed `fatefulEncounter`. All relevant constants and functions dealing with the Pokémon data structure were renamed with these changes in mind.
 2021-02-15 11:40:16 -05:00
GriffinR
5f58ea02c6
Merge pull request #1330 from sphericalice/hidden-to-buried 
Rename 'hidden' Trainers/obj events to 'buried'
 2021-02-14 21:48:21 -05:00
SphericalIce
56e047f949 Fix Lilcove Motel typos 2021-02-14 21:38:39 +00:00
SphericalIce
70ff6c3b84 Rename 'hidden' Trainers/obj events to 'buried' 2021-02-14 19:25:23 +00:00
GriffinR
be0699bd64
Merge pull request #1326 from GriffinRichards/doc-layouts 
Label unused layouts
 2021-02-14 14:22:28 -05:00
GriffinR
a85ac11b28
Merge pull request #1325 from GriffinRichards/constants-berrytree 
Add berry tree id constants
 2021-02-14 14:15:51 -05:00
Evan
d65d5cb8fd add AI_FLAG_SMART_SWITCHING, some burn checks 2021-02-14 09:37:04 -07:00
GriffinR
8634710996 Document PokemonUseItemEffects 2021-02-12 16:02:04 -05:00
Evan
f3d975e239 merge with be 2021-02-12 08:59:55 -07:00
LOuroboros
21ee6cb9fb Added constant labels for EV manipulating item effects 2021-02-12 07:26:11 -03:00
amiosi
1df295a582 battle config and zippy zap 
plus fix mirror move mistakes
 2021-02-11 17:11:07 -05:00
amiosi
c0ba7436af water shuriken and howl 2021-02-11 16:20:13 -05:00
GriffinR
20b76c6071 Fix swapped route 102 berries 2021-02-10 16:26:09 -05:00
GriffinR
2237d0748f Label unused layouts 2021-02-08 14:45:56 -05:00
GriffinR
0851c34bac Add berry tree id constants 2021-02-05 15:25:12 -05:00
GriffinR
a240481d5f Document secret_base.c 2021-02-05 12:08:25 -05:00
Deokishisu
ac43365d58 Fix "Compatibility" Misspelling 
Someone misspelled "compatibility" as "compatability" in the daycare-related files. This commit spells them correctly.
 2021-02-05 01:27:11 -05:00
Evan
f4d4cf262e fix screen cleaner, curious medicine, as one 2021-02-02 09:00:07 -07:00
ultima-soul
2a20d50904 Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-02-01 15:54:08 -08:00
Evan
9fcf7d2453 zero terrain timers for steel roll, remove unused move effectd 2021-01-28 13:51:39 -07:00
Evan
c009b51ae8 add grassy glide, misty explosion, steel roller, obstruct, behemoth, decorate, snipe shot 2021-01-28 13:27:00 -07:00
Evan
a37acb8345 coaching, lash out, burning jealousy 2021-01-28 12:21:11 -07:00
Evan
dd51edd881 add eerie spell, surging strikes, jungle healing 2021-01-28 10:51:00 -07:00
Evan
c003f1c023 check move effectiveness with status effects 2021-01-26 15:41:59 -07:00
GriffinR
0064333e4a Clean up scrcmd.c 2021-01-26 02:16:26 -05:00
Evan
5aff5333dc fix B_MEMENTO_FAIL comment 2021-01-21 12:05:01 -07:00
Evan
bfb7333507 memento gen4 failing 2021-01-21 12:03:30 -07:00
GriffinR
8fe4d004e3
Merge pull request #1305 from GriffinRichards/doc-battletv 
Document battle tv data
 2021-01-21 12:27:14 -05:00
Evan
4611c71bd1 merge with be 2021-01-21 08:55:14 -07:00
Evan
8ec12c665c merge with be 2021-01-20 17:36:13 -07:00
Evan
e61309dce6 merge with be 2021-01-20 17:34:24 -07:00
Evan
16d54b6d32 merge with be, add form checks to CanBattlerGetOrLoseItem 2021-01-20 14:28:03 -07:00
ExpoSeed
61db82e64a
Revert "Included global.h into battle_config.h" 2021-01-19 22:55:08 -06:00
GriffinR
6999b237eb
Merge pull request #1309 from GriffinRichards/misc-macro 
Use constants for item data, misc other constants/fixes
 2021-01-19 20:49:58 -05:00
ghoulslash
9d9da6a485
Update include/constants/battle_config.h 
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
 2021-01-19 15:01:51 -07:00
Evan
b576eb5247 fix var_terrain default, wording 2021-01-19 13:26:36 -07:00
GriffinR
752982552e Add FIRST_BALL, some FIRST_BERRY_INDEX usage 2021-01-19 13:39:18 -05:00
SphericalIce
2dfaba9472 Name color return values more accurately 2021-01-19 17:59:36 +00:00
SphericalIce
8de76ed533 Make broader use of RGB macros 2021-01-19 17:15:12 +00:00
GriffinR
cf9f8d01c5 Add misc item data constants 2021-01-19 05:49:20 -05:00
LOuroboros
77d714ead5 Included global.h into battle_config.h 
Fixes the dupplicated defines issue.
 2021-01-16 20:37:34 -03:00
Evan
a49b5d1ad0 prankster updated to gen 7 2021-01-16 16:14:36 -07:00
Evan
10b1d33d13 handle battler being affected by terrain 2021-01-16 12:05:51 -07:00
Evan
544d598506 update tailwind timer 2021-01-15 18:34:47 -07:00
Evan
449c2bcc34 add config option 2021-01-15 18:28:10 -07:00
Evan
0d8f804194 update mental herb to gen 5 2021-01-15 18:11:55 -07:00
Evan
f1d89b2d79 merge with be 2021-01-15 11:17:45 -07:00
ExpoSeed
b166e9a5e3
Merge pull request #1276 from LOuroboros/x_items_BE 
Reworked the effects of the X Items #1
 2021-01-15 12:05:07 -06:00
LOuroboros
c2f718d3d3 Implemented Cramorant's Gulp Missile form change 2021-01-14 17:23:09 -03:00
GriffinR
564278fd49 Document battle tv data 2021-01-14 06:29:59 -05:00
Evan
d571c8b028 B_TERRAIN_BG_CHANGE TRUE by default 2021-01-13 16:02:32 -07:00
Evan
d26605c9fe fix bad bg fade if no permanent terrain 2021-01-13 16:01:47 -07:00
Evan
9902f6e603 merge with be 2021-01-13 14:32:14 -07:00
GriffinR
b9e1b050e1 Label remaining battle types 2021-01-13 15:20:29 -05:00
Evan
56395a060f Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into ai 2021-01-13 09:23:07 -07:00
ghoulslash
fba17a96a4
Merge pull request #1253 from surskitty/battle_engine 
Increase readability of too-long names
 2021-01-12 09:20:53 -07:00
GriffinR
92de664f79 List battle animation indexes alongside tables 2021-01-11 16:07:16 -05:00
surskitty
29343ce1ec
Remove synonyms 
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
 2021-01-11 15:00:11 -05:00
opakedragon
cbaf9b38b2
rename string id to reflect usage 2021-01-11 08:48:00 -05:00
surskitty
f58539b602 Renaming the last two and fixing the merge conflict with PE. 2021-01-10 15:48:57 -05:00
surskitty
a0f1dcb9cf Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into battle_engine 2021-01-10 15:40:21 -05:00
Evan
1e22ae4cf2 merge with be 2021-01-10 09:08:25 -07:00
Evan
d4e4405cf5 merge with be 2021-01-10 09:04:21 -07:00
Evan
c95bfae701 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen8_hold_effects 2021-01-10 09:02:21 -07:00
Evan
e748db8ef4 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into ai 2021-01-10 08:58:16 -07:00
LOuroboros
3ffa7f993a Renamed some X Defend labels to reflect its new name in the IE 2021-01-10 01:58:02 -03:00
ultima-soul
b5b4efdaa0
Merge pull request #1314 from LOuroboros/battle_debug_constant 
battle_config.h tweaks
 2021-01-09 12:36:37 -08:00
Evan
b5128be68b eject packer invisible before openpartymenu 2021-01-08 08:02:00 -07:00
Evan
6dabff1ee3 merge with be 2021-01-07 21:24:21 -07:00
Evan
0118723a9c add eject button 2021-01-07 20:31:27 -07:00
Evan
5eb49722c0 add red card effect 2021-01-07 19:33:39 -07:00
SphericalIce
3c2a33b9b2 Use constants for max IVs & the random IV generation flag 2021-01-07 22:13:14 +00:00
ultima-soul
d2d961e447
Merge pull request #1262 from LOuroboros/gen8_abilities_BE 
Implemented various Gen. 8 abilities
 2021-01-07 13:31:17 -08:00
LOuroboros
8511ed57e4 Tweaked Steam Engine's battle string 2021-01-07 18:13:16 -03:00
ghoulslash
c392a2011e
Merge pull request #1325 from ExpoSeed/BE/sync 
Sync battle engine
 2021-01-07 12:13:26 -07:00
LOuroboros
3d124944b3 Review correction to B_X_ITEMS_BUFF's comment 2021-01-07 16:09:23 -03:00
LOuroboros
cb22cbd3f6 Tweaked preprocessor constant in include/constants/item_effects.h 2021-01-07 16:06:55 -03:00
Evan
7fffe23e63 add terrain seeds 2021-01-06 20:22:05 -07:00
Evan
d5d2cac60c init branch 2021-01-06 14:42:45 -07:00
Evan
aac3f9c3db kee, maranga, sitrus beries 2021-01-06 13:07:18 -07:00
Evan
7646855e79 jaboca, rowap berry effects 2021-01-06 11:15:56 -07:00
Evan
efa4fe89ad micle berry 2021-01-06 10:47:07 -07:00
Evan
f2e486eb0d custap berry effect, custap/quick claw activation message 2021-01-06 09:37:31 -07:00
Evan
4c1e8f2f2e add curious medicine 2021-01-05 20:02:11 -07:00
Evan
0a3908ee92 add neigh and as one abilities 2021-01-05 19:37:23 -07:00
Evan
f21b0140b9 revert to CheckViability and stat change effect viabilities 2021-01-04 19:39:59 -07:00
Evan
5ae1e3c25b Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into ai 2021-01-04 11:43:36 -07:00
LOuroboros
dbc3690282 Tweaked preprocessor directives 
Changed #ifdef X_ITEMS_REWORK == FALSE to #ifndef ITEM_EXPANSION
Changed #ifdef X_ITEMS_REWORK == TRUE to #ifdef ITEM_EXPANSION
 2021-01-04 03:58:31 -03:00
LOuroboros
517c8ffdd0 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen8_abilities_BE 2021-01-03 22:05:14 -03:00
ExpoSeed
7dadcb94b8 Merge branch 'master' of https://github.com/pret/pokeemerald into HEAD 2021-01-03 17:14:43 -06:00
BuffelSaft
10cf5b3673 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into Batte_Engine_Only 2021-01-04 10:55:30 +13:00
Evan
f172245ad6 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into totem 2021-01-01 08:49:43 -07:00
ExpoSeed
24362e8bed
Merge pull request #1250 from ghoulslash/infestation 
infestation between turn anim
 2020-12-31 18:06:13 -06:00
surskitty
aa9796a6ae Renaming constants for High Jump Kick, Faint Attack, Smelling Salts, and Vise Grip. 2020-12-31 18:57:36 -05:00
GriffinR
769ddf22c2 Label remaining subs in battle_tower.c 2020-12-24 16:18:47 -05:00
Evan
59813c9ce7 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into be_config 2020-12-23 10:27:54 -07:00
ghoulslash
450ac70ab2
Merge pull request #1288 from LOuroboros/comments 
Some more small battle_config.h tweaks
 2020-12-23 10:27:09 -07:00
LOuroboros
320cc37ac9 USE_BATTLE_DEBUG -> B_ENABLE_DEBUG 2020-12-23 14:04:14 -03:00
LOuroboros
b3c5613ff7 battle_config.h tweaks 
-Moved the USE_BATTLE_DEBUG constant from include/battle_debug.h
-Slight correction to a few comments in battle_config.h
 2020-12-23 13:16:01 -03:00
Evan
a426092006 fix sticky barb theft in trainer battles 2020-12-22 08:35:11 -07:00
ghoulslash
0af8cab87e
Merge pull request #1283 from LOuroboros/ct_moves_data 
Added the data of SwSh's Crown Tundra's moves
 2020-12-21 23:13:23 -07:00
Evan
5bdf266000 add additional item theft check 2020-12-20 19:06:50 -07:00
Evan
a0b9ece980 merge with BE 2020-12-20 16:39:50 -07:00
Evan
21e7d6d318 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into ai 2020-12-20 16:33:43 -07:00
Evan
7988a1f41d Ai_TryOnAlly and reorganize files 2020-12-20 14:47:20 -07:00
Evan
31ec3e8479 non-partner good move checks 2020-12-19 21:58:23 -07:00
LOuroboros
a417a1b2b9 Corrected Punk Rock's checks 2020-12-19 16:18:39 -03:00
Evan
916d0416e3 outline AI_CheckGoodMove 2020-12-15 21:57:33 -07:00
Evan
b85dacce9d fix conflicts 2020-12-14 08:50:41 -07:00
Evan
67fefd0261 var terrain, surge fixes 2020-12-13 19:42:48 -07:00
Evan
97172fc5b5 merge with be 2020-12-13 17:21:22 -07:00
Evan
ead8637e4f Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into infestation 2020-12-13 17:09:04 -07:00
Evan
ac332d5e98 check bad move 2020-12-13 15:02:21 -07:00
Tim Gates
581306db7b
docs: fix simple typo, redunant -> redundant 
There is a small typo in include/constants/battle_frontier.h.

Should read `redundant` rather than `redunant`.
 2020-12-13 22:14:50 +11:00
Eduardo Quezada D'Ottone
47d96aed3c
Merge pull request #1285 from LOuroboros/spite 
Updated Spite
 2020-12-12 22:27:26 -03:00
Eduardo Quezada D'Ottone
db9933ce67
Merge pull request #1244 from ghoulslash/popup 
toggleable manual ability popup destruction
 2020-12-12 20:36:55 -03:00
LOuroboros
55bc2b4bb9 Corrected small inconsistency in move flag names 2020-12-12 12:18:56 -03:00
LOuroboros
31d483ef44 Some more battle_config.h tweaks 2020-12-12 11:35:05 -03:00
LOuroboros
c5e04cf243 Removed the unnecessary Dragon Energy effect 
The move is an Eruption clone, whose effect was already done. Thanks to BuffelSaft for the heads up.
I took the chance and fixed its target too.
 2020-12-12 01:35:54 -03:00
LOuroboros
33d7f22494 Improved the comment of B_STANCE_CHANGE_FAIL 2020-12-11 21:54:17 -03:00
LOuroboros
17a9555715 Oopsie. 2020-12-11 21:43:18 -03:00
LOuroboros
9ec2e44f4c Updated Spite 2020-12-11 21:36:59 -03:00
LOuroboros
0ac026e6ca Added the data of SwSh's Crown Tundra's moves 
And Dragon Energy's effect. Eerie Spell's is the only one missing out of this bunch.
 2020-12-11 20:49:23 -03:00
LOuroboros
c930a63c84 Implemented Punk Rock 2020-12-11 19:46:33 -03:00
LOuroboros
2b0702ec04 Implemented Perish Body 
Inspired by Raguzero's implementation.
 2020-12-11 19:44:32 -03:00
LOuroboros
7d8b8083e8 Implemented Sand Spit 2020-12-11 16:47:23 -03:00
LOuroboros
322918e280 Implemented Steam Engine 
And I also made the BattleScript created for Anger Point a bit more neutral friendly so it can be reused on situations like this.
 2020-12-10 18:27:35 -03:00
Evan
34dd11448b sticky barb transfer + pickpocket combo, fix CanBattlerGetOrLoseItem 2020-12-09 10:28:18 -07:00
Evan
a93a8b2194 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into battle_engine 2020-12-08 20:50:43 -07:00
LOuroboros
791d561f14 Reworked the effects of the X Items 
Thanks to Karathan's indications.
 2020-12-08 18:24:42 -03:00
GriffinR
f95192ed87 Define terminal species IDs relatively 2020-12-08 00:45:05 -05:00
BuffelSaft
72b769ec75 Add config options for Jump Kick 
Added options for:
- Gen 4 style recoil when target is immune (user takes 50% of target's max HP)
- Gen 3 style recoil when target is immune (i.e no recoil)
- Gen 5+ recoil was already implemented but was bugged
 2020-12-07 19:30:31 +13:00
Evan
d5ad14c349 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into popup 2020-12-05 21:03:20 -07:00
Evan
21cab1b7a7 better negative totem boost system, totems occur before switch in abilities 2020-12-05 21:00:51 -07:00
LOuroboros
6a0fee9c56 Fixed Intrepid Sword and Dauntless Shield 
And also introduced a new BattleString for BattleScript_BattlerAbilityStatRaiseOnSwitchIn
 2020-12-05 14:03:13 -03:00
Evan
39cbc21925 fix trainer theft, update config option 2020-12-03 08:42:12 -05:00
LOuroboros
9e1d7cc827 Implemented Ball Fetch 2020-12-02 23:09:35 -03:00
Evan
dcefaf2563 anim particle changes false by default 2020-12-01 18:01:02 -05:00
Evan
4ad5e368a9 fix merge conflicts 2020-12-01 17:57:57 -05:00
Evan
1e68c46890 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into infestation 2020-12-01 17:51:38 -05:00
Evan
5478179464 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into battle_anims 2020-12-01 17:46:26 -05:00
ExpoSeed
aa7facf57b
Merge pull request #1243 from ghoulslash/abilities 
Finish Switch In Ability Activation Messages
 2020-11-28 20:27:32 -06:00
Evan
7c6e74ab69 update terrain bg config option comment 2020-11-24 21:17:31 -05:00
Evan
6c0878b5fe infestation between turn anim 2020-11-24 17:21:59 -05:00
GriffinR
513c7c5f45 Clarify Kecleon objects 2020-11-23 14:42:47 -05:00
Evan
ef43596a79 toggleable manual ability popup destruction 2020-11-19 15:16:27 -07:00
Evan
07a4400d50 finish switch in ability messages 2020-11-19 11:42:00 -07:00
Evan
99d9a36860 add totem boosts 2020-11-19 10:35:37 -07:00
Evan
5c658c6950 config option for terrain bg change 2020-11-17 20:26:09 -07:00
Evan
c026f705b3 permanent terrain move bgs 2020-11-17 19:45:27 -07:00
ultima-soul
63bd0ec836 Remove Cacophony and fix some Gen 8 ability descriptions to fit. 2020-11-16 15:42:09 -08:00
ultima-soul
e32659d4bb Merge branch 'battle_engine' into ability_expansion and add Gen 8 DLC abilities. 2020-11-16 13:50:26 -08:00
Eduardo Quezada D'Ottone
4da357aef4 Fixed compatibility with Pokémon Expansion 2020-11-15 13:35:02 -03:00
ghoulslash
686ff59b11
Merge pull request #13 from AsparagusEduardo/PR-LGPE_IOA_Moves 
LGPE & Isle of Armor move data.
 2020-11-15 08:29:10 -07:00
Eduardo Quezada D'Ottone
f0154028ff Review changes 2 2020-11-14 09:01:43 -03:00
Evan
a05d8f7d43 fix conflicts 2020-11-13 11:21:15 -07:00
Evan
435f928aa4 opponent trainer theft config option. Clean up code a bit 2020-11-13 11:00:44 -07:00
Eduardo Quezada D'Ottone
e87f0f1ddb Review changes 2020-11-13 14:51:50 -03:00
ultima-soul
236d7145ae
Merge pull request #1220 from AsparagusEduardo/BE-SteelResistances 
Added config option for Steel type resistances.
 2020-11-12 23:25:21 -08:00
Evan
64bcac4589 move pickpocket to back of moveend sequence 2020-11-12 23:30:00 -07:00
ultima-soul
c3423b4212
Merge pull request #1206 from ExpoSeed/type-changing-moves 
Refactor move effects for type changing moves
 2020-11-12 19:10:48 -08:00
Eduardo Quezada D'Ottone
4b9d0d8e24 Added config option for Steel type resistances. 2020-11-11 17:48:02 -03:00
ExpoSeed
0912577ea1
Merge pull request #575 from AsparagusEduardo/BE-WishMegaEvo 
Implemented Wish Mega Evolution
 2020-11-11 11:05:06 -06:00
Eduardo Quezada D'Ottone
e021a4aa87
Critical Capture Config Option And Catching Charm #556 from ghoulslash 
Critical Capture Config Option And Catching Charm
 2020-11-10 17:31:08 -03:00
Eduardo Quezada D'Ottone
e6f8d57f08 Merge remote-tracking branch 'RHH/battle_engine' into BE-WishMegaEvo 
# Conflicts:
#	include/constants/battle_string_ids.h
 2020-11-10 17:28:17 -03:00
LOuroboros
bb4f00737e B_EXPANDED_INTIMIDATE->B_UPDATED_INTIMIDATE 2020-11-10 14:26:47 -03:00
Evan
de0518121e Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into battle_engine 2020-11-10 09:00:30 -07:00
LOuroboros
a25190f357 A few things. 
-Introduced a Gen. 8 styled text string for Intimidate
-Added an ability popup to BattleScript_IntimidatePrevented
 2020-11-10 10:34:51 -03:00
LOuroboros
e179b9b5fe Updated Intimidate to Gen. 8 standard 2020-11-10 10:18:16 -03:00
Eduardo Quezada D'Ottone
df4d927e31 Moved BATTLE_ENGINE define to global.h to fix reading from other branches 2020-11-09 12:45:31 -03:00
Eduardo Quezada D'Ottone
ddb6142709 Review changes 3. 2020-11-08 21:08:58 -03:00
Eduardo Quezada D'Ottone
35d5324324 Review changes. 2020-11-08 21:02:34 -03:00
Evan
03f480fa17 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into battle_engine 2020-11-08 15:21:48 -07:00
Evan
980f208b78 use NATIONAL_DEX_COUNT for critical capture odds 2020-11-08 14:07:43 -07:00
ExpoSeed
d2566c8988 Refactor Multi-Attack, Judgment, and Techno Blast to use the same move effect 2020-11-07 23:34:04 -06:00
ultima-soul
99fdc13e61 Merge branch 'master' into battle_engine_sync 2020-11-07 15:59:20 -08:00
Eduardo Quezada D'Ottone
09a5d6c722 Implemented Wish Mega Evolution 2020-11-07 10:13:32 -03:00
Evan
b3d1e8b5b8 turn crit capture odds into a ratio 2020-11-03 08:57:11 -07:00
Evan
e7372e7c5b add B_ prefix to critical capture configs 2020-11-01 21:50:34 -07:00
Evan
59692e8e7f styling fix 2020-11-01 21:08:58 -07:00
Evan
a6c3d950f6 critical capture config option and catching charm 2020-11-01 16:15:42 -07:00
Eduardo Quezada D'Ottone
5a201f006f
More exp options in battle_config (#530) from MandL27 2020-11-01 19:41:29 -03:00
ExpoSeed
1b65e1a1f0
Merge pull request #520 from ghoulslash/battle_engine 
Add Toggle Healthbox Visibility Feature
 2020-10-31 23:07:39 -05:00
aaaaaa123456789
1c3d75f673 Merge branch 'master' into reverts 2020-10-26 12:16:36 -03:00
Eduardo Quezada
ae60ae8a2d Review changes. 2020-10-24 03:07:45 -03:00
Eduardo Quezada
b5834b617d Merge branch 'BattleEngine' into PR-LGPE_IOA_Moves 
# Conflicts:
#	src/data/text/move_descriptions.h
 2020-10-24 00:36:29 -03:00
Kurausukun
44c2d15ca9 re-match sub_81C79BC (from #1177) 
also re-define RBG macros
 2020-10-23 22:07:30 -04:00
Eduardo Quezada
d596fa7e12 Merge remote-tracking branch 'RHH/battle_engine' into PR-MoveSplitOption 
# Conflicts:
#	include/battle_util.h
#	include/constants/battle_config.h
#	src/battle_util.c
 2020-10-23 21:49:59 -03:00
Kurausukun
90211248af re-match Cmd_unknown_24 (from #1140) 
changes to data structs are necessary. other things that look
unnecessary, like the order of operands, are also necessary. fuck this
function.
 2020-10-23 20:47:10 -04:00
ExpoSeed
34729ce99c
Merge pull request #150 from AsparagusEduardo/PR-MoreBattleConfigs 
More Battle Config options
 2020-10-23 10:59:12 -05:00
MandL27
6d5547bdb4 fix indentation 2020-10-21 16:20:49 -04:00
MandL27
efdaa25640 Add B_SCALED_EXP and B_SPLIT_EXP 2020-10-21 16:19:07 -04:00
LOuroboros
503134167a Review corrections 2020-10-21 15:01:53 -03:00
LOuroboros
4794c63066 Reincorporated badge based stat boosts 2020-10-21 12:57:57 -03:00
Eduardo Quezada
8f9659f846 Fixed Pika Papow's name. 2020-10-19 11:45:54 -03:00
Eduardo Quezada
a23e9a8a37 Adapting move changes (part 2) + Hyperspace Fury type. 2020-10-18 12:07:11 -03:00
Eduardo Quezada
3342573881 Updated name of setting. 2020-10-18 11:19:39 -03:00
Eduardo Quezada
b1903af8c1 Adapting move changes (part 1) 2020-10-17 23:08:39 -03:00
Eduardo Quezada
faca6c4867 Organized interface settings into their own category. 2020-10-17 14:31:58 -03:00
Eduardo Quezada
815b525855 Configurable double wild battle chance, surfing double battles and flag for forcing them. 2020-10-17 14:25:43 -03:00
Eduardo Quezada
6c9f864651 Tweaking battle_config to accomodate pokemon_config and item_config 2020-10-17 10:52:44 -03:00
Evan
bd26919acc Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into battle_engine 2020-10-15 18:25:21 -06:00
Eduardo Alvaro Quezada D'Ottone
1df696c1fb
Merge pull request #17 from LOuroboros/move_updates 
Updated many moves' data to Gen. 8 standards
 2020-10-15 20:56:58 -03:00
Eduardo Quezada
a6e88b82ee Review changes and option to hide split icon. 2020-10-15 20:15:44 -03:00
LOuroboros
e4635525e7 Renamed the HOLD_EFFECT_EV_BOOST label 2020-10-15 04:52:03 -03:00
LOuroboros
5257ef70df Oopsie, the Gen. 8 effect should be the default one 2020-10-15 04:31:44 -03:00
LOuroboros
fcc3c6c6ba Added a way to quickly switch Rapid Spin's move effect from Gen. 3 to 8 2020-10-15 04:21:40 -03:00
Eduardo Quezada
0d39b29691 Option to use Gen 3 Physical/Special split. 2020-10-15 00:16:50 -03:00
Eduardo Quezada
47259092e3 LGPE & Isle of Armor move data. 2020-10-14 21:50:22 -03:00
Evan
c9504ca749 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into battle_engine 2020-10-13 11:34:41 -06:00
ExpoSeed
9e2c8a95c1 Sync bev2 with pret 2020-10-11 01:01:47 -05:00
Evan
5ab17cc713 Merge branch 'battle_engine_v2' of https://github.com/dizzyeggg/pokeemerald into battle_engine 2020-10-09 09:13:17 -06:00
GriffinR
65a4e06737 Add ITEM6_HEAL constants, change move flags to shifts 2020-10-05 18:48:51 -04:00
GriffinR
66bd1e6d3f Use constants for item digits 2020-09-25 11:18:52 -04:00
aaaaaa123456789
7dc95a0103 Undo PokeCodec's PRs 
This commit undoes most of PokeCodec's PRs after the debate in chat. Some
harmless or completely superseded PRs have been left alone, as there is not
much benefit in attempting to undo them.

Reverts #1104, #1108, #1115, #1118, #1119, #1124, #1126, #1127, #1132, #1136,
#1137, #1139, #1140, #1144, #1148, #1149, #1150, #1153, #1155, #1177, #1179,
#1180, #1181, #1182 and #1183.
 2020-09-13 06:30:55 -03:00
DizzyEggg
97d0643110 Merge with master 2020-09-08 12:48:28 +02:00
PokeCodec
3d87a88067 Make battle pyramid defines into enums 2020-09-04 19:49:53 -04:00
PokeCodec
3a2a2b6ba9 Fix issues according to feedback 2020-09-04 19:49:53 -04:00
PokeCodec
d4158e490a Match more functions 2020-09-04 19:49:53 -04:00
PikalaxALT
135ed6a162
Merge pull request #1163 from GriffinRichards/doc-animthrow 
Minor battle_anim_throw cleanup
 2020-09-04 19:44:33 -04:00
GriffinR
f5495d1220 Give proper names to underwater maps 2020-09-01 03:03:14 -04:00
GriffinR
afb3472282 Minor battle_anim_throw cleanup 2020-08-30 15:11:44 -04:00
GriffinR
a9719c92bf
Merge pull request #1160 from kiliwily/master2 
add MAX_LEVEL_UP_MOVES macro
 2020-08-28 19:18:03 -04:00
kiliwily
c68c2b66e8 add more macros 2020-08-29 01:02:20 +02:00
GriffinR
09cfed64b5
Merge pull request #1146 from GriffinRichards/rename-songs 
Give songs meaningful english names
 2020-08-28 16:14:21 -04:00
kiliwily
5e7b6a089c add MAX_LEVEL_UP_MOVES macro 2020-08-28 20:36:07 +02:00
Thomas Winwood
58786a7ac0 Add MAX_PER_STAT_EVS macro 2020-08-28 02:25:02 +01:00
DizzyEggg
f70a9ce153 Merge with master 2020-08-27 12:01:28 +02:00
GriffinR
fbb70b3727 Document contest AI scripts 2020-08-21 14:57:17 -04:00
GriffinR
ee72696b53 Sync encounter musics with encounter music types 2020-08-20 21:03:24 -04:00
GriffinR
d356e35b64 Fix incorrect pike curtain SE names 2020-08-20 20:23:08 -04:00
GriffinR
3014241179 Give songs meaningful english names 2020-08-20 19:06:14 -04:00
GriffinR
6c34effda9
Merge pull request #1138 from GriffinRichards/doc-contest 
Document contest
 2020-08-20 16:03:47 -04:00
PokeCodec
e27975afaa Match battle script commands by correcting a function and the pokemon struct 2020-08-18 22:05:01 -04:00
GriffinR
503dafd210 Fix wallys parents misnamed as uncle/aunt 2020-08-18 17:51:41 -04:00
GriffinR
65bd2faf94 Merge branch 'master' of https://github.com/pret/pokeemerald into doc-contest 2020-08-16 05:59:10 -04:00
GriffinR
2749948eeb Clean up contest doc 2020-08-16 05:52:17 -04:00
GriffinR
e98e4652fd Document contest live updates 2020-08-16 05:18:09 -04:00
GriffinR
70851d9083 Add MAP_SCRIPT descriptions 2020-08-11 15:50:09 -04:00
GriffinR
8b95e1964b
Merge pull request #1121 from GriffinRichards/doc-roulette 
Document roulette
 2020-08-10 17:18:09 -04:00
GriffinR
078c341b2b
Merge pull request #1122 from GriffinRichards/clean-battlemsg 
Add stat stage constants, clean up misc battle msg data
 2020-08-10 14:29:27 -04:00
GriffinR
5e8ffff62f Add stat stage constants 2020-08-04 20:38:57 -04:00
PikalaxALT
03eba6a62c
Merge pull request #1116 from GriffinRichards/doc-slotmachine 
Document slot machine
 2020-08-01 09:56:44 -04:00
GriffinR
22b5b6b074 Start documenting roulette 2020-07-30 19:37:16 -04:00
GriffinR
7ada56f039
Merge pull request #1085 from GriffinRichards/doc-overworld 
Document field effects / misc overworld
 2020-07-28 17:54:25 -04:00
GriffinR
1f4813bfd2 Document slot machine funcs 2020-07-28 17:38:05 -04:00
DizzyEggg
0066640a1e Merge with master 2020-07-27 14:51:39 +02:00
GriffinR
36a4764a78 Document some slot machine data 2020-07-26 02:15:59 -04:00
GriffinR
2439f42de4 Add warnings to generated files 2020-07-24 03:43:37 -04:00
GriffinR
aca50c87be Continue new contest documentation 2020-07-24 00:14:53 -04:00
GriffinR
52a4428ba6 Begin new contest documentation 2020-07-23 17:55:40 -04:00