ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-10 05:35:05 +01:00
Code Issues Packages Projects Releases Wiki Activity
7,720 Commits 1 Branch 0 Tags 235 MiB
aefd5e26d1
Commit Graph

623 Commits

Author SHA1 Message Date
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
aaaaaa123456789
bacc831aa9 Re-apply joypad macros (minus merge conflicts) 2020-11-02 22:02:39 -03:00
Evan
e7372e7c5b add B_ prefix to critical capture configs 2020-11-01 21:50:34 -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
MandL27
5c6b8376fc long equations on one line 2020-11-01 11:45:01 -05:00
aaaaaa123456789
1c3d75f673 Merge branch 'master' into reverts 2020-10-26 12:16:36 -03:00
Kurausukun
9ca406b15d port Cmd_forcerandomswitch fakematch fix 2020-10-26 00:17:26 -04:00
MandL27
bc5ba41f80 Document sExperienceScalingFactors 2020-10-24 02:02:58 -04: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
MandL27
9c574f3adb Fixed some comparison operators 2020-10-23 19:49:27 -04:00
MandL27
f8dabc37ae Use #if more often 
Avoided it on a couple lines to avoid splitting compound ifs.
 2020-10-23 12:44:20 -04:00
ExpoSeed
34729ce99c
Merge pull request #150 from AsparagusEduardo/PR-MoreBattleConfigs 
More Battle Config options
 2020-10-23 10:59:12 -05:00
Eduardo Quezada
d7c5ce3602 Idented battle_script_commands.c comments 2020-10-22 09:33:46 -03:00
MandL27
37aff56cc7 turns out gen 7 did indeed use a denominator of 5 2020-10-21 16:57:54 -04:00
MandL27
efdaa25640 Add B_SCALED_EXP and B_SPLIT_EXP 2020-10-21 16:19:07 -04:00
Eduardo Quezada
1bc38feca5 Fixed indentation for various files. 2020-10-19 18:01:19 -03:00
Eduardo Quezada
faca6c4867 Organized interface settings into their own category. 2020-10-17 14:31:58 -03:00
ExpoSeed
d4e58d9746 Fix style, sync moved functions properly 2020-10-13 09:40:01 -05:00
ExpoSeed
9e2c8a95c1 Sync bev2 with pret 2020-10-11 01:01:47 -05:00
GriffinR
5259898325 Replace POKEMON_SLOTS_NUMBER 2020-10-01 17:07:12 -05:00
Kaz
5a70f99e16 battle_script_commands.c: Eliminate the last nonmatching (swapped expressions). 2020-09-16 21:39:44 -04:00
Kaz
171154a097 Convert to -g; will be required for eliminating fakematches. 2020-09-16 19:36:30 -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
PokeCodec
c1286c2fe2 Change according to feedback 2020-09-10 18:07:46 -04:00
PokeCodec
029db24adb Make return 2020-09-10 09:32:36 -04:00
PokeCodec
56afdee7fc Remove register variable mention 2020-09-09 14:43:41 -04:00
PokeCodec
a3a8c23e00 Match battle_script commands 2020-09-09 11:18:04 -04:00
PokeCodec
779764b70d Fix Battle_Script_commands fakematch 2020-09-09 10:35:40 -04:00
DizzyEggg
97d0643110 Merge with master 2020-09-08 12:48:28 +02:00
PokeCodec
28ef2fb774 Switch to button macros 2020-09-04 21:11:55 -04:00
GriffinR
7c8bc0fbe3
Merge pull request #1149 from PokeCodec/datatypes 
gflib documenting
 2020-09-01 14:25:21 -04:00
hondew
e46b35455d Merge branch 'master' into pokeball-doc 2020-08-30 14:14:38 -04:00
hondew
328aecc96e Document throwing pokeball 
continue

Document more

Doc more funcs

Remove workspace

Document shiny stars

Document PokeBlock

Clean up

Clean more
 2020-08-30 14:08:06 -04:00
