Suppai_Neko/PokemonEmeraldComplete
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,179 Commits 1 Branch 0 Tags
b62e5aa72eafa13840f2ee1aaf2deb2d79da0600
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
ghoulslashandghoulslash 908b509401 Fix Round's Base Power calc, Add Turn order effects (#2602) 
* fix round base power calc, add turn order change

* remove unused callnative cmd

* fix round turn order update

* fix moveTarget getting set incorrectly in HandleAction_UseMove. also redirection doesn't affect MOVE_TARGET_ALL_BATTLERS

---------

Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
 2023-02-14 16:49:50 +01:00
ghoulslash 094554b3a3 Merge pull request #2681 from DizzyEggg/jaw_lock 
Fix Jaw Lock locking player pokemon
 2023-02-13 10:40:47 -05:00
ghoulslash d1ef53f93a Merge pull request #2678 from AlexOn1ine/z_indicator_in_doubles 
Z-Move Indicator was wrongly displayed in double battles
 2023-02-13 08:52:06 -05:00
ghoulslash c399391891 Merge pull request #2677 from AlexOn1ine/z_moves_switch_order 
Fix switching Z-Moves when pressing SELECT in battle
 2023-02-13 08:41:58 -05:00
ghoulslash 8ac3197c85 Merge pull request #2671 from DizzyEggg/spacial_rend 
Fix Spacial Rend animation
 2023-02-09 08:22:47 -05:00
ghoulslash deb23fc7c6 Merge pull request #2648 from AlexOn1ine/pollen_puff 
Fixes Pollen Puff issue #2611
 2023-02-09 08:21:33 -05:00
ghoulslash 27933836b5 Merge pull request #2662 from AlexOn1ine/heal_pulse_v2 
Add Logic for Heal Pulse effects in double battles
 2023-02-09 08:18:00 -05:00
ghoulslash 7e9d40d401 Merge pull request #2645 from DizzyEggg/damp_aftermath 
Damp shows ability pop-up when reacting with Aftermath
 2023-02-07 10:18:23 -05:00
ghoulslash 5d4a75dcb7 Merge pull request #2647 from DizzyEggg/cleanout_timers 
remove pointless timers from disable struct
 2023-02-07 09:58:01 -05:00
ghoulslash a775f6f31a Merge pull request #2642 from AlexOn1ine/strange_steam_v2 
Fix Strange Steam anim
 2023-02-07 09:25:04 -05:00
