ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-30 14:20:42 +01:00
Code Issues Packages Projects Releases Wiki Activity
7,857 Commits 1 Branch 0 Tags 235 MiB
ee3f3eb78f
Commit Graph

2477 Commits

Author SHA1 Message Date
GriffinR
1a40202ea4 Note bug in Foresight AI 2021-01-19 04:46:31 -05:00
GriffinR
c6a81c5277 Use MON_MALE/FEMALE for get_gender 2021-01-19 04:37:17 -05:00
LOuroboros
af3dcf7543 Fixed Focus Blast animation 
Its gSuperpowerOrbSpriteTemplate was overlapping the battle textbox.
 2021-01-16 03:57:47 -03:00
LOuroboros
c21c0f8c37 Fixed incorrect preprocessor directive in ASM file 2021-01-13 22:42:56 -03: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
opakedragon
3ce4e6b24b
rename string id to reflect usage 2021-01-11 08:47:11 -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
e748db8ef4 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into ai 2021-01-10 08:58:16 -07: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
339aa95c1d Review corrections 
-Intrepid Sword and Dauntless Shield are now properly affecting the user
-Slightly tweaked Ball Fetch's effect, since an operation involving gBattleResults.catchAttempts was being done twice unnecessarily.
 2021-01-07 04:31:26 -03:00
Evan
c3615485f3 merge in berry branch 2021-01-06 12:54:02 -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
b3a6df8d57 stat raising berries 2021-01-05 22:13:32 -07:00
Evan
f046a25ce0 ripen & hp restoring berries 2021-01-05 21:15:21 -07:00
Evan
0a3908ee92 add neigh and as one abilities 2021-01-05 19:37:23 -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
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
GriffinR
d992e4277e
Merge pull request #1283 from GriffinRichards/doc-factscreen 
Document battle factory screen
 2021-01-03 02:51:59 -05:00
GriffinR
c711a2f73b Document warp spin functions 2021-01-01 17:11:02 -05: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
b7b1b26b57
Merge pull request #1289 from LOuroboros/final_gambit 
Corrected Final Gambit's move data and tweaked its effect
 2020-12-31 18:39:00 -06: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
ec85c01e7c
Merge branch 'master' into doc-factscreen 2020-12-31 00:40:45 -05:00
GriffinR
769ddf22c2 Label remaining subs in battle_tower.c 2020-12-24 16:18:47 -05: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
3918542b3e Corrections to Final Gambit's effect's battle script 
-Restored the call to resultmessage
-Corrected its behavior against Endured, Focus Banded/Sashed and Sturdy foes
 2020-12-20 21:31:36 -03: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
a504199ea6 ai prefer baton pass 2020-12-19 22:51:25 -07:00
Evan
b2e5760479 risky ai script -> c 2020-12-19 22:12:31 -07:00
Evan
cd119ed6c3 first turn ai script 2020-12-19 22:07:21 -07:00
Evan
31ec3e8479 non-partner good move checks 2020-12-19 21:58:23 -07:00
LOuroboros
9f2dc914ba Tweaked Final Gambit's effect 
-Made the user faint before the foe like in the official games
-Removed calls to resultmessage and critmessage as those were never needed by this move's effect
 2020-12-19 22:12:17 -03:00
LOuroboros
89989943b3 Added placeholders for the anims of CT's moves 2020-12-19 19:11:17 -03:00
ultima-soul
aefa35a04f
Merge pull request #1275 from ghoulslash/battle_anims 
Fix Shadow Sneak Animation
 2020-12-18 23:15:07 -08: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
