ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-10 21:55:06 +01:00
Code Issues Packages Projects Releases Wiki Activity
7,285 Commits 1 Branch 0 Tags 235 MiB
71b85031e0
Commit Graph

3064 Commits

Author SHA1 Message Date
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
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
LOuroboros
a417a1b2b9 Corrected Punk Rock's checks 2020-12-19 16:18:39 -03:00
GriffinR
15c2856b24
Merge pull request #1265 from Kurausukun/berry_crush 
fakematch fixes, begin documenting Berry Crush (based on #1187)
 2020-12-14 23:22:41 -05:00
GriffinR
c611421882
Merge pull request #1267 from ipatix/m4a_names 
refactor m4a.c/m4a_1.s constant/variable/type naming
 2020-12-14 20:03:53 -05:00
GriffinR
18a5feb413
Merge pull request #1269 from GriffinRichards/bugfix 
Use BUGFIX for some inline fixes
 2020-12-14 20:00:59 -05:00
Evan
e70e2bcd65 merge with be 2020-12-14 09:09:51 -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
GriffinR
f7a729df30 BUGFIX implies UBFIX 2020-12-13 16:16:48 -05: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
GriffinR
81d95b9325 Use BUGFIX for some inline fixes 2020-12-12 23:30:51 -05: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
Michael Panzlaff
91ccf9e343 fix typo 2020-12-12 13:07:56 +01: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
Michael Panzlaff
f177c736fc more CgbSound decipher work 2020-12-11 16:33:58 +01:00
Michael Panzlaff
15ff55eee5 use better m4a variable/constant names 2020-12-11 16:33:55 +01:00
Kurausukun
58976ebaa8 Merge remote-tracking branch 'upstream/master' into berry_crush 2020-12-10 23:30:52 -05: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
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
426ea191ad style fix 2020-12-05 21:04:12 -07: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
LOuroboros
002973d373 Renamed BattleScript_TargetAbilityStatRaiseOnSwitchIn 
This battlescript is meant to be called within the case ABILITYEFFECT_ON_SWITCHIN of AbilityBattleEffects, which refers to the currently selected battler as Battler instead of Attacker or Target.
 2020-12-05 13:50:47 -03:00
LOuroboros
e2f4ca27b0 BattleScript_TargetAbilityStatRaiseOnSwitchin -> BattleScript_TargetAbilityStatRaiseOnSwitchIn 2020-12-05 02:43:29 -03:00
LOuroboros
9e1d7cc827 Implemented Ball Fetch 2020-12-02 23:09:35 -03:00
LOuroboros
0c4c6fc778 Implemented Cotton Down 2020-12-02 22:53:00 -03:00
LOuroboros
e11fa09632 Implemented Intrepid Sword and Dauntless Shield and... 
-Renamed BattleScript_TargetAbilityStatRaise to BattleScript_TargetAbilityStatRaiseOnMoveEnd
-Added a copy, BattleScript_TargetAbilityStatRaiseOnSwitchin

Their labels reflect the instances of a battle in which they can be called.
 2020-12-02 19:07:08 -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
Evan
25abdeacc5 tidy up z move code 2020-12-01 16:36:44 -05:00
Evan
2bfc7ea9b1 merge upstream 2020-12-01 15:42:04 -05:00
Evan
f54cd0b25d fix z effect scripts 2020-12-01 15:35:39 -05:00
Evan
9755923cc3 light that burns the sky split, fix electric z move anims 2020-12-01 14:44:45 -05:00
Evan
ce19e33cc4 handle double and multi battles 2020-12-01 13:43:15 -05:00
Evan
fd8951d040 trainer z move ai 2020-12-01 08:24:33 -05:00
Evan
a0bde70493 z move effects 2020-11-30 10:55:46 -05:00
Evan
752aca7698 finish z move anims 2020-11-29 09:22:31 -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
f114534ae3 z move anim/effect, black hole eclipse anim 2020-11-28 13:09:43 -05:00
Eduardo Quezada D'Ottone
7aa999af59
Merge pull request #1235 from ultima-soul/ability_expansion 
Expand Ability IDs to u16, Add SWSH Ability Data, and Remove Cacophony
 2020-11-28 14:56:01 -03:00
Evan
2b1dfe73cf z move unleash anim, fix active/used flags 2020-11-27 23:38:29 -05:00
Evan
4060b09bd6 expand top left move window. add z move init anim 2020-11-27 17:06:36 -05:00
Evan
348d70b309 z move indicator and some data 2020-11-26 15:56:18 -05: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
9d056e8656 Move object event pal declarations to graphics 2020-11-23 14:45:16 -05:00
GriffinR
513c7c5f45 Clarify Kecleon objects 2020-11-23 14:42:47 -05:00
GriffinR
bf65c1fb25 Name object event pals/tags 2020-11-23 14:24:48 -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
ultima-soul
fdfe330330
Merge pull request #519 from Pyredrid/doublescriptedwilds 
Added commands for scripted double wild battles
 2020-11-18 08:57:19 -08: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
e15a86caae Add ifdef for Hidden Abilities from Pokémon Expansion and change gBattlerAbility back to a u8. 2020-11-17 10:32:24 -08:00
kageru
6f91f7e0e3
Use more constants in Battle Tower code 2020-11-17 17:40:26 +01: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
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
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
33ed87e2cb Capitalization 2020-11-09 14:52:18 -03:00
Eduardo Quezada D'Ottone
3a984136e7 Updated comment. 2020-11-09 14:50:18 -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
MCboy
e31158d017 add spaces around - and remove comment from include in battle.h 2020-11-06 23:29:52 +03:30
MCboy
3b91735e63 use constants for ball throw count 2020-11-06 22:59:46 +03:30
Evan
b3d1e8b5b8 turn crit capture odds into a ratio 2020-11-03 08:57:11 -07:00
PikalaxALT
99dd461bef
Merge pull request #1189 from aaaaaa123456789/reverts 
Undo PokeCodec's PRs and port changes
 2020-11-03 09:28:45 -05:00
Kurausukun
6545745e59 Merge branch 'reverts' of https://github.com/aaaaaa123456789/pokeemerald into reverts 2020-11-02 18:43:40 -05:00
Kurausukun
8bf401c227 address comments 2020-11-02 18:43:11 -05: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
GriffinR
be1685c87f Use constants for menu info icon table 2020-10-29 16:34:33 -04:00
aaaaaa123456789
1c3d75f673 Merge branch 'master' into reverts 2020-10-26 12:16:36 -03:00
Kurausukun
fe40c0c466 re-match BattleIntroOpponent1SendsOutMonAnimation 
a lot of functions and a bit of data had to be moved from battle_main.c
to battle_util.c; I have added a note to battle_util.c stating the
reason for this
 2020-10-26 05:52:00 -04:00
Kurausukun
83846b913a port sub_806F160 fakematch fix 2020-10-26 00:01:53 -04: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
682d29b088 Removed the static variable from the ShouldGetStatBadgeBoost function 2020-10-21 15:30:20 -03: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
Aaron B-D
b83a87c8e8 Added scripted double wild battles 2020-10-19 14:47:32 -04: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
bcfa79f4fb Remove POKEMON_SLOTS_NUMBER define 2020-10-12 21:15:50 -05:00
ExpoSeed
88b9847772 Merge branch 'master' of https://github.com/pret/pokeemerald into sync-battle-engine-v2 2020-10-12 12:42:37 -05:00
GriffinR
17a77c9018
Merge pull request #1229 from ghoulslash/document 
start pokenav documentation
 2020-10-11 11:59:40 -04:00
Evan
f4909b4d96 align pokenav task funcs and update some pokenav menu bg gfx files 2020-10-11 08:50:58 -06:00
kageru
52ebc4252e
Document gUnknown_03006298 2020-10-11 09:54:49 +02:00
ExpoSeed
9e2c8a95c1 Sync bev2 with pret 2020-10-11 01:01:47 -05:00