ghoulslashandghoulslash 0c4c3fbbb7 Fix Poison Gas Anim for MOVE_TARGET_BOTH (#2608) 
* poison gas anim handles MOVE_TARGET_BOTH

* fix sprite position fields

* fix it again

---------

Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
 2023-02-07 12:14:36 +01:00
ghoulslash 2b58593e33 Merge pull request #2595 from AsparagusEduardo/RHH/pr/data/Gen9Items 
Added some Gen9 item data and fixed Punching Glove's effect
 2023-01-27 16:13:50 -05:00
ghoulslash 6b86a031f0 Merge pull request #2598 from Jaizu/patch-1 
Allow exiting the Battle Debug menu pressing B
 2023-01-26 10:48:58 -05:00
ghoulslashghoulslashEduardo Quezada D'Ottone
 		321634ed3b Silk Trap Effect (#2512) 
* add silk trap effect, analog of obstruct

Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2023-01-23 16:42:47 -03:00
ghoulslash c72274ee98 Merge pull request #2566 from AsparagusEduardo/RHH/pr/feature/breedBalls 
Config for ball inheritence when breeding
 2023-01-13 09:35:15 -05:00
ghoulslash 5eb62199cd Merge pull request #2255 from LOuroboros/iceFaceRedux 
Implemented Ice Face
 2023-01-09 17:24:33 -05:00
ghoulslash cc7c546011 Merge pull request #2473 from LOuroboros/mimicry 
Reimplemented Mimicry
 2023-01-09 12:54:44 -05:00
ghoulslash 05e9bfeedf Merge pull request #2531 from AsparagusEduardo/RHH/pr/feature/IncenseBaby 
Refactored incense baby checks into table and added Gen 9 config.
 2023-01-08 19:14:53 -05:00
ghoulslash da27df9f18 Merge pull request #2326 from AsparagusEduardo/RHH/pr/reworkScald 
Rolled EFFECT_SCALD into EFFECT_BURN_HIT with a config for its Gen6+ change
 2023-01-08 16:25:29 -05:00
ghoulslash 1d2cb49bc6 Merge pull request #2542 from AsparagusEduardo/RHH/pr/config/multiTargetDmg 
Config to restore Gen 3's damage reduction to multi target moves
 2023-01-04 09:18:39 -05:00
ghoulslash a425de77a6 Merge pull request #2446 from LOuroboros/primal 
Updated AnimTask_PrimalReversion
 2023-01-04 09:16:28 -05:00
ghoulslash 6ea9a34036 Merge pull request #2561 from AsparagusEduardo/RHH/pr/fix/repels 
Fixed reusable repels/lures function forcefully using items while menu config is on
 2023-01-04 09:15:30 -05:00
ghoulslash a6269f8cc7 Merge pull request #2559 from AsparagusEduardo/RHH/pr/sync/pretmerge_20230103 
For me, it was tuesday. (pret merge 2023/01/03)
 2023-01-04 09:15:08 -05:00
ghoulslash 2944ebfe7b Merge pull request #2543 from AsparagusEduardo/RHH/pr/fix/shinyChances 
Reverting P_SHINY_BASE_CHANCE implementation as it wasn't accuerate to Gen6+
 2023-01-02 13:55:36 -05:00
ghoulslash 8b28d4329b Merge pull request #2525 from AsparagusEduardo/RHH/pr/fix/FixFrontierTutor2 
Fixed right Frontier move tutor not loading their move list correctly.
 2023-01-02 13:55:00 -05:00
ghoulslash f5687de182 Merge pull request #2552 from LOuroboros/patch-1 
Updated B_DOUBLE_WILD_CHANCE
 2023-01-02 13:49:44 -05:00
ghoulslash 759ee8854a Merge pull request #2470 from LOuroboros/dev_gen9_abilities 
Implemented the majority of the Gen. 9 Abilities
 2023-01-02 13:39:38 -05:00
ghoulslash a06135b2f4 Merge pull request #2539 from AsparagusEduardo/RHH/pr/fix/FixEgg 
Fixed Eggs sometimes reading garbage graphic data.
 2023-01-02 13:27:28 -05:00
ghoulslash 79fa2c79e2 Merge pull request #2517 from LOuroboros/speed_swap 
Fixed Speed Swap's effect
 2022-12-19 08:56:36 -05:00
ghoulslash 386a62fe81 Merge pull request #2526 from AsparagusEduardo/RHH/pr/fix/doubleWildChance 
Fixed B_DOUBLE_WILD_CHANCE becoming 1% less than what's set
 2022-12-19 08:55:32 -05:00
ghoulslash 90dd59c039 Merge pull request #2513 from LOuroboros/patch-1 
Update battle.h
 2022-12-13 11:54:18 -05:00
ghoulslash 657e0d755b Merge pull request #2511 from AsparagusEduardo/RHH/pr/cleanup/SpecialStatus 
Reorganized SpecialStatus struct to minimize padding.
 2022-12-11 22:50:17 -05:00
ghoulslash 340278c83b Merge pull request #2452 from LOuroboros/intimidate 
Optimized Intimidate's code
 2022-12-11 22:04:16 -05:00
ghoulslash e3e0d60222 Merge pull request #2467 from Bassoonian/gen9moves 
Generation IX Moves
 2022-12-11 14:47:47 -05:00
ghoulslash 1037613b0e Merge pull request #2418 from LOuroboros/zPP 
Made Z-Moves unusable without PP
 2022-11-28 09:52:28 -05:00
ghoulslash ac30ebd5a4 Merge pull request #2453 from AsparagusEduardo/RHH/pr/cleanup/configShiny 
Refactored Shiny configs + cleanup
 2022-11-28 09:51:39 -05:00
ghoulslash 33873eff6f Merge pull request #2460 from LOuroboros/rareCandiesLv100 
Allow Lv100 'mons to access level based evos
 2022-11-28 09:48:55 -05:00
ghoulslash 23acbb370d Merge pull request #2447 from AsparagusEduardo/RHH/pr/version/1.3.0 
Version 1.3.0
 2022-11-17 21:25:13 -05:00
ghoulslash f3d44f04f0 Merge pull request #1927 from AsparagusEduardo/PE_monAnimations 
Ported Gen 5 & 6 mon animations from Inclement Emerald + added most missing Gen 7 form animations
 2022-11-04 09:17:31 -04:00
ghoulslash 53061c7d62 Merge pull request #2391 from AsparagusEduardo/RHH/pr/sugardoodoodoodoodoodooaahhoneyhoney 
Implemented Honey's Sweet Scent functionality
 2022-11-01 20:09:30 -04:00
ghoulslash c6cb54b54e Merge pull request #2319 from AsparagusEduardo/RHH/pr/Lures 
Implemented Lures and Repel/Lure "use another" menu
 2022-11-01 20:05:15 -04:00
ghoulslash ede6162724 Merge pull request #2388 from AsparagusEduardo/RHH/pr/running 
Config for running indoors
 2022-10-16 09:28:32 -04:00
ghoulslash e3f37ad825 Merge pull request #2389 from AsparagusEduardo/RHH/pr/FixZMove 
Fixed Z-Move not being cleared if Pokémon faints
 2022-10-16 09:27:23 -04:00
ghoulslash d64e18d0b4 Merge pull request #2385 from LOuroboros/trainerClassBasedBalls 
Added class-based Poké Balls for trainers
 2022-10-14 10:19:20 -04:00
ghoulslash 6363e61043 Merge pull request #2381 from AsparagusEduardo/RHH/1.2.0 
Version 1.2.0
 2022-10-07 18:33:00 -04:00
ghoulslash 06bddbac23 Merge pull request #2379 from AsparagusEduardo/RHH/pr/pretmerge_20221007 
One for the go! (pret merge 2022/10/07)
 2022-10-07 17:14:00 -04:00
ghoulslash 1a9f6abe99 Merge pull request #2380 from AsparagusEduardo/RHH/pr/feature/bWaitTime 
Config for Battle text pause times
 2022-10-07 16:32:29 -04:00
ghoulslash 9164f03f96 Merge pull request #2141 from Sneed69/Triple-Kick-Fix 
Triple kick power calc rework
 2022-10-07 16:31:50 -04:00
ghoulslash 5f6e97af7f Merge pull request #2283 from AsparagusEduardo/RHH/pr/pokemonConfig 
Toggles for Pokémon species by generation
 2022-10-07 13:24:13 -04:00
ghoulslash 441586f23f Merge pull request #2293 from AsparagusEduardo/RHH/pr/pokemonFlags 
4 new species flags
 2022-10-07 10:55:43 -04:00
ghoulslash d7f7fa7d07 Merge pull request #2376 from AsparagusEduardo/RHH/pr/feature/ballsMulti 
Changed ballMultiplier to account for future Hisuian ball multipliers
 2022-10-07 10:48:02 -04:00
ghoulslash 1e04c80dfa Merge pull request #2367 from AsparagusEduardo/RHH/pr/feature/MewTeach 
Special handling for Mew's Teachable moveset
 2022-10-07 10:39:56 -04:00
ghoulslash 7c7eb8ac7f Merge pull request #2365 from AsparagusEduardo/RHH/pr/BattleArenaBide 
Added missing Bide exception to Battle Arena Mind Points
 2022-10-07 10:32:47 -04:00
ghoulslash 923046c993 Merge pull request #2359 from AsparagusEduardo/RHH/pr/pretmerge_20220925 
I don't have any Sunday memes (pret merge 2022-09-25)
 2022-10-07 10:25:59 -04:00
ghoulslash 6e276b5f4d Merge pull request #2339 from AsparagusEduardo/RHH/pr/MindRatings 
Extrapolated Battle Arena's move Mind ratings
 2022-09-26 21:04:16 -04:00
ghoulslash ff42806e04 Merge pull request #2335 from AsparagusEduardo/RHH/pr/MultiBattleFix 
Multi battle interface fix
 2022-09-26 09:12:40 -04:00
ghoulslash 8ecdf68491 Merge pull request #2360 from TheXaman/rhh_pokemon_debug_fix 
Fixes: Pokémon Debug isn't loading female icon palettes correctly
 2022-09-26 09:09:14 -04:00
ghoulslash e41c2efc39 Merge pull request #2361 from AsparagusEduardo/RHH/pr/moveTypeConfig 
Separate config for updated move types
 2022-09-26 09:08:41 -04:00
ghoulslash b75c8e0525 Merge pull request #2330 from rh-hideout/1.1.0 
Version 1.1.0
 2022-09-17 10:46:34 -04:00
ghoulslash 8bbe1b9037 Merge pull request #2327 from AsparagusEduardo/RHH/pr/Metronome 
Config to limit the moves called by Metronome (by generation)
 2022-09-16 11:03:33 -04:00
ghoulslash 62815d9763 Merge pull request #2308 from AsparagusEduardo/RHH/pr/pretmerge_20220909 
Friday merge, what a concept (weekly pret merge 2022/09/09)
 2022-09-16 11:03:01 -04:00
ghoulslash ed81ec41bc Merge pull request #2324 from ghoulslash/be/aiswitch 
fix ai switch semi invulnerable
 2022-09-15 23:15:02 -04:00
ghoulslash 133aa9e28d Merge pull request #2306 from AsparagusEduardo/RHH/pr/autogenNames 
Generating music names for the debug menu based on their labels
 2022-09-15 18:02:27 -04:00
ghoulslash 6616c89451 Merge pull request #2303 from Blackforest92/RHH-PR-Branch 
Tidying graphics - Trio Weather
 2022-09-15 18:01:43 -04:00
ghoulslash 6cfacb396e Merge pull request #2307 from AsparagusEduardo/RHH/pr/debugMapCount 
Automated creation of MAP_GROUP_COUNT for the debug menu
 2022-09-15 18:01:05 -04:00
ghoulslash 5bdd292dc3 Merge pull request #2310 from AsparagusEduardo/RHH/pr/FairyUses 
Added missing uses of Fairy type for Union Room and Battle Factory
 2022-09-15 18:00:38 -04:00
ghoulslash 354a8256e4 Merge pull request #2226 from Porygon23/AI-Logic-Updates 
Added corner case logic for AI Switching.
 2022-09-15 17:56:35 -04:00
ghoulslash 61cde312cc Merge pull request #2301 from Blackforest92/RHH-PR-Branch 
Tyding graphics - Acupressure
 2022-09-09 10:26:23 -04:00
ghoulslash d33e4b0fe8 Merge pull request #2297 from AsparagusEduardo/RHH/pr/configRefactor 
Config refactor
 2022-09-06 15:32:37 -04:00
ghoulslash 79bfbfb1b0 Merge pull request #2198 from AsparagusEduardo/BE_BattlePikeComatose 
Comatose prevents Battle Pike's status effects.
 2022-09-06 15:18:48 -04:00
ghoulslash 59de7e48e5 Merge pull request #2265 from AsparagusEduardo/RHH_substructFix 
Fixed PokemonSubstruct3 alignment
 2022-09-06 15:14:45 -04:00
ghoulslash 971081b8fd Merge pull request #2286 from AsparagusEduardo/RHH/pr/pretMerge_20220902 
Flat Merge Friday (Weekly merge)
 2022-09-06 15:13:47 -04:00
ghoulslash 51a569b66b Merge pull request #2290 from AsparagusEduardo/RHH/pr/ballMulti_fix 
Fixed ball multiplier fallthroughs
 2022-09-06 15:10:28 -04:00
ghoulslash 2cd01bd95d Merge pull request #2239 from DizzyEggg/quash 
Quash
 2022-08-29 10:43:54 -04:00
ghoulslash ae2ff4c1d8 Merge pull request #2258 from AsparagusEduardo/RHH_enableBugfix 
Enable BUGFIX by default
 2022-08-26 09:56:19 -04:00
ghoulslash 552d1f3d7b Merge pull request #2237 from gruxor/compat_define 
Reworked branch defines into single compatibility define
 2022-08-25 15:36:01 -04:00
ghoulslash 15a368163d Merge pull request #2247 from AsparagusEduardo/RHH_specialPic 
LoadSpecialPokePic adjustments
 2022-08-25 15:35:21 -04:00
ghoulslash 591bac25c4 Merge pull request #2243 from AsparagusEduardo/RHH_placeholderMoves 
Moves with EFFECT_PLACEHOLDER can't be used.
 2022-08-25 15:34:23 -04:00
ghoulslash b45e1887d8 Merge pull request #2242 from AsparagusEduardo/RHH_fixOrbPower 
Fixed creation trio orbs not boosting power for non-base forms.
 2022-08-25 15:18:02 -04:00
ghoulslash 90ae339cac Merge pull request #2240 from AsparagusEduardo/RHH_fixBEMerge 
Included PR #2219 that was accidentally merged into BE
 2022-08-25 08:47:38 -04:00
ghoulslash f736766c94 Merge pull request #2238 from DizzyEggg/multi 
Wild multi battles and doubles 2 vs 1 interface
 2022-08-25 08:47:02 -04:00
ghoulslash eb0cc91dce Merge pull request #2224 from AsparagusEduardo/BE_cosntantsZmove 
B_WIN constants in battle_z_move.c
 2022-08-08 21:13:23 -04:00
ghoulslash 1259cf3cac Merge pull request #2225 from AsparagusEduardo/BE_pausesAndWaits 
Using B_WAIT_TIME_LONG for new battle scripts
 2022-08-08 21:13:02 -04:00
ghoulslash 154c38050a Merge pull request #2215 from AsparagusEduardo/BE_steamEruption 
Fixed Steam Eruption's long name
 2022-07-30 09:06:20 -04:00
ghoulslash aa00812f81 Merge pull request #2183 from Greenphx9/16-letter-move-names 
16-letter Move Names
 2022-07-29 08:17:43 -04:00
ghoulslash 0c79d04dec Merge pull request #1928 from AsparagusEduardo/BE_fixTransformForm 
Prevent Transforming Pokémon from changing forms
 2022-07-28 22:26:56 -04:00
ghoulslash 5a850b0b4e Merge pull request #2212 from AsparagusEduardo/BE_healBallFix 
Fixed Heal Ball not always healing caught Pokémon
 2022-07-28 22:22:20 -04:00
ghoulslash 57e2de092b Merge pull request #2210 from LOuroboros/prankster 
Corrected usage of B_PRANKSTER_DARK_TYPES in AI_CheckBadMove
 2022-07-24 07:29:03 -04:00
ghoulslash 1260666c91 Merge pull request #1911 from AsparagusEduardo/PE_breedOverrides 
Added Egg breeding species overrides.
 2022-07-22 14:05:14 -04:00
ghoulslash cef730e451 Merge pull request #2196 from AsparagusEduardo/IE_pretmerge 
Item Expansion pret merge
 2022-07-22 14:01:50 -04:00
ghoulslash 0588bba193 Merge pull request #2195 from AsparagusEduardo/PE_pretmerge 
Pokémon Expansion pret merge
 2022-07-22 14:01:27 -04:00
ghoulslash 3a77b52bad Merge pull request #2194 from AsparagusEduardo/BE_pretmerge 
Battle Engine pret merge
 2022-07-22 14:00:40 -04:00
ghoulslash a51acab9e3 Merge pull request #2193 from AsparagusEduardo/BE_plusMinus 
Config for Plus and Minus interaction
 2022-07-21 16:48:04 -04:00
ghoulslash 24bb2f7ed0 Merge pull request #2179 from LOuroboros/pinch 
Removed global and unused IsPinchBerryItemEffect
 2022-07-21 16:14:56 -04:00
ghoulslash 49a932a892 Merge pull request #2205 from AsparagusEduardo/BE_LightThatBurnsTheSky 
Fixed Light That Burns The Sky not using the calculated damage category
 2022-07-21 16:14:38 -04:00
ghoulslash 30a494f964 Merge pull request #2197 from AsparagusEduardo/BE_explosion 
Config for Explosion halving defense
 2022-07-21 16:11:32 -04:00
ghoulslash 504600c996 Merge pull request #2201 from AsparagusEduardo/BE_sturdy 
Config for Sturdy's Gen5+ effect.
 2022-07-21 16:09:01 -04:00
ghoulslash 2ce32afeaa Merge pull request #2202 from AsparagusEduardo/BE_SkyDrop 
Sky Drop fixes
 2022-07-21 16:06:42 -04:00
ghoulslash 2fc15ab779 Merge pull request #2203 from AsparagusEduardo/BE_ghostEscapeAiFix 
Ghost Escape config AI fix
 2022-07-21 16:00:33 -04:00
ghoulslash 462a144956 Merge pull request #2200 from AsparagusEduardo/BE_ZMove_power 
Updated Z-Move power for Gen 8 moves and moves with power varying by Gen
 2022-07-20 18:10:31 -04:00