LOuroboros
785e23222b Review correction 2020-12-13 21:20:27 -03: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
36b0e6dedc fix shake duration 2020-12-13 17:08:35 -07:00
Evan
ac332d5e98 check bad move 2020-12-13 15:02:21 -07:00
GriffinR
81d95b9325 Use BUGFIX for some inline fixes 2020-12-12 23:30:51 -05:00
LOuroboros
dc34ad7e83 Tweaked abilitypopup usage on Cotton Down's BattleScript 2020-12-12 21:24:39 -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
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
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
Evan
aad3a800c3 c functions for ai roamers/safari/first battle 2020-12-10 22:10:21 -07: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
964ec53a65 port cfru shadow sneak anim 2020-12-08 11:36:19 -07:00
LOuroboros
c9824a8dd9 Fixed Cotton Down 
It was tough, but the nightmare is finally over.
Ghoulslash, Blurose, Cancer Fairy, thanks to all of you guys!
 2020-12-07 20:08:36 -03: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
21cab1b7a7 better negative totem boost system, totems occur before switch in abilities 2020-12-05 21:00:51 -07:00
BuffelSaft
ef41a4c14d Fix Jump Kick 
* Now inflicts recoil damage on the user if the target was immune to the attack
* Gen V+ recoil damage is now half of the user's HP instead of half of the target's HP.
 2020-12-06 16:14:02 +13:00
LOuroboros
42a06c6003 Fixed softlock caused by the majority of Techno Blast's animations 
And made the checks that sets its animation use the Type constants instead of their internal IDs.
 2020-12-05 21:23:59 -03: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
6bbd88049a Ball Fetch tweaks 2020-12-05 03:03:55 -03:00
LOuroboros
e2f4ca27b0 BattleScript_TargetAbilityStatRaiseOnSwitchin -> BattleScript_TargetAbilityStatRaiseOnSwitchIn 2020-12-05 02:43:29 -03:00
ultima-soul
e05b5fc8a3
Merge pull request #1260 from ghoulslash/BE_test 
Fix Babydoll eyes animation
 2020-12-04 15:46:17 -08: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
3102e499da fix babydoll eyes anim priority 2020-12-02 14:23:03 -05:00
Evan
4ad5e368a9 fix merge conflicts 2020-12-01 17:57:57 -05:00
Evan
58a79a4f37 shorten between-turn infestation anim length 2020-12-01 17:52:44 -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
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
Eduardo Quezada D'Ottone
47fe30f0a1
Merge pull request #1246 from ExpoSeed/BE-patch 
Remove Techno Blast and Judgment from battle scripts
 2020-11-20 20:49:38 -03:00
ExpoSeed
914c830616 Remove Techno Blast and Judgment from battle scripts 2020-11-19 21:21:34 -06:00
Evan
07a4400d50 finish switch in ability messages 2020-11-19 11:42:00 -07:00
Evan
1c398c3d4b totem format fixes 2020-11-19 10:37:15 -07:00
Evan
99d9a36860 add totem boosts 2020-11-19 10:35:37 -07:00
Evan
c026f705b3 permanent terrain move bgs 2020-11-17 19:45:27 -07:00
Evan
479f6be51a redo power trick anim 2020-11-17 15:31:18 -07: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
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
98d3427e62
Prevent Ability Popup overwrites #1218 from ghoulslash 2020-11-10 17:34:33 -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
0683dc9c3f longer ability popup delay to prevent overwriting 2020-11-10 10:05:11 -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
09a5d6c722 Implemented Wish Mega Evolution 2020-11-07 10:13:32 -03:00
LOuroboros
c66b77fbf8 Changed Hurricane's animation 2020-11-06 21:06:04 -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
Eduardo Quezada D'Ottone
c783f789ed
Merge pull request #523 from LOuroboros/eerie_impulse 
Fixed Eerie Impulse's animation again
 2020-10-20 18:52:36 -03:00
LOuroboros
22093e75fc Fixed Electrify's animation again 
For more details, see: https://github.com/DizzyEggg/pokeemerald/pull/425#issuecomment-672012634
 2020-10-20 10:30:32 -03:00
LOuroboros
ea54afbdc7 Fixed Eerie Impulse's animation again 
For more details, see: https://github.com/DizzyEggg/pokeemerald/pull/425#issuecomment-672012634
 2020-10-20 10:15:49 -03:00
