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,044 Commits 1 Branch 0 Tags 235 MiB
24b19eb9a4
Commit Graph

4870 Commits

Author SHA1 Message Date
Evan
19b1d4bfa2 speed stat increases based on current stat stage 2020-12-20 15:15:33 -07:00
Evan
62fc47881d smaller score bonus to speed increase 2020-12-20 15:10:57 -07:00
Evan
7988a1f41d Ai_TryOnAlly and reorganize files 2020-12-20 14:47:20 -07:00
Kurausukun
14e2898a29 fix structs and some function logic 
(currently does not match)
 2020-12-20 02:54:33 -05:00
Evan
c5597e2e18 fix first battle bug 2020-12-19 22:57:08 -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
0aae069db8 Made Fiery Wrath unaffected by King's Rock 2020-12-19 21:11:17 -03:00
LOuroboros
819001c102 Removed redundant check in Punk Rock's effect 2020-12-19 19:15:12 -03:00
LOuroboros
a417a1b2b9 Corrected Punk Rock's checks 2020-12-19 16:18:39 -03:00
LOuroboros
ffa35a33c1 Review corrections 2020-12-19 07:44:34 -03:00
ultima-soul
1b1b2ff0a3
Merge pull request #1281 from NamNguyenUTSA/patch-2 
Allow player partner NPC's to mega evolve
 2020-12-18 23:39:15 -08: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
8a544665e4 move common ai params to preloaded struct 2020-12-16 22:56:10 -07:00
Evan
916d0416e3 outline AI_CheckGoodMove 2020-12-15 21:57:33 -07: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
Kurausukun
69cfe5ad01 use direction constant 2020-12-14 21:54:19 -05:00
Kurausukun
68b456e7f9 name a2 2020-12-14 21:51:38 -05:00
Kurausukun
266a23b327 fix indentation 2020-12-14 21:44:25 -05:00
Kurausukun
6faa63347a document reuse of variables in link mode 2020-12-14 21:41:30 -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
259e59bae0 fix early mummy activation on two-turn moves 2020-12-14 12:27:48 -07:00
Evan
b85dacce9d fix conflicts 2020-12-14 08:50:41 -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
Sierraffinity
1aca378634 Fix name of SetDexNumberColor 2020-12-12 21:08:15 -08:00
GriffinR
b1197ac2da UBFIX for if_status_not_in_party 2020-12-12 23:57:25 -05:00
GriffinR
81d95b9325 Use BUGFIX for some inline fixes 2020-12-12 23:30:51 -05:00
Sierraffinity
abef3065d0 Fix affine anim bug with Pokémon going in and out of balls without an intermediate screen transition 2020-12-12 20:29:20 -08: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
ea1dca3024
Merge pull request #1270 from LOuroboros/drives_and_types 
Made Techno Blast's animation change depending on the Drive held
 2020-12-12 21:43:45 -03:00
LOuroboros
1f10b94a11 Implemented Power Spot 2020-12-12 21:22:42 -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
305bea32df Added missing check to Flower Gift (offensive) 2020-12-12 20:32:52 -03:00
LOuroboros
8e187d1d5b Implemented Ice Scales 2020-12-12 19:39:35 -03:00
LOuroboros
55bc2b4bb9 Corrected small inconsistency in move flag names 2020-12-12 12:18:56 -03:00
LOuroboros
e9c6c96b9d Corrected Final Gambit's move data 
It didn't have its own working effect assigned, and it wasn't being affected by King's Rock even though it should.
 2020-12-12 11:57:49 -03:00
Michael Panzlaff
eaff64e223 remove trailing spaces 2020-12-12 13:19:08 +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
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
Evan
28698a982d try to faint script -> c 2020-12-11 08:05:00 -07:00
NamNguyenUTSA
ee59fab143
Allow player partner NPC's to mega evolve 
(i.e., Steven at Mossdeep)
 2020-12-11 08:31:00 -06:00
Evan
aad3a800c3 c functions for ai roamers/safari/first battle 2020-12-10 22:10:21 -07:00
Evan
eac8135687 set up ai c function table 2020-12-10 21:37:37 -07: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
ExpoSeed
76e40fe2dd
Fix incorrect bug description 2020-12-09 16:45:27 -06: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
a3b891bd65 Cap recoil for Gen 4 Jump Kick 
Jump Kick's recoil in Gen 4 cannot exceed half of the target's maximum HP.
 2020-12-07 19:41:49 +13: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
Evan
37aeeae277 fix terrain bg on subsequent battle start 2020-12-05 20:25:03 -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
b6d0681779 Included hold_effects.h in battle_anim_new.c 
Otherwise the file won't recognize HOLD_EFFECT_PLATE and will refuse to build a ROM.
 2020-12-05 20:50:33 -03:00
LOuroboros
49ca76f880 Made Techno Blast's animation change depending on the Drive held 2020-12-05 20:39:05 -03:00
LOuroboros
c83c67ff8e Implemented Stalwart 2020-12-05 14:19:25 -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
Eduardo Quezada D'Ottone
15a587f4e9
Merge pull request #1261 from ghoulslash/u16-abilities 
Fix Buffering abilities > 255
 2020-12-04 15:18:45 -03:00
LOuroboros
9e8913c698 Implemented Propeller Tail 2020-12-02 23:23:34 -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
3d8308844c Implemented Libero 
Kappa.
 2020-12-02 19:09:59 -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
5c72a89105 fix B_BUFF_ABILITY 2020-12-02 15:03:49 -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
GriffinR
c76aaa2aa4
Merge pull request #1259 from GriffinRichards/fix-backpicindex 
Designated initializers for gTrainerBackPicTable
 2020-12-01 16:26:42 -05:00
GriffinR
076b2c2edc Designated initializers for gTrainerBackPicTable 2020-11-30 15:32:08 -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
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
GriffinR
571c5988ec
Merge pull request #1257 from Kurausukun/menu_nonmatching 
[LEAK INFORMED] match sub_819A080
 2020-11-27 11:10:03 -05:00
Ashley Coleman
0f04944b81 Rename graphics files for COOLTRAINER to match define 2020-11-26 11:05:02 -08:00
Kurausukun
54becd2303
whitespace 2020-11-26 01:35:08 -05:00
Kurausukun
94cbd3ff1b [LEAK INFORMED] match sub_819A080 2020-11-26 01:30:59 -05:00
Evan
6c0878b5fe infestation between turn anim 2020-11-24 17:21:59 -05:00
Evan
9ec67db8fa keep permanent terrain bg from party menu, bag 2020-11-24 17:03:40 -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
9472bc894f formatting 2020-11-20 08:26:50 -07:00
Evan
ef43596a79 toggleable manual ability popup destruction 2020-11-19 15:16:27 -07:00
Evan
56c0a39206 fix pressure typo 2020-11-19 11:53:47 -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