DizzyEggg
f70a9ce153 Merge with master 2020-08-27 12:01:28 +02:00
PokeCodec
86a1e89879 Documentation of unk field 2020-08-23 21:34:31 -04:00
GriffinR
3014241179 Give songs meaningful english names 2020-08-20 19:06:14 -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
cc4255d4c0 Add some charmap constant usage 2020-08-11 00:23:28 -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
DizzyEggg
a42bd3f37d Fix multiple turn moves staying after hitting no target 2020-08-05 12:35:51 +02:00
GriffinR
5e8ffff62f Add stat stage constants 2020-08-04 20:38:57 -04:00
ExpoSeed
71dc5edf2e Document some battle_util.c 2020-07-27 17:10:42 -05:00
DizzyEggg
0066640a1e Merge with master 2020-07-27 14:51:39 +02:00
GriffinR
aba42513d3 Clean up some battle scr cmd data 2020-07-18 18:10:15 -04:00
DizzyEggg
759bde46bb Cheek Pouch 2020-07-16 15:20:03 +02:00
DizzyEggg
ec4c73711e Rest Sleep Talk wake up awaraness 2020-07-15 21:30:24 +02:00
DizzyEggg
1a94d27fe6 Emergency Exit 2020-07-15 17:21:12 +02:00
ghoulslash
8f669bb57d
Add critical capture (#402) 
* add critical capture

* synax and format fixes
 2020-07-14 17:47:15 +02:00
DizzyEggg
78a1f351d9 Fix stat stage bug 2020-07-12 22:54:47 +02:00
DizzyEggg
89ed5bc8bb Fix mega evo switch-in intimidate not working 2020-06-29 18:40:05 +02:00
DizzyEggg
36aec5658c Transform Imposter Illusion fix 2020-06-29 13:45:27 +02:00
Eduardo Alvaro Quezada D'Ottone
9fb073ca23
Some cleanup (#454) 
* Toxic Thread doesn't have power.

* Added missing commas.

* Autotomize typo.

It wasn't until today that I learned that autotomize was a word.
 2020-06-27 11:21:13 +02:00
DizzyEggg
548a43f8d9 Rocky Helmet before Knock Off 2020-06-25 16:15:11 +02:00
LOuroboros
c77bed7bfb Fixed Regenerator overhealing a Pokémon 2020-05-30 05:04:23 -03:00
Eduardo Alvaro Quezada D'Ottone
8d848997c9
Battle Configs: The Revenge (#363) 
* Turns for Uproar

* Chances for the amount of hits with multi-hit moves.

* Electric type mon's immunity to paralysis

* (Hi) Jump Kick to always do 1/2 of maxHP when crashing

* Turns for Disable.

* Minimized mons can always be hit by moves like Stomp

* Grass types immune to powder and spore moves.

* Psywave's damage formula

* Fixed random usage.
 2020-05-28 10:38:27 +02:00
DizzyEggg
fcc5ec1dd0 Fix Teleport wild double battle 2020-05-24 10:58:33 +02:00
Philipp AUER
de6811b85e
battle-engine: fix acupressure crash (#381) 
- fixes #380

Co-authored-by: SBird <sbird@no.tld>
 2020-05-24 10:03:52 +02:00
ultima-soul
9ee5db6a96 Expand ability ids to u16. Thanks to ghoulslash for some assistance! 2020-05-18 14:54:12 -07:00
Eduardo Alvaro Quezada D'Ottone
f82bd2f9c4
Fix sleeping turns (#370) 
* Fix sleeping turns

* Readjusted numbers. Thanks Doesnt
 2020-05-02 10:35:50 +02:00
DizzyEggg
36b52eb063 Shed Shell 2020-04-28 11:14:20 +02:00
DizzyEggg
ee68f0f826 Fix switch-in abilities when shift style switch 2020-04-25 11:17:59 +02:00
DizzyEggg
738d92e39d Infiltrator affects mist safeguard 2020-04-23 11:29:19 +02:00
Eduardo Alvaro Quezada D'Ottone
d529ac3b60
More Battle config (#352) 
* Binding move turns.

* Binding damage.

* Incineratable Gems.

* Flash Fire while frozen.

* Sleep turns.

* Synchronized natures %

* Confusion self damage chance.

* Fixed confused self-damage check
 2020-04-23 09:01:28 +02:00
DizzyEggg
40ce053ce1 Adrenaline Orb 2020-04-22 15:12:25 +02:00
DizzyEggg
d56aaf7c0b Destiny Knot 2020-04-22 14:40:44 +02:00
DizzyEggg
e2524bed49 Metronome item 2020-04-22 12:49:25 +02:00
DizzyEggg
c8ba013539 Power Herb 2020-04-22 10:44:19 +02:00
Eduardo Alvaro Quezada D'Ottone
c5a6acc7db
Corrosion (#306) 
* Status move poisoning for Steel and Poison types.

* Can poison itself with Toxic Orb.

* Secondary effect poisoning now working.

* Created a function that checks if abilities can bypass type immunities.

* Created macro to handle typeimmunity

* Applied review changes.

* Applied review requests.

* Left more readable version of HOLD_EFFECT_TOXIC_ORB.
 2020-04-21 15:59:19 +02:00
DizzyEggg
328e951afa Ally Switch, tbd 2020-04-20 20:05:04 +02:00
DizzyEggg
0f628c8ff2 Fairy Lock 2020-04-20 19:41:07 +02:00
DizzyEggg
2daf1fbbf8 Geomancy 2020-04-20 19:02:03 +02:00
Eduardo Alvaro Quezada D'Ottone
4697a5b687
More Battle configs (#339) 
* Fixed naming of King Shield's description variable.

* Config for King Shield lowering attack.

* Config for terrain type attack boost.

* Standarized battle config descriptions.

* Adjusted config logic accounting for GEN_8.

* Changed KING_S_SHIELD back to KINGS_SHIELD

* Missed B_ABILITY_WEATHER.
 2020-04-20 14:11:28 +02:00
DizzyEggg
3dfd19b3e2 AI Weather moves tweaks 2020-04-20 13:00:04 +02:00
DizzyEggg
28805b0f98 AI powder moves 2020-04-20 12:14:56 +02:00
DizzyEggg
d38e0d8ae5 AI dont rely on power if bad effects 2020-04-20 11:27:09 +02:00
DizzyEggg
ce28454461 Fix Life Orb fainting an already fainted mon 2020-04-20 08:55:21 +02:00
DizzyEggg
dd17360ab0 Zen Mode and Shields Down 2020-04-19 21:18:39 +02:00
DizzyEggg
c01ed5325c Poison Touch fix 2020-04-19 14:43:54 +02:00
DizzyEggg
d5307c3e54 Poison Touch 2020-04-19 14:24:31 +02:00
DizzyEggg
6a3944d27c Frisk, would be easier if it didnt scan 2 opponents 2020-04-19 13:37:56 +02:00
DizzyEggg
e62f1475d4 Beast Boost and Receiver 2020-04-19 12:07:56 +02:00
DizzyEggg
ee8a00be81 some ability tweaks 2020-04-18 20:34:09 +02:00
DizzyEggg
e42ead10c9 Soul Heart 2020-04-18 19:59:09 +02:00
DizzyEggg
7178ea6b46 Shore Up 2020-04-18 18:34:18 +02:00
DizzyEggg
093eca07b3 Volt Switch UTurn anim fix when cant switch out 2020-04-18 18:04:20 +02:00
DizzyEggg
68bcc76538 Fix trainer slide in shadow steal 2020-04-18 13:26:40 +02:00
DizzyEggg
bc86292c93 Psycho Cut fix, small AI tweak 2020-04-18 12:19:07 +02:00
DizzyEggg
34f5d9e2ae Burn Up And Purify 2020-04-17 21:14:26 +02:00
Eduardo Alvaro Quezada D'Ottone
81617eb577
Overworld effects (#245) 
* Snow Cloak's overworld effect. (reduces the chance of encountering wild Pokémon on Snow by 50%)

* Quick Feet's overworld effect. (reduces the chance of encountering wild Pokémon by 50%)

* No Guard's overworld effect. (raises the chance of encountering wild Pokémon by 50%)

* Honey Gather.

* Checks if honey is defined.

* Applied review changes.

* Fixed pointer reference

* Applied requested changes.

* Using weather constants.
 2020-04-15 14:45:07 +02:00
DizzyEggg
8ea7fcc348 better ai debug 2020-04-14 13:40:27 +02:00
Eduardo Alvaro Quezada D'Ottone
2b9eb00486
Mind blown (#302) 
* Mind Blown Part 1 (Definition and self-damage)

* Mind Blown Part 2 (Damp interaction)
 2020-04-14 09:27:29 +02:00
DizzyEggg
51e1639513 Magic Guard protects from stuff 2020-04-13 15:49:40 +02:00
DizzyEggg
cb5b673f8a Big Root and STRENGTH Sap 2020-04-13 15:00:17 +02:00
DizzyEggg
51e2e0ad10 Ability pop-up for levitate and wonder guard 2020-04-13 13:06:31 +02:00
DizzyEggg
060b795d8e Merge with master 2020-04-11 19:48:24 +02:00
DizzyEggg
a2a9f259c8 Change handlinf of forbidden moves for mimic metronome etc 2020-04-11 13:22:35 +02:00
DizzyEggg
6daab7a5c9 Fix Damp loop 2020-04-11 12:02:51 +02:00
DizzyEggg
1435cd4692 Change inner structure of semi invulerable moves 2020-04-11 11:47:13 +02:00
AsparagusEduardo
f45336c546 Using Battle Action constants 2020-03-17 22:14:14 -03:00
PikalaxALT
39da49495d
Merge pull request #1000 from GriffinRichards/doc-dex 
Document pokedex.c
 2020-03-17 10:43:57 -04:00
Eduardo Alvaro Quezada D'Ottone
64031dd672
Option for Toxic never missing if user is Poison type. (#304) 2020-03-14 12:15:36 +01:00
DizzyEggg
cf4d5f6e59 Merge with master 2020-03-13 23:02:17 +01:00
GriffinR
31b0cbe9b4 Document pokedex.c 2020-03-09 16:24:01 -04:00
Eduardo Quezada
f821303429 Using True/False on SetMoveEffect. 2020-03-07 16:54:13 -06:00
GriffinR
e633b57593 Document remaining status/general/special anims 2020-02-25 12:54:08 -06:00
DizzyEggg
b1b1bf7f12 Fix two turn moves not activating moxie 2020-02-22 18:43:16 +01:00
DizzyEggg
bd75f16a9b Clear move effect after each turn 2020-02-22 18:22:04 +01:00
DizzyEggg
517974ebcb Can't Knock Off mega stones 2020-02-22 17:30:07 +01:00
DizzyEggg
edb581af1f Mega evo elevation shadow 2020-02-16 13:46:35 +01:00
Eduardo Alvaro Quezada D'Ottone
33e8e20118
Disguise ability (#258) 
* Protection from attacks.

* Changes form when Busting Disguise.

* Ability changing moves set to fail.

- Simple Beam and Worry Seed now fail if the target has Disguise.
- Role Play and Skill Swap now fail if either the attacker or the target have Disguise.

* Disguise no longer triggers when transformed.

* Mimikyu reverts to Disguised

* No longer blocks from entry hazards and weather.

* Applied review changes

* Oops, new line

* yeah
 2020-02-08 19:29:51 +01:00
DizzyEggg
c9774f6e25 Transformed Aegi cannot change forms 2020-02-08 12:09:38 +01:00
DizzyEggg
41f0c0acb5 Sort out ohko moves 2020-02-08 10:39:22 +01:00
Eduardo Alvaro Quezada D'Ottone
90442ffbc2
Battle config options (#243) 
* Option to use pre-GenVI critical hit multiplier.

* Clarified the option that multiplies EXP by 1.5 for trainer battles.

* Fixed code style.

* Option to change Burn damage.

* Option to change to Gen 7 paralysis drop.

* Ordered settings.

* Implemented review suggestions.
 2020-02-08 09:51:55 +01:00
DizzyEggg
834b7b52d3 Merge with master 2020-02-08 09:38:29 +01:00
GriffinR
27c4329e45 Use friendship event constants 2020-02-04 12:16:15 -06:00
GriffinR
be5d417236 Document some pokenav menu handlers 2020-02-04 08:02:28 -06:00
DizzyEggg
06a9165f75 Fix Ice Body not working 2020-01-18 19:18:57 +01:00
DizzyEggg
bcf6b02a55 Fix Last Resort 2020-01-18 18:57:23 +01:00
Eduardo Alvaro Quezada D'Ottone
000a709363 Gen7 trainer exp multiplier. (#200) 
* Gen7 trainer exp multiplier.

* Changed check for TRAINER_BATTLE_MULTIPLIER from "before Gen 7" to "not Gen 7" as requested.
.
 2020-01-18 18:29:56 +01:00
DizzyEggg
cafb0c3b6a Fix Surf taking 3 pp 2020-01-04 18:17:26 +01:00
DizzyEggg
39e3b0b740 Form changes layout and Stance Change Aegi 2019-12-31 19:11:53 +01:00
DizzyEggg
b15f0b3bb3 Comatose 2019-12-31 16:36:53 +01:00
DizzyEggg
77842b0376 Contact moves for Aftermath and Bestow for Unburden 2019-12-25 12:19:09 +01:00
ultima-soul
332aa80a33 Resolve review comments and encapsulate Unburden check and set. 2019-12-23 09:25:26 -08:00
ultima-soul
5786745d15 Merge branch 'battle_engine' into unburden 2019-12-23 09:01:16 -08:00
DizzyEggg
ea9109943d Aurora Veil now only works in Hail 2019-12-23 17:50:13 +01:00
DizzyEggg
308e1594c9
Merge pull request #212 from Fontbane/gooey 
Queenly Majesty, Big Pecks, Gooey and Tangling Hair
 2019-12-23 17:23:33 +01:00
DizzyEggg
e4a9a228c5
Merge pull request #210 from ultima-soul/battle_engine 
Implement Leaf Guard.
 2019-12-23 17:15:51 +01:00
DizzyEggg
9e3d5672e6 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2 2019-12-23 16:40:21 +01:00
ultima-soul
1146de4561 Implement Unburden. 2019-12-21 23:09:06 -08:00
Fontbane
2fb6ea4fc4 Big Pecks 2019-12-19 14:01:46 -05:00
ultima-soul
029ab67ff4 Implement Leaf Guard. 2019-12-16 00:29:20 -08:00
GriffinR
ed1ff0ad77 Document misc strings and text colors 2019-12-10 19:29:23 -06:00
DizzyEggg
9b459eb64a Fix atk49state 2019-12-09 08:41:09 +01:00
DizzyEggg
740ab29c7c
Merge pull request #204 from cfmnephrite/beta 
Dancer
 2019-12-09 08:36:22 +01:00
DizzyEggg
ac499bc896 Merge with master 2019-12-09 08:16:18 +01:00
Nephrite
0343f63eda Dancer 
Implemented Dancer and all relevant code for interacting with abilities, certain moves, etc
 2019-12-07 10:19:01 +00:00
GriffinR
c40879aa36 Use ST_OAM constants for OamData definitions 2019-12-06 19:05:44 -06:00
Thomas Winwood
e3f7f47321 Turn some magic numbers into named constants 2019-11-23 07:53:26 -06:00
DizzyEggg
b4ac979600 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2 2019-11-10 12:09:43 +01:00
DizzyEggg
ea6736cd8d merge 2019-11-10 12:09:14 +01:00
Marcus Huderle
01e6fb6dd0 Document some battle_bg-related things 2019-11-07 18:24:04 -06:00
huderlem
a4b4ecd470
Merge pull request #787 from GriffinRichards/rename-tablecmds 
Rename table cmds
 2019-11-04 16:31:27 -06:00
DizzyEggg
1d8cc9b741 Fix merge conflicts 2019-11-03 19:55:19 +01:00
GriffinR
e01ec84837 Document party_menu second pass 2019-10-31 03:25:56 -04:00
GriffinR
5fd44d1e74 Rename some STAT_CHANGE macros 2019-10-26 11:53:00 -04:00
GriffinR
6db014cc32 Document party_menu first pass 2019-10-25 15:41:06 -04:00
DizzyEggg
621dd4f0bf Fix Sheer Force moves and effects happening 2019-10-21 14:48:03 +02:00