Eduardo Quezada
d0feac8fe4 Fix comment identation. 2020-10-19 17:48:27 -03:00
Eduardo Quezada
5f7c01bd41 Replaced spaces to tabs. 2020-10-19 11:58:19 -03:00
Eduardo Quezada
8f9659f846 Fixed Pika Papow's name. 2020-10-19 11:45:54 -03: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
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
47259092e3 LGPE & Isle of Armor move data. 2020-10-14 21:50:22 -03: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
1472111c5d Fix PutAwayDecorationLoop UB comment 2020-10-11 19:02:10 -04:00
ExpoSeed
9e2c8a95c1 Sync bev2 with pret 2020-10-11 01:01:47 -05:00
Eduardo Quezada
96e4b43ce5 Documenting where each of the berries are generated in new_game.inc 2020-10-03 21:52:09 -03:00
ExpoSeed
032669e2ab Change script command table comment alignment from tabs to spaces 2020-09-25 14:05:17 -05:00
ExpoSeed
31d12383b1 Add byte comments to mystery event script command table 2020-09-25 13:27:15 -05:00
ExpoSeed
e7340ca0e1 Add byte comments to script command table 2020-09-25 13:25:36 -05:00
Eduardo Quezada
46ccb91155 Fixed "Ultra Rope" name. 2020-09-13 11:35:05 -03:00
GriffinR
921f389e4e Fix Rusboro and Lavarige typos 2020-09-11 14:47:47 -04:00
DizzyEggg
97d0643110 Merge with master 2020-09-08 12:48:28 +02: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
1264c4615a
Merge pull request #1158 from GriffinRichards/doc-cablecar 
Document cable car
 2020-09-03 16:24:27 -04:00
GriffinR
4ad147f75d
Merge pull request #1156 from GriffinRichards/doc-rayscene 
Document Rayquaza cutscene
 2020-09-01 14:46:14 -04:00
GriffinR
f5495d1220 Give proper names to underwater maps 2020-09-01 03:03:14 -04:00
GriffinR
bf61de01a7 Start documenting battle factory screen 2020-08-31 13:36:48 -04:00
GriffinR
5773bb8643
Merge pull request #1152 from GriffinRichards/doc-blender 
Document berry blender
 2020-08-30 15:33:17 -04:00
GriffinR
afb3472282 Minor battle_anim_throw cleanup 2020-08-30 15:11:44 -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
GriffinR
08a8aad65a
Merge branch 'master' into doc-cablecar 2020-08-28 16:17:48 -04:00
GriffinR
0cfc279af5
Merge branch 'master' into doc-rayscene 2020-08-28 16:17:11 -04:00
GriffinR
c830731734
Merge branch 'master' into doc-blender 2020-08-28 16:16:00 -04:00
GriffinR
09cfed64b5
Merge pull request #1146 from GriffinRichards/rename-songs 
Give songs meaningful english names
 2020-08-28 16:14:21 -04:00
GriffinR
71a066f945 Document cable car 2020-08-28 03:54:04 -04:00
DizzyEggg
f70a9ce153 Merge with master 2020-08-27 12:01:28 +02:00
GriffinR
95ea0e92e7 Start documenting rayquaza_scene 2020-08-25 17:49:42 -04:00
GriffinR
0ff767a9b5 Start documenting berry blender 2020-08-22 19:39:39 -04:00
GriffinR
fbb70b3727 Document contest AI scripts 2020-08-21 14:57:17 -04:00
GriffinR
469ec5f248 Document contest AI commands 2020-08-21 02:36:48 -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
LOuroboros
1b9aa1f023 Updated many moves' data to Gen. 8 standards 2020-08-20 15:44:58 -03:00
GriffinR
503dafd210 Fix wallys parents misnamed as uncle/aunt 2020-08-18 17:51:41 -04:00
GriffinR
3ba8cabd80 Fix Brenday typo 2020-08-18 15:56:44 -04:00
GriffinR
65bd2faf94 Merge branch 'master' of https://github.com/pret/pokeemerald into doc-contest 2020-08-16 05:59:10 -04:00