pokeemerald

mirror of https://github.com/pret/pokeemerald.git synced 2026-05-16 00:24:59 -05:00

Author	SHA1	Message	Date
kittenchilly	c427d96f3f	Better Ultra Burst animation	2023-08-29 19:13:21 -05:00
kittenchilly	f95b4fdb4c	Merge branch 'upcoming' into ultraburst	2023-08-17 13:25:00 -05:00
Eduardo Quezada	a6dbb68bac	Merge branch 'RHH/master' into RHH/upcoming # Conflicts: # data/battle_scripts_1.s # src/battle_util.c # src/battle_z_move.c	2023-08-17 13:42:09 -04:00
LOuroboros	2d45b9b8fe	Corrected conditionals used for B_SPEED_BUFFING_RAPID_SPIN and I_GEM_BOOST_POWER (#3232 )	2023-08-14 16:14:12 -04:00
sbird	6a622eb006	Merge remote-tracking branch 'pret/master' into feature/dynmulti	2023-08-14 13:20:03 +02:00
GriffinR	c5fb5fbb5f	Merge pull request #1906 from AsparagusEduardo/pret/pr2/butItFailed Renamed "ButItFailed" script names	2023-08-12 23:00:57 -04:00
kittenchilly	5e8caa8d45	Merge branch 'upcoming' into ultraburst	2023-08-12 12:36:11 -05:00
Eduardo Quezada	952bacd858	Merge branch 'RHH/master' into RHH/upcoming # Conflicts: # .github/ISSUE_TEMPLATE/01_battle_engine_bugs.yaml # .github/ISSUE_TEMPLATE/02_battle_ai_issues.yaml # .github/ISSUE_TEMPLATE/04_other_errors.yaml	2023-08-11 17:50:28 -04:00
Eduardo Quezada D'Ottone	1ba70a46f2	Fixed Jump Kick's recoil not happening after Spiky Shield's damage (#3208 ) Co-authored-by: DizzyEggg <jajkodizzy@wp.pl>	2023-08-11 17:26:43 -04:00
Eduardo Quezada	33b16cb82d	2nd pass	2023-08-11 16:55:27 -04:00
GriffinR	b248791f47	Merge pull request #1904 from GriffinRichards/temp-alias Add temp flag and var aliases	2023-08-11 15:45:00 -04:00
kittenchilly	c3e31af5f3	Ultra burst trigger	2023-08-09 22:12:26 -05:00
Martin Griffin	912a80e27a	Reference TMs and HMs by move instead of number (#1732 )	2023-08-09 10:51:01 -04:00
Eduardo Quezada	8a3eaadf7b	Renamed "ButItFailed" script name to align with names below it	2023-08-08 08:58:57 -04:00
Alex	42992ca5ce	Fix Teleport ending trainer battles (#3166 )	2023-08-07 11:23:12 -04:00
Alex	8ee3a3c5bb	solve conflics	2023-08-07 14:25:30 +02:00
GriffinR	866c32a735	Add temp var aliases	2023-08-04 14:17:28 -04:00
ghoulslash	4ae6ae4de3	Reset all battler IDs at battle start (#3111 ) * reset battler IDs before BattleScript_OverworldTerrain and BattleScript_OverworldWeatherStarts to prevent playanimation from executing on invalid battler ids * replace BS_SCRIPTING with BS_BATTLER_0 in BattleScript_OverworldTerrain and BattleScript_OverworldWeatherStarts --------- Co-authored-by: ghoulslash <pokevoyager0@gmail.com>	2023-08-04 08:57:06 +02:00
GriffinR	6d4dadd7b5	Add temp flag aliases	2023-08-03 15:55:06 -04:00
Martin Griffin	17555feb20	Animation script cleanup and fixes - Part 2 (#3193 )	2023-08-02 12:28:29 +01:00
Eduardo Quezada	f94efa94e1	Merge branch 'RHH/master' into RHH/upcoming	2023-08-02 01:18:07 -04:00
ghoulslash	7a814999e5	MOVE_CORROSIVE_GAS Effect (#3152 ) # Conflicts: # data/battle_anim_scripts.s # data/battle_scripts_1.s # include/constants/battle_move_effects.h	2023-08-02 01:05:54 -04:00
Eduardo Quezada	87050d8c08	Fix Stamina/Wind Power/Electromorphosis/Rattled issues with targets (#3143 )	2023-08-01 23:54:04 -04:00
Philipp AUER	44eb6260cc	[battle, anim] woodhammer animation overhaul (#3192 ) * [battle, anim] woodhammer animation overhaul * squashme: timings --------- Co-authored-by: sbird <sbird@no.tld>	2023-08-01 19:10:18 -04:00
Eduardo Quezada	e21346dd67	Fixed Rage Powder's animation not turning the user red	2023-08-01 19:05:39 -04:00
Eduardo Quezada	d0277fc04f	Cleaned: createvisualtask AnimTask_BlendColorCycle	2023-08-01 19:05:18 -04:00
Eduardo Quezada	2cf7f54a6b	Cleaned: 3 more createvisualtask - AnimTask_CanBattlerSwitch - AnimTask_BlendMonInAndOut - AnimTask_CentredFrozenIceCube	2023-08-01 19:05:11 -04:00
Eduardo Quezada	ac519bd5d3	Cleaned: createvisualtask AnimTask_FlailMovement & AnimTask_ElectricChargingParticles	2023-08-01 19:05:04 -04:00
Eduardo Quezada	eef07a9f9f	Cleaned: createvisualtask AnimTask_HorizontalShake	2023-08-01 19:04:56 -04:00
Eduardo Quezada	5fc5e5703c	Cleaned: createvisualtask AnimTask_RockMonBackAndForth & AnimTask_PositionFissureBgOnBattler	2023-08-01 19:04:47 -04:00
Eduardo Quezada	323b771630	Cleaned: createvisualtask AnimTask_ScaleMonAndRestore & AnimTask_RotateMonSpriteToSide	2023-08-01 19:03:52 -04:00
Eduardo Quezada	b4ad3be0cb	Cleaned: createvisualtask AnimTask_ShakeMon	2023-08-01 19:02:59 -04:00
Eduardo Quezada	1d25dd0c93	Cleaned: createvisualtask AnimTask_ShakeMon2	2023-08-01 19:02:57 -04:00
Eduardo Quezada	d3f170ef0f	Cleaned: createvisualtask AnimTask_ShakeMonInPlace	2023-08-01 19:02:14 -04:00
Eduardo Quezada D'Ottone	15c0ea253a	Animation script cleanup and fixes - Part 1 (#3185 ) * Cleaned: visible, monbg & invisible * Cleaned: createvisualtaskontargets AnimTask_ShakeMon * Cleaned: createvisualtask SoundTask_PlayDoubleCry * Fixed: createvisualtask SoundTask_PlayCryWithEcho Checksum changed from 7a05d0b5b2cd65346597a9a598c7f7cde1570475 to 35eae7f4357391b1ce38f0d79715f47f92c82087 * Cleaned: createvisualtask SoundTask_PlayCryHighPitch * Cleaned: createvisualtask AnimTask_WindUpLunge * Cleaned: createvisualtask AnimTask_TranslateMonEllipticalRespectSide * Cleaned: createvisualtask AnimTask_SwayMon * Cleaned: createvisualtask AnimTask_Splash * Removed bad use of: createvisualtask AnimTask_Splash in Move_ROCK_CLIMB It wasn't breaking the animation because ANIM_ATTACKER (0) was being passed for the hop count, essentially skipping the animation. * Cleaned: createvisualtask AnimTask_ShockWaveProgressingBolt & AnimTask_ShakeMonInPlace * Fixed Move_PLASMA_FISTS's use of AnimTask_ShockWaveProgressingBolt	2023-07-31 23:17:50 +02:00
DizzyEggg	5eec3b2fc3	fix various issues with primal weather blocking water/fire type moves (#3138 ) * fix various issues with primal weather blocking water/fire type moves * forgot to change return to effect=1 * fix bugs	2023-07-30 10:50:51 -04:00
Alex	bca29d8586	Adds Mortal Spin and Population Bomb	2023-07-26 17:37:56 +02:00
LOuroboros	cd5f997ee3	Added a debug feature to hatch eggs (#3155 )	2023-07-21 12:06:05 +02:00
Eduardo Quezada	47cea526ec	Merge branch 'RHH/master' into RHH/upcoming # Conflicts: # src/battle_util.c	2023-07-19 23:22:07 -04:00
Alex	6b5d1e7577	Adds some gen9 moves (#3147 ) * Adds some gen9 moves * Fix Test + Tabs * Collision Course boost changed to 1.3333	2023-07-19 13:25:20 +02:00
Eduardo Quezada D'Ottone	6fec0e4dd1	Ported TheXaman's latest changes to the Debug Menu (#2815 ) * Added option for generating incrementing pokemon in pc boxes # Conflicts: # src/debug.c * added submenu arrows, increased menu high to full screen # Conflicts: # src/debug.c * combined flags and vars into one submenu # Conflicts: # src/debug.c * added new window to flags/vars showing the current state and added submenu indicator # Conflicts: # src/debug.c * added alligned arrows for debug submenus # Conflicts: # src/debug.c * used {CLEAR_TO X} instead of manual spaces # Conflicts: # src/debug.c * renamed gDebugText to proper sDebugText # Conflicts: # src/debug.c * added Fill submenu, added fill function for PC items and all bag pockets @LOuroboros # Conflicts: # src/debug.c * put cheat start into utility # Conflicts: # src/debug.c * put fill submenu into main menu # Conflicts: # src/debug.c * tiny fix * renaming and reordering # Conflicts: # src/debug.c * Added reset pokedex flags for @AsparagusEduardo * made flag toggle list dynamic # Conflicts: # src/debug.c * initial battle debug menu WIP # Conflicts: # src/debug.c # src/wild_encounter.c * fix visual bug * added battle start # Conflicts: # include/debug.h # src/battle_ai_script_commands.c * Added faster way to add initial movesets to mon * Added waiting music for the slow box filling * Simplified the call to scripts * Simplified debug scripts * Disabled Battle Test for now * Fixed personality on fast PC fill being always 0 * Removed BATTLE_ENGINE instances + added AI_FLAG_COUNT * Added missing return TRUE * Sets nickname * Changed how GetSpeciesName to how it's used upstream --------- Co-authored-by: TheXaman <48356183+TheXaman@users.noreply.github.com>	2023-07-18 09:17:03 +02:00
DizzyEggg	c0f10623d6	Merge branch 'be/staminafix' of https://github.com/ghoulslash/pokeemerald into stamina_fix	2023-07-17 15:35:40 +02:00
DizzyEggg	1f1d24b3e4	Fix Primal Reversion not activating when switching in after fainting (#3141 ) * Fixed Primal Reversion not activating when switching in after a fainting * add tests for primal reversion Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>	2023-07-16 12:26:54 +01:00
Martin Griffin	17f8f50a59	Merge remote-tracking branch 'rhh/master' into upcoming	2023-07-16 07:46:34 +01:00
DizzyEggg	381aa58587	Fix Bad Dreams ability pop-up + tests (#3131 ) * Fix all bad dreams issues and add tests Co-authored-by: ShaeTsuPog <shaetsu@protonmail.com>	2023-07-16 06:38:00 +01:00
Eduardo Quezada	4405f79d24	Merge branch 'RHH/master' into RHH/upcoming	2023-07-06 13:15:06 -04:00
Eduardo Quezada	1980a115b4	Integrated GAME_STAT_ENTERED_BATTLE_TOWER bugfix from upstream	2023-07-06 13:07:03 -04:00
Eduardo Quezada	f21953f254	Merge remote-tracking branch 'pret/master' into RHH/master	2023-07-06 13:06:31 -04:00
Eduardo Quezada D'Ottone	1fa9a05470	Convert move flags and bans into GCC bitfields (#2952 ) * Slicing moves to new bitfield * Wind moves to new bitfield * Two-strike moves to new bitfield * Forgot to add flagTwoStrikes to battle_moves.h * Removed "flag" from field names * FLAG_HIT_IN_SUBSTITUTE and FLAG_THAW_USER * Airborne moves * FLAG_POWDER, FLAG_TARGET_ABILITY_IGNORED and FLAG_DANCE * FLAG_BALLISTIC and FLAG_PROTECTION_MOVE * Fixed missing uses of MOVE_UNAVAILABLE in battle_ai_util.c * FLAG_SOUND * FLAG_DMG_UNDERGROUND and FLAG_DMG_UNDERWATER * FLAG_DMG_MINIMIZE * Cleanup * FLAG_STAT_STAGES_IGNORED * Updated Pollen Puff's ballistic flag * FLAG_STRONG_JAW_BOOST and FLAG_MEGA_LAUNCHER_BOOST * thaw * FLAG_THREE_STRIKES * FLAG_IRON_FIST_BOOST * FLAG_RECKLESS_BOOST * FLAG_HIGH_CRIT * Removed empty flags * Moves that fail when called by Me First + added missing Shell Trap * Moves that fail when Gravity is active * Better names for banned fields * Moves that fail when called by Instruct * Cleanup * Contact Moves + Fixed Wandering Spirit skipping contact checks * Inverted FLAG_PROTECT_AFFECTED so that there's a flag for moves that SKIP protect. * Simplified B_MOVE_FLAGS configs * FORBIDDEN_METRONOME * Renamed hitsPastSubstitute to ignoresSubstitute * FORBIDDEN_PARENTAL_BOND * Struggle uncallable by Metronome * FORBIDDEN_MIMIC * FLAG_KINGS_ROCK_AFFECTED * Made a single config for move flags * Macro for checking move flags * FLAG_MAGIC_COAT_AFFECTED * Fixed HasMagicCoatAffectedMove * FLAG_SNATCH_AFFECTED * Removed unused EFFECT_FLINCH_MINIMIZE_HIT * Fixed Stench/King's Rock interaction * Removed sMovesNotAffectedByStench in favor of checking move effects * Removed EFFECT_TWISTER, which was a repeat of EFFECT_FLINCH_HIT * Changed Gen2 configs to less than Gen 3 * FORBIDDEN_SLEEP_TALK * Cleanup * Inverted FLAG_MIRROR_MOVE_AFFECTED * FLAG_SHEER_FORCE_BOOST * Ordered * FORBIDDEN_ASSIST and FORBIDDEN_COPYCAT * Removed TestMoveFlags and TestMoveFlagsInMoveset + flags field * Fixed Triple Arrows test	2023-07-03 10:01:59 +02:00
hetoord	40a5995ead	Teatime tests and fixes (#3096 )	2023-07-03 09:54:43 +02:00
Eduardo Quezada	2c4a9b754d	Merge branch 'RHH/master' into RHH/upcoming	2023-06-30 16:14:57 -04:00
ghoulslash	304fc4c5b5	Fix disobedience wrong move effect issue (#3089 )	2023-06-30 09:03:18 -04:00
Eduardo Quezada D'Ottone	81e59ace25	Cleaned up remaining Castform hack stuff (#3063 ) * Removed gCastformFrontSpriteCoords * Removed sCastformElevations and IsCastformForm * Removed sCastformBackSpriteYCoords and castformPalette in BattleStruct * Scrubbed unused BS commands * Removed B_ANIM_CASTFORM_CHANGE and BattleForm constants * Removed redundant function in Pokémon Debug menu * Removed handling in animation scripts * Removed gBattleMonForms * Reduced MAX_MON_PIC_FRAMES to 2 * Removed Castform/Cherrim makefile stuff * Fixed weather form change tests not checking species. * Fixed Castform palettes after Lunos' PR	2023-06-30 09:58:07 +02:00
Alex	ea7e6265dd	Small Grassy Glide anim bug (#3092 )	2023-06-29 14:07:46 -04:00
Alex	20099274d8	Fix Clear Amulet visual bug + Tests (#3074 ) * Fix Clear Amulet visual bug + Tests TODO Tests, additional tests + Triple Kick pp bug * Wonder Guard message, switch instead of if, misalignments	2023-06-28 12:26:03 -04:00
DizzyEggg	f9058a8544	Fix disobedience wrong move effect issue	2023-06-28 12:47:20 +02:00
Ariel A	4a3f6ba2fe	Merge branch 'lighting' into lighting-expanded-id	2023-06-28 00:11:59 -04:00
Ariel A	c1953e5d4b	Improved OutOfCenterPartyHeal interaction with followers.	2023-06-27 23:40:50 -04:00
PSF	b2901c51b0	Added bugfix for SaveBeforeLinkMultisChallenge to remove extra incrementgamestat	2023-06-27 15:34:31 -07:00
ghoulslash	7371a9e401	Add many gen 8 move animations (#2861 ) * port many gen8 and 9 move anims from cfru * fix thunder cage, shell smash, shelter anims. update anim credits --------- Co-authored-by: ghoulslash <pokevoyager0@gmail.com> Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>	2023-06-21 13:19:54 -04:00
LOuroboros	2bf88502a7	More corrections	2023-06-19 04:18:53 -03:00
Eduardo Quezada	bf814e11cd	Cleanup - Proper whitespace - Bracket pret style - Simplified RemoveObjectEventInternal - SImplified GetMonInfo - Made IsFollowerVisible easier to read	2023-06-18 01:19:46 -04:00
Eduardo Quezada	4bbe3278d6	Cleanup pt1 - Moved Tracks to the end of field effect scripts - Restored whitespace in scripts to minimize conflicts - Restored data/maps/map_groups.json - Proper tab uses in scripts - Allow SHADOW_SIZE_XL to be used	2023-06-17 23:34:01 -04:00
Eduardo Quezada	33012d841a	Cleaning up follower Object Event IDs + Reverted OW Regis TODO: allow OW mon to have their frames play more than once	2023-06-17 23:05:29 -04:00
Eduardo Quezada	116f61f055	Removed unneeded calls to bufferspeciesname	2023-06-17 19:27:33 -04:00
Eduardo Quezada	341ce6fd95	Merge remote-tracking branch 'merrp_origin/followers-expanded-id' into merrp/followers_RHH_merge3 # Conflicts: # .github/workflows/build.yml # README.md # gflib/sprite.c # graphics/pokemon/banette/anim_front.png # graphics/pokemon/banette/normal.pal # graphics/pokemon/sentret/normal.pal # graphics/pokemon/togetic/anim_front.png # graphics/pokemon/togetic/normal.pal # include/battle_script_commands.h # include/data.h # ld_script.txt # src/battle_controller_player.c # src/bike.c # src/event_object_movement.c	2023-06-16 21:25:16 -04:00
LOuroboros	9896f20eb8	Applied fixes and corrections (Jun 2023)	2023-06-15 09:22:26 -03:00
LOuroboros	81bb299e7f	Updated Axe Kick's battle script I have no idea why is this working now when I'm pretty sure it didn't work before, but I consider this a win all the same.	2023-06-13 06:50:48 -03:00
LOuroboros	313f522622	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into gen_9_move_effects_batch2	2023-06-13 05:44:37 -03:00
Ariel A	91794286b5	Improved light color blending logic. Added auxiliary .pla files to gbafx, to support setting color high bits. Updated light palettes to new system.	2023-06-08 21:07:07 -04:00
AgustinGDLV	f91cbe9a36	updated anim macros	2023-05-29 10:23:58 -07:00
AgustinGDLV	3d4789c492	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dynamax	2023-05-28 11:10:50 -07:00
Alex	112636b8f3	Fix Speed Boost animation	2023-05-28 11:54:43 +02:00
ghoulslash	a929ae8b48	Replace launchtemplate and launchtask in battle anims (#2640 ) * replace launchtemplate with createsprite using fix_launchtemplate.py * tidy up script * fix comment handing in fix_launchtemplate.py * fix double comma after sprite template * remove py script * convert launchtask -> createvisualtask * fix launchtask->createvisualtask issue * fix ANIM_PAL ORs * remove launchtemplate, launchtask macros * fix pal macros in z moves * fix bloom doom * add F_PAL_ALL_BUT_DEF * remove all ANIM_PAL_ usages * devestating drake fix * convert launchsoundtask and setblends * Reworked CFRU macro PR --------- Co-authored-by: ghoulslash <pokevoyager0@gmail.com> Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>	2023-05-27 17:32:53 -04:00
Eduardo Quezada D'Ottone	84d9cd0396	Fixed compile issue when disabling overworld debug menu (#3024 )	2023-05-24 08:24:44 -04:00
Eduardo Quezada D'Ottone	b972199141	Battle Item Refactor Fixes (#3022 )	2023-05-23 21:32:57 -04:00
AgustinGDLV	5a8715e608	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into castform_fix	2023-05-23 16:10:44 -07:00
AgustinGDLV	bb10b0d1b0	fixed GetBattlerSide, removed debug script	2023-05-23 15:50:51 -07:00
AgustinGDLV	34382fcece	fixed revive in 1v2 battles	2023-05-23 14:19:24 -07:00
Alex	109b4c4f6c	Small clean up: EndTurnTerrain, BattleScript_GrassyTerrainHeals (#3018 ) remove leftover	2023-05-20 15:58:55 -04:00
LOuroboros	580a09e367	Updated DebugAction_Util_CheckSaveBlock	2023-05-20 15:40:36 -03:00
ghoulslash	487415e56b	Move direct statStage boosts to use statbuffchange (#3000 ) * fix double counting stat boosts for download, moxie beast boost etc * speed boost use statbuffchange * BattleScript_MoveStatDrain use statbuffchange * statbuffchange for rage --------- Co-authored-by: ghoulslash <pokevoyager0@gmail.com>	2023-05-17 11:22:23 -04:00
AgustinGDLV	d133564e21	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dynamax	2023-05-16 21:57:06 -07:00
AgustinGDLV	785b100693	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into castform_fix	2023-05-16 16:29:38 -07:00
AgustinGDLV	0c182345bf	reworked weather form reversion + added more tests	2023-05-16 16:24:25 -07:00
AgustinGDLV	37874fe5c1	fixed revival blessing failure still showing anim (#3010 )	2023-05-16 19:21:05 -04:00
Ariel A	540c536342	Merge branch 'followers-expanded-id' into lighting-expanded-id	2023-05-15 19:15:38 -04:00
Ariel A	5d392244be	Merge branch 'followers' into followers-expanded-id	2023-05-15 19:08:45 -04:00
Ariel A	996f43120d	Merge branch 'followers' into lighting	2023-05-15 18:50:55 -04:00
Ariel A	d12efe8cd7	Merge branch 'master' into followers	2023-05-15 18:37:38 -04:00
Eduardo Quezada D'Ottone	2aca82300c	Merge branch 'upcoming' into mega_evo_issues	2023-05-14 22:33:01 -04:00
AgustinGDLV	dceefacb95	moved tryfaintmon back, no bugs?	2023-05-11 22:35:08 -07:00
AgustinGDLV	3b6389ec21	updated tests	2023-05-11 22:13:43 -07:00
AgustinGDLV	aec51b5b04	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dynamax	2023-05-11 20:02:06 -07:00
ghoulslash	5657f8369e	merge w pret	2023-05-11 10:44:18 -04:00
Ultimate Bob	f985eefaa1	Show Imposter abilty in popup instead of opponent's ability.	2023-05-09 01:40:28 +10:00
Salem	fe5e59c910	Merge branch 'upcoming' into RHH/content/gen9SnowWeather	2023-05-07 17:27:58 +02:00
Eduardo Quezada D'Ottone	c530eb2445	Add mirror herb (#2873 )	2023-05-06 21:20:37 -04:00
Eduardo Quezada D'Ottone	42445512ad	Battle Item Tests + critical fixes + new test macro (#2940 )	2023-05-06 20:43:32 -04:00
AgustinGDLV	a5f28afe42	fixed Forecast and Flower Gift	2023-05-04 17:04:54 -07:00
CallmeEchoo	eb5b81684c	refactored snow into damaging weather this is necessary for ice body to properly work. doesnt actually do any damage	2023-05-05 01:38:12 +02:00
Alex	957ee36c75	Fix for Ceaseless Edge/Axe Kick visual glitch (#2969 )	2023-05-02 17:25:44 -04:00
Salem	a877266400	Merge branch 'upcoming' into RHH/content/gen9SnowWeather	2023-05-02 21:19:01 +02:00
CallmeEchoo	c5a73f59a4	ad suggested changes	2023-05-02 21:17:14 +02:00
Shae	ae2d5f7d1e	Weather related Ability tests, fix for Leaf Guard not preventing Rest. (#2957 )	2023-05-02 14:08:05 -04:00
CallmeEchoo	c32d5f455b	fix rebase issues	2023-05-02 16:44:42 +02:00
CallmeEchoo	f6e80b0ca7	Merge branch 'RHH/content/gen9SnowWeather' of https://github.com/CallmeEchoo/pokeemerald into RHH/content/gen9SnowWeather	2023-05-02 16:29:11 +02:00
CallmeEchoo	76721b16f8	add snow weather	2023-05-02 16:25:26 +02:00
ghoulslash	445e9c4b8b	merge w upcoming	2023-05-01 12:05:07 -04:00
ghoulslash	8cce130643	Add Frostbite status (#2942 )	2023-05-01 09:45:47 -04:00
Ultimate_Bob	32e63d8cc7	Don't copy opponent personality when swapping mon sprite during Mega Evolution (#2852 ) Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>	2023-04-30 21:15:03 -04:00
Alex	2d6282fece	Fix for Burn Up/Double Shock (#2962 )	2023-04-30 10:46:21 -04:00
ghoulslash	62ca66bc6b	Refactoring Battle Form changes into the form change tables (#2411 )	2023-04-30 08:41:54 -04:00
CallmeEchoo	99cbd2af37	add snow weather	2023-04-29 20:35:58 +02:00
Alex	0cbb80dda7	Fix grassy terrain freezing the game (#2959 )	2023-04-28 08:58:43 -04:00
Bassoonian	c279830892	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into formbattlechangecontribution	2023-04-27 10:50:32 +02:00
Eduardo Quezada D'Ottone	408aa30aa7	Merge pull request #17 from AgustinGDLV/pr/castform_fix	2023-04-26 14:25:36 -04:00
Salem	78c4d07b23	Add Berserk Gene Item (#2893 ) Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>	2023-04-25 15:03:57 -04:00
Bassoonian	b1f75569a1	Merge branch 'upcoming' into rhhupcomingdev	2023-04-25 19:50:26 +02:00
CallmeEchoo	503035010e	Merge branch 'upcoming' into battleItemFixes	2023-04-24 21:11:34 +02:00
ghoulslash	868838a87d	Add thunder cage case to trap anim IDs (#2941 )	2023-04-24 14:35:42 -04:00
sbird	12d4b43755	Merge remote-tracking branch 'pret/master' into feature/dynmulti	2023-04-24 18:30:30 +02:00
LOuroboros	a128192bfe	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into trainerSlideMsgUpdate	2023-04-24 09:36:09 -03:00
ghoulslash	1f6e335a24	merge w upcoming	2023-04-23 18:11:57 -04:00
Ariel A	6a89e5b0d2	Merge branch 'followers-expanded-id' into lighting-expanded-id	2023-04-23 17:50:20 -04:00
Ariel A	9e00e23b96	Added OW daycare pokemon.	2023-04-23 17:34:38 -04:00
Bassoonian	f13c39d784	Thawing out for frostbite	2023-04-23 21:20:23 +02:00
Bassoonian	13f6acf9a1	General mechanics	2023-04-23 19:20:48 +02:00
ghoulslash	cf17324040	Fixed duplicate item strings in Bag/Party menus with battle items (#2915 )	2023-04-23 08:32:38 -04:00
Bassoonian	a561c6da6a	Add config to Frostbite & allow it to be inflicted	2023-04-22 23:14:49 +02:00
Bassoonian	f50bfb3770	Frostbite hurts at the end of the turn and halves SpA	2023-04-22 18:47:36 +02:00
CallmeEchoo	38476bd22c	fix Full Restore not healing confusion	2023-04-21 21:37:02 +02:00
LOuroboros	b09ab5a3ee	Updated Triple Arrows' effect's code and tests yet again Also added a function to get a move's secondaryEffectChance, meant to handle abilities, side statuses and the like that modify it.	2023-04-19 01:57:34 -03:00
LOuroboros	28ce87f6d3	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into gen_9_move_effects_batch2	2023-04-18 07:35:59 -03:00
LOuroboros	43a5aa09ef	Corrections -Optimized BattleScript_EffectTakeHeart -Updated the checks for EFFECT_JUNGLE_HEALING and EFFECT_TAKE_HEART in AI_CheckBadMove -Updated the code for MOVE_EFFECT_TRIPLE_ARROWS inside SetMoveEffect	2023-04-18 07:34:05 -03:00
Alex	60c88d8fcc	Update data/battle_scripts_1.s Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>	2023-04-17 19:12:39 +02:00
Alex	0531ab5d87	Fix Ability PopUp freeze	2023-04-17 18:47:54 +02:00
ghoulslash	7d010529d6	merge w master	2023-04-15 22:06:08 -04:00
AgustinGDLV	d3a090020b	added code review	2023-04-15 15:30:07 -07:00
AgustinGDLV	82dc1e3e93	fixed dupe strings in battle item use	2023-04-15 09:27:28 -07:00
Eduardo Quezada	dacd0785db	Fixed Mega Evolution script name	2023-04-14 15:17:19 -04:00
AgustinGDLV	2eabcea86e	Battle Item Refactor (#2902 ) * items that can be used in battle now use battlescripts * removed ExecuteTableBasedItemEffect_ * taught AI how to use items, removed AI_itemtype/flag * X-Items store stages raised in holdEffectParam * USE_ITEM in tests	2023-04-14 19:25:50 +01:00
Eduardo Quezada	11beec62ee	Merge branch 'RHH/upcoming' into RHH/pr/feature/formBattleChange # Conflicts: # src/data/pokemon/evolution.h # src/field_poison.c	2023-04-14 11:31:02 -04:00
Eduardo Quezada	7c29a24110	Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretsync20230413	2023-04-13 17:05:48 -04:00
AgustinGDLV	86242c1c70	MOVE_REVIVAL_BLESSING Effect (#2883 ) * implemented Revival Blessing	2023-04-12 01:14:25 +01:00
AgustinGDLV	d9ab2d1976	combined TerrainSeed and TerrainAbility loops + added terrain tests	2023-04-03 18:53:34 -07:00
AgustinGDLV	f292fefca3	fixed bad switchinabilities call in TerrainSeedLoop	2023-04-03 09:18:47 -07:00
LOuroboros	5bde98741a	Completed Take Heart's effect It was missing its "heals any status condition" effect because I'm dumb and I forgot to actually go and do it.	2023-03-29 00:23:46 -03:00
ghoulslash	afc4b4cdee	add mirror herb	2023-03-28 15:07:37 -04:00
LOuroboros	ed9e860400	Post cherrypick corrections and improvements -Made BattleScript_EffectTakeHeart use modifybattlerstatstage -Optimized usage of BattleScript_EffectInfernalParade -Tweaked the way in which Triple Arrows' increased crit. hit chance is handled -Optimized syntax for case MOVE_EFFECT_TRIPLE_ARROWS in SetMoveEffect -Optimized case EFFECT_INFERNAL_PARADE in CalcMoveBasePower -Infernal Parade is not known to interact with Comatose, so Eduardo and I will extrapolate that here -Added AI conditionals for some of the effects -Made Triage notice Jungle Healing and moves that use its effect	2023-03-28 10:08:52 -03:00
AgustinGDLV	504ec36b2b	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dynamax	2023-03-27 16:22:11 -07:00
AgustinGDLV	2017bee3f8	fixed Castform + Cherrim	2023-03-27 11:35:23 -07:00
AgustinGDLV	8a963ca38a	changed Dynamax animation	2023-03-27 09:50:58 -07:00
Eduardo Quezada	3888b10769	Merge branch 'RHH/upcoming' into RHH/pr/feature/formBattleChange # Conflicts: # src/data/pokemon/form_change_table_pointers.h # src/data/pokemon/form_change_tables.h	2023-03-27 10:55:38 -03:00
AgustinGDLV	aa80e3fd4e	fixed G-Max Wildfire, Max Guard interactions, and reworked changedSpecies	2023-03-26 19:14:33 -07:00
LOuroboros	000077f671	Implemented Axe Kick's effect	2023-03-26 20:05:30 -03:00
LOuroboros	8ae57dc912	Implemented Take Heart's effect	2023-03-26 20:05:13 -03:00
LOuroboros	05a34edb7d	Implemented Infernal Parade's effect	2023-03-26 20:04:55 -03:00
LOuroboros	1595a66559	Implemented Triple Arrows' effect	2023-03-26 20:04:36 -03:00
ghoulslash	6574e01e73	Gen. 9 Move Effects, 1st batch (#2534 )	2023-03-26 16:20:47 -04:00
AgustinGDLV	aac4ef4d2a	fixed terrain effects	2023-03-25 20:02:48 -07:00
AgustinGDLV	f633d164e1	gave Max Wyrmwind a placeholder anim	2023-03-25 09:59:16 -07:00
AgustinGDLV	5d508f7963	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dynamax	2023-03-24 22:40:51 -07:00
GriffinR	6be9a79b8c	Merge pull request #1871 from GriffinRichards/doc-trendy-sayings Document the trendy sayings word group	2023-03-24 08:05:51 -04:00
AgustinGDLV	7988c53d01	compile fix + placeholder animations (Wyrmwind broken?)	2023-03-23 22:27:26 -07:00
Zunawe	492422b6bd	Fix scanner item flag name	2023-03-23 21:47:26 -07:00
LOuroboros	7ce5c5fc66	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into gen_9_move_effects_batch1	2023-03-23 06:27:09 -03:00
AgustinGDLV	038649594a	finished G-Max Move tests	2023-03-22 22:31:08 -07:00
AgustinGDLV	a3c8b97a6c	added tests for status1/status2 effects + bug fixes for them	2023-03-22 20:18:25 -07:00
AgustinGDLV	6233627a57	more tests + fixed hp reversion issues	2023-03-22 17:04:05 -07:00
tennis	358180946d	Fix Intimidate targetting dead sides and false postpones	2023-03-22 11:46:50 +00:00
Eduardo Quezada	ef914a2fac	Merge branch 'RHH/upcoming' into RHH/pr/feature/formBattleChange	2023-03-21 16:13:27 -03:00
May8th1995	9ec31c61bf	Fixes weirdly set value for eject buttons etc (#2846 ) * Fixes weirdly set value for eject buttons etc * Remove known fialing from fixed test --------- Co-authored-by: tennis <May8th1995@users.noreply.github.com>	2023-03-21 20:12:46 +01:00
AgustinGDLV	69fd63a922	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dynamax	2023-03-21 09:56:58 -07:00
AgustinGDLV	5a9e1de836	Merge branch 'RHH/pr/feature/formBattleChange' of https://github.com/AsparagusEduardo/pokeemerald into dynamax	2023-03-20 21:14:33 -07:00
AgustinGDLV	7d70222770	added most Dynamax immunities/interactions + tests + fixed some move selection bugs	2023-03-20 16:40:05 -07:00
Eduardo Quezada	51b716c9d9	Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pret_20230319 # Conflicts: # data/battle_scripts_2.s # include/constants/battle_string_ids.h # include/constants/songs.h # src/battle_message.c # src/data/pokemon/species_info.h	2023-03-19 20:28:56 -03:00
LOuroboros	f4e8389779	Added Psyblade and Hydro Steam	2023-03-17 09:25:39 -03:00
LOuroboros	aefd318945	Applied review suggestions and expanded usage of activateAfterFaint in Cmd_setmoveeffect	2023-03-14 11:43:52 -03:00
Ariel A	582761f56a	Merge branch 'lighting' into lighting-expanded-id	2023-03-13 18:22:53 -04:00
Ariel A	284ec24e0c	Merge branch 'followers-expanded-id' into lighting-expanded-id	2023-03-13 18:19:35 -04:00
Ariel A	35b4d2f37e	Merge branch 'followers' into lighting	2023-03-13 18:18:08 -04:00
Ariel A	6b2e49ffbc	Updated Ever Grande window lights.	2023-03-13 18:15:42 -04:00
Ariel A	96c829ca99	Merge branch 'followers' into followers-expanded-id	2023-03-13 17:59:44 -04:00
Ariel A	b1ea5fb8c3	Fixed bug with applymovement not hiding followers after a battle.	2023-03-13 17:51:35 -04:00
GriffinR	0c380862d6	Document the trendy saying word group	2023-03-13 15:58:40 -04:00
Eduardo Quezada	a0feaabef1	Merge branch 'RHH/upcoming' into RHH/pr/feature/formBattleChange	2023-03-12 15:53:32 -03:00
Eduardo Quezada	7ce68994ec	Made Mega Evolution properly use TryBattleFormChange	2023-03-12 02:32:09 -03:00
AgustinGDLV	b708da3998	Merge branch 'RHH/pr/feature/formBattleChange' of https://github.com/AsparagusEduardo/pokeemerald into dynamax	2023-03-11 00:17:30 -08:00
AgustinGDLV	4293dc8a24	not entirely confident implementation of Dynamax indicator	2023-03-10 23:03:51 -08:00
AgustinGDLV	ec4b330b9b	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dynamax	2023-03-10 21:00:41 -08:00
AgustinGDLV	06bf934b02	Dynamaxed pokemon now have increased HP	2023-03-10 20:38:17 -08:00
LOuroboros	6dbe772e27	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into trainerSlideMsgUpdate	2023-03-10 18:23:33 -03:00
AgustinGDLV	76073fab52	added basic Dynamax-in-battle	2023-03-10 10:20:27 -08:00
LOuroboros	f06c040bca	Updated the debug menu -Updated the text string used by Debug_FlagsNotSetMessage. -Renamed Debug_FlagsNotSetMessage to Debug_FlagsNotSetOverworldConfigMessage. -Added an equivalent for the battle config file called Debug_FlagsNotSetBattleConfigMessage, -DEBUG_FLAG_NO_COLLISION -> OW_FLAG_NO_COLLISION -And moved it to include/config/overworld.h, because at the end of the day it's still an overworld flag just like the other 2 already in that file. -Corrected miswritten preproc config in DebugAction_Flags_CatchingOnOff. -Updated the comment that describes the effect of DEBUG_OVERWORLD_MENU reducing the number of characters a tiny bit and fixing a typo.	2023-03-08 15:27:22 -03:00
DizzyEggg	bf4735e87c	remove test changes	2023-03-08 13:41:08 +01:00
DizzyEggg	f6089a0057	Mega Evolution after switching and based on speed	2023-03-07 22:34:57 +01:00
AgustinGDLV	7de7599a7b	reworked scripts to remove jumpifnotally / jumpiftargetabsent	2023-03-07 12:07:11 -08:00
Eduardo Quezada	4625a46748	Merge branch 'RHH/upcoming' into RHH/pr/feature/formBattleChange # Conflicts: # src/battle_interface.c # src/battle_main.c # src/battle_script_commands.c # src/battle_util.c	2023-03-07 11:26:33 -03:00
Eduardo Quezada D'Ottone	81a80e566c	Refactor Mega Evolution indicator sprite (#2805 )	2023-03-07 08:06:28 -03:00
DizzyEggg	a04046dbb6	Add tests for Defog and fix Defog battle strings (#2737 ) * start working on defog tests * defog tests + improve terrain end battlescripts * newline	2023-03-06 20:35:08 +01:00
DizzyEggg	306c4565a0	merge	2023-03-06 15:32:28 +01:00
Eduardo Quezada D'Ottone	b3ffc9d1c4	Set link tutorial as complete when using Cheat Start (#2802 )	2023-03-06 09:29:34 +01:00
GriffinR	bb078e0618	Merge pull request #1864 from AsparagusEduardo/pret/doc/songsComments Document music usage to make it easier to search for a specific track	2023-03-05 15:29:38 -05:00
Eduardo Quezada	a6bd35ceab	Review changes	2023-03-05 17:17:39 -03:00
ghoulslash	dec1b16138	Swallow/Spit Up Gen 5 Behavior and tests for Swallow/Spit Up/Stockpile (#2790 )	2023-03-05 09:50:47 -05:00
GriffinR	ce6875817f	Merge pull request #1860 from GriffinRichards/metatile-labels Format metatile_labels	2023-03-04 23:36:04 -05:00
ghoulslash	7bb8115099	add start menu funcs, credit deokishisu	2023-03-03 09:08:05 -05:00
Eduardo Quezada	9917f5cc8b	Merge remote-tracking branch 'pret/master' into RHH/sync/pret_20230303 # Conflicts: # Makefile # include/constants/pokemon.h # include/pokemon.h # make_tools.mk # src/battle_ai_script_commands.c # src/battle_controllers.c # src/battle_main.c # src/battle_script_commands.c # src/party_menu.c # src/pokemon.c # src/trade.c # src/trainer_pokemon_sprites.c	2023-03-03 11:00:50 -03:00
ghoulslash	4e138fa4b7	Fix wrong Contrary message when affected by Intimidate (#2723 )	2023-03-02 09:38:00 -05:00
LOuroboros	fe735f9700	Applied review suggestions -Merged EFFECT_CEASELESS_EDGE and EFFECT_STONE_AXE into EFFECT_HIT_SET_ENTRY_HAZARD -Updated gDmgHazardsStringIds and relevant battle scripts. Can't say that I like it at all. String tables are stupid imo. -Coupled Barb Barrage's effect in CalcMoveBasePower with Venoshock's	2023-03-02 01:39:44 -03:00
LOuroboros	fe74dd938b	Small corrections	2023-03-01 04:00:19 -03:00
LOuroboros	23673c2e9d	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into gen_9_move_effects_batch1	2023-03-01 03:57:00 -03:00
AgustinGDLV	7c853ef45e	implemented G-Max Sweetness, Overgrowth, One Blow, Rapid Flow, and Finale	2023-02-28 16:37:48 -08:00
GriffinR	ec89e519f9	Merge pull request #1858 from AsparagusEduardo/pret/doc/fateful Rename eventLegal to modernFatefulEncounter	2023-02-28 11:48:34 -05:00
AgustinGDLV	3cdcf2a356	implemented G-Max Chi Strike, finished G-Max Gold Rush	2023-02-27 22:01:19 -08:00
AgustinGDLV	da24b717e4	implemented all status1 and status2 G-Max Moves: Befuddle, Volt Crash, Malodor, Stun Shock, Gold Rush, Cuddle, Terror, Meltdown, Smite	2023-02-27 21:26:03 -08:00
ghoulslash	5a740c7461	dont overwrite gbattlerAttacker in TryChangeBattleTerrain, update BattleScript_ActivateTerrainAbilities loop iterator	2023-02-27 22:18:42 -05:00
AgustinGDLV	0908129c84	implemented G-Max Gravitas, G-Max Snooze, G-Max Depletion; Spite works on Max Moves	2023-02-27 18:43:06 -08:00
AgustinGDLV	93d8efd51f	implemented G-Max Resonance	2023-02-27 14:34:08 -08:00
DizzyEggg	c92a65dc40	Add config for stockpile raising def stats	2023-02-27 21:09:02 +01:00
AgustinGDLV	92c8503869	reorganized max move functionality to remove redundant move effects	2023-02-27 11:54:49 -08:00
DizzyEggg	3338a6b786	add messages for stockpile effects wear off	2023-02-27 12:31:29 +01:00
LOuroboros	a54a8d9b2a	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into trainerSlideMsgUpdate	2023-02-27 07:43:19 -03:00
AgustinGDLV	e537be76ea	Z-moves bypass protection (#2730 )	2023-02-27 09:17:07 +01:00
DizzyEggg	44d2cc7232	Fix bugs related to Trainer Slide messages (#2699 ) * start working on trainer slides * use cmd->nextInstr	2023-02-27 09:11:25 +01:00
AgustinGDLV	a36c35aea1	implemented G-Max Vine Lash, G-Max Wildfire, G-Max Cannonade, G-Max Volcalith	2023-02-26 23:35:36 -08:00
AgustinGDLV	4d19659b0b	implemented G-Max Stonesurge, G-Max Steelsurge	2023-02-26 22:02:06 -08:00
LOuroboros	fe09f3e0d3	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into trainerSlideMsgUpdate	2023-02-26 23:42:01 -03:00
Eduardo Quezada	41bf9ea63c	Removed trailing whitespaces	2023-02-26 18:43:15 -03:00
DizzyEggg	8ccffa617a	fix createspriteontargets on electricy anim	2023-02-26 19:47:44 +01:00
DizzyEggg	4bdca43dbd	refactor mega evolution indicator sprite	2023-02-26 12:51:35 +01:00
AgustinGDLV	503aad9137	fixed tests	2023-02-25 15:57:57 -08:00
AgustinGDLV	b4ec273353	Merge branch 'upcoming' into dynamax	2023-02-25 14:04:55 -08:00
Zunawe	f376b71f7c	Fix wrong route in item flag name	2023-02-25 13:48:39 -08:00
Eduardo Quezada	d330ca051a	Document music usage to make it easier to search for a specific track	2023-02-23 11:44:23 -03:00
Eduardo Quezada	f5aa3b8272	Document the 2 different sText_GotchaPkmnCaught	2023-02-23 11:43:40 -03:00
ghoulslash	827bf11307	Merge pull request #2660 from DizzyEggg/ace_voltswitch Fix Volt Switch / Roar with ace pokemon	2023-02-23 09:20:18 -05:00
AgustinGDLV	38f462551f	pulled rhh master, i hate merge conflicts	2023-02-22 18:50:54 -08:00
DizzyEggg	dc83708443	Remove unused script BattleScript_TargetAbilityStatRaiseOnMoveEnd	2023-02-22 22:51:59 +01:00
Zunawe	60be59d18b	Fix wrong route in hidden item flag name	2023-02-22 13:13:57 -08:00
DizzyEggg	877e3fd6af	merge with upcoming	2023-02-22 19:27:42 +01:00
DizzyEggg	460dceb48b	fix intimidate derp	2023-02-22 19:20:18 +01:00
DizzyEggg	83281944fa	Add tests for Contrary	2023-02-22 16:24:27 +01:00
DizzyEggg	e0b76e98ff	Add MOVE_SHELL_TRAP Effect (#2716 ) * implemented Shell Trap Co-authored-by: AgustinGDLV <agustingomezdelavega@gmail.com>	2023-02-22 13:55:34 +00:00
DizzyEggg	64e26f5c86	Fix Contrary String on Intimidate	2023-02-22 13:11:16 +01:00
Jaizu	403a6f4544	Merge pull request #2712 from DizzyEggg/fix_abilities_empty_field Fix switch-in abilities activating on an empty field	2023-02-22 09:49:13 +01:00
DizzyEggg	31138455de	remove unneeded VARIOUS_JUMP_IF_NO_VALID_TARGETS	2023-02-22 09:28:12 +01:00
AgustinGDLV	87a9150134	added base functionality for max moves	2023-02-21 20:16:25 -08:00
DizzyEggg	d73ab0246f	Fix Explosion + Galvanize + Volt Absorb and Mind Blown (#2688 ) * Fix Explosion and Mind Blown * Use battler ability in jumpifabilitypresent	2023-02-21 22:50:29 +00:00
Eduardo Quezada	5ca9213d07	Merge branch 'RHH/upcoming' into RHH/pr/feature/formBattleChange # Conflicts: # src/battle_script_commands.c	2023-02-21 17:47:02 -03:00
Martin Griffin	29c64c82f3	Test Red Card Dragon Tail activates Red Card if the target does not switch.	2023-02-21 10:44:58 +00:00
Martin Griffin	afe09e9653	Test Dragon Tail Remove the "But it failed!" message if the foe cannot be switched.	2023-02-21 10:43:57 +00:00
LOuroboros	24581426a1	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into trainerSlideMsgUpdate	2023-02-21 04:46:28 -03:00
LOuroboros	3a91a5c930	Added new trainer slide-in msg conditions Now they can say something: -When their last Pokémon's HP is between 25% and 50%. -When a critical hit is dealt to their first Pokémon for the first time. -When a super effective hit is dealt to their first Pokémon for the first time. -When a STAB move is used against (but doesn't faint) the opponent's Pokémon. -When the Player's Pokémon's move doesn't affect the opponent's Pokémon. -When they're about to trigger a Mega Evolution. -When they're about to trigger a Z-Move. Misc. changes: -Split GetEnemyMonCount for readability's sake. -Optimized the size allocated to trainerSlideLowHpMsgDone.	2023-02-21 04:40:02 -03:00
Zunawe	8f74a6777a	Fix spelling mistake for item flag	2023-02-20 18:17:30 -08:00
DizzyEggg	53180ebf87	Update Healing wish to gen5 / gen8 mechanics (#2708 ) * Updated Healing Wish and added config * Fixed Lunar Dance message Co-authored-by: AgustinGDLV <agustingomezdelavega@gmail.com> Co-authored-by: AgustinGDLV <103095241+AgustinGDLV@users.noreply.github.com> Co-authored-by: Martin Griffin <martinrgriffin@gmail.com>	2023-02-20 11:25:43 +00:00
ghoulslash	4b64433816	Add Battle Anim cmds for dynamic Task, Sprite creation + Misc. Anim Fixes (#2649 ) * add createvisualtaskontargets, createspriteontargets to fix electroweb, fiery wrath anims * add missing semicolon * add Cmd_createspriteontargets_onpos for heal block, fix heal block targeting * remove duplicate func * improve origin pulse anim * fix IsDoubleBattle call * venom drench acid uses average battler positions * add GetSubpriorityForMoveAnim * add GetBattleAnimMoveTargets for CreateSpriteOnTargets and Cmd_createvisualtaskontargets --------- Co-authored-by: ghoulslash <pokevoyager0@gmail.com>	2023-02-19 11:48:12 +01:00
DizzyEggg	66d2f253a1	merge with master	2023-02-17 15:43:15 +01:00
DizzyEggg	0c523f9518	Fix Magic bounce powder moves against grass types (#2633 ) * Fix Magic bounce powder moves against grass types	2023-02-17 13:55:51 +00:00
DizzyEggg	56c9564e7a	8th gen Howl's effect (#2700 ) * Howl gen8 effect	2023-02-17 10:28:46 +00:00
Eduardo Quezada D'Ottone	625a7622e2	Merge pull request #2697 from AsparagusEduardo/RHH/sync/pret_20230214 It's ya boi, pret merge! (pret merge 2023/02/16)	2023-02-16 21:57:41 -03:00
Eduardo Quezada	f4f8ab6ee9	Merge branch 'RHH/upcoming' into RHH/pr/feature/formBattleChange	2023-02-16 17:06:49 -03:00
ghoulslash	6b0b427d93	Merge pull request #2680 from DizzyEggg/mirror_armor Fix Mirror Armor against Clear Body	2023-02-16 09:29:04 -05:00
ghoulslash	60a3da5811	Merge pull request #2691 from DizzyEggg/clang_scales Fix Clanging Scales target and effect	2023-02-16 09:13:33 -05:00
DizzyEggg	4c18ed2bd4	remove comment	2023-02-16 15:11:48 +01:00
ghoulslash	8c81cf1e66	Merge pull request #2692 from DizzyEggg/shields_down Fix Shield Down Ability pop-up	2023-02-16 09:11:24 -05:00
DizzyEggg	1c970afd6a	fix follow me working in singles (#2644 ) * fix follow me working in singles	2023-02-16 10:53:29 +01:00
DizzyEggg	f6a0c882d1	Fix Shield Down Ability pop-up	2023-02-15 23:44:00 +01:00
DizzyEggg	94651e77a5	Fix Clang Scales target and effect	2023-02-15 22:18:18 +01:00
Eduardo Quezada	b62e5aa72e	Merge remote-tracking branch 'pret/master' into RHH/sync/pret_20230214 # Conflicts: # src/battle_main.c # src/field_specials.c # src/trade.c	2023-02-15 14:11:03 -03:00
Eduardo Quezada	bd54990333	Review changes	2023-02-15 13:56:11 -03:00
GriffinR	69fdf0faa4	Merge pull request #1853 from GriffinRichards/doc-contest-bar Clarify AI_CV_AttackDown_UnknownTypeList	2023-02-15 11:29:57 -05:00
GriffinR	b656565af0	Standardize RS mossdeep gym metatile labels	2023-02-14 11:42:13 -05:00
ghoulslash	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
DizzyEggg	0577d8d04d	Fix Mirror Armor against Clear Body	2023-02-13 14:44:34 +01:00
ghoulslash	d508f12ac9	merge with upcoming	2023-02-13 08:38:32 -05:00
DizzyEggg	5d958e245a	Merge pull request #2669 from Jaizu/giga_impact_contests Fix Giga Impact on contests.	2023-02-13 09:22:24 +01:00
Eduardo Quezada	96865f66af	Updated term to modernFatefulEncounter	2023-02-11 22:36:42 -03:00
Eduardo Quezada	6da5e0a280	Rename eventLegal to fatefulEncounter	2023-02-11 17:13:53 -03:00
Ariel A	3b3e45cff7	Fixed shadow positioning bug in some battle facilities.	2023-02-10 22:06:29 -05:00
Ariel A	15e6acc0a3	Merge branch 'followers-expanded-id' into lighting-expanded-id	2023-02-10 19:49:54 -05:00
Ariel A	b733cd14a5	Merge branch 'followers' into followers-expanded-id	2023-02-10 19:40:44 -05:00
Ariel A	6fe4ce05e1	Added lighting to Sootopolis lava.	2023-02-10 19:32:48 -05:00
Ariel A	2ddd292b36	Merge branch 'followers' into lighting	2023-02-10 19:27:23 -05:00
DizzyEggg	513ecd50ba	Fix Spacial Rend animation	2023-02-09 13:24:23 +01:00
Jaizu	9f7267e48d	Fix Giga Impact on contests.	2023-02-09 11:29:29 +01:00
DizzyEggg	896b575c07	Fix volt switch breaking ace pokemon	2023-02-08 12:42:38 +01:00
DizzyEggg	ff088752e7	Insomnia ability pop-up (#2643 ) * Insomnia ability pop-up * remove B_MSG_STAYED_AWAKE_USING constant	2023-02-07 18:47:23 +01: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
DizzyEggg	dcb63e1518	Merge pull request #2610 from ghoulslash/be/animsilktrap Silk trap Animation	2023-02-07 16:13:53 +01:00
ghoulslash	a775f6f31a	Merge pull request #2642 from AlexOn1ine/strange_steam_v2 Fix Strange Steam anim	2023-02-07 09:25:04 -05:00
DizzyEggg	0dc5e1e685	aftermath damp pop-ups and string	2023-02-07 13:01:56 +01:00
ghoulslash	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
Alex	2f412b206a	Fix Strange Steam anim	2023-02-07 00:40:37 +01:00
DizzyEggg	04ce8ec213	Fix Volt Absorb not activating on Thunderwave	2023-02-06 20:55:56 +01:00
PSF	0790882fd8	Merged with pret	2023-02-04 14:03:38 -08:00
ghoulslash	f060d0185f	fix wind power, electromorphosis stomping on gbattlerattacker	2023-02-02 21:59:40 -05:00
ghoulslash	c5c0e91215	fix BattleScript_TargetAbilityStatRaiseRet overwriting gBattlerAttacker	2023-02-02 21:39:01 -05:00
Eduardo Quezada	101ea6522d	Merge branch 'RHH/upcoming' into RHH/pr/feature/formBattleChange # Conflicts: # src/battle_util.c	2023-02-02 17:56:13 -03:00
LOuroboros	4b5a6e2328	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into gen_9_move_effects_batch1	2023-02-01 20:18:56 -03:00
GriffinR	28ada9c93b	Merge branch 'master' of https://github.com/pret/pokeemerald into doc-contest-bar	2023-02-01 15:52:19 -05:00
GriffinR	9003966fcc	Misc field_specials cleanup	2023-02-01 11:48:55 -05:00
Ariel A	66c57e3442	Merge branch 'master' into followers	2023-01-29 18:44:06 -05:00
ghoulslash	3f616215ea	add silk trap anim	2023-01-28 09:03:18 -05:00
Martin Griffin	a13ffdbfba	U-turn does not switch the user out if Emergency Exit activates	2023-01-27 00:57:22 +00:00
Eduardo Quezada	7774c9727d	Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pret_20230125 # Conflicts: # tools/mapjson/mapjson.cpp	2023-01-25 20:28:55 -03:00
Eduardo Quezada	3288309c43	Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/formBattleChange # Conflicts: # src/battle_script_commands.c	2023-01-25 19:57:19 -03:00
Eduardo Quezada D'Ottone	1bfc922c72	Merge pull request #2471 from ghoulslash/be/gen9items Start Gen9 Hold Effects	2023-01-23 14:58:08 -03:00
Eduardo Quezada D'Ottone	2b22bdf1e7	Merge pull request #2579 from LOuroboros/allahu Fixed Explosion & Intimidate's 'interaction'	2023-01-23 11:37:06 -03:00
ghoulslash	f97ec1975a	merge w upcoming	2023-01-23 09:24:03 -05:00
GriffinR	29c1af50ca	Fix Best Streak stat name	2023-01-20 11:25:04 -05:00
Eduardo Quezada	4a9515e8db	Restored improvements from upstream	2023-01-20 12:34:15 -03:00
Eduardo Quezada	749225ace1	Matching merge from upstream pret # Conflicts: # graphics/interface/menu_info.png # include/pokemon.h # src/battle_ai_switch_items.c # src/battle_anim_mons.c # src/battle_anim_water.c # src/battle_controller_opponent.c # src/battle_gfx_sfx_util.c # src/battle_main.c # src/battle_pike.c # src/battle_script_commands.c # src/data/pokemon/species_info.h # src/pokemon.c # src/pokemon_summary_screen.c	2023-01-20 12:31:54 -03:00
sbird	766964387e	Merge branch 'master' into feature/dynmulti	2023-01-18 23:39:31 +01:00
GriffinR	b7d92e8537	Revert incorrect constant usage, add new correct ones	2023-01-18 12:11:09 -05:00
GriffinR	5a906c33ac	Merge branch 'master' into sync_battle_anim_args	2023-01-18 11:47:33 -05:00
LOuroboros	773e7f0de2	Fixed Explosion & Intimidate's 'interaction'	2023-01-17 22:16:42 -03:00
sbird	569fa0a60a	[script-command] add dynmultichoice * supports variable length arguments * automatically scrolls * supports building list menus from a stack	2023-01-17 21:49:06 +01:00
GriffinR	c663154760	Merge pull request #1836 from GriffinRichards/fix-clone Add fix for Battle Tower cloning bug	2023-01-15 00:32:24 -05:00
Eduardo Quezada	ac4825ad28	Merge branch 'RHH/upcoming' into RHH/pr/feature/formBattleChange # Conflicts: # src/battle_util.c	2023-01-13 11:50:47 -03:00
Ariel A	244f3ceb15	Merge branch 'followers-expanded-id' into lighting-expanded-id	2023-01-12 21:58:39 -05:00
Ariel A	95b98efc30	Updated existing OW pokemon events with new system.	2023-01-12 21:45:42 -05:00
LOuroboros	bdcc84f019	Updated the implementation	2023-01-09 15:18:22 -03:00
LOuroboros	dccceb9689	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into iceFaceRedux	2023-01-09 14:59:41 -03:00
ghoulslash	cc7c546011	Merge pull request #2473 from LOuroboros/mimicry Reimplemented Mimicry	2023-01-09 12:54:44 -05:00
LOuroboros	620a6a5e90	Extra review changes -Foolproofed the ability checks in ABILITYEFFECT_ON_WEATHER and ABILITYEFFECT_ON_TERRAIN -Made BattleScript_OverworldWeatherStarts and BattleScript_OverworldTerrain call the battle scripts that handle weather form changes, weather abilities, terrain seeds and terrain abilities. -Consequentially, I removed the activation for weather and terrain abilities that I added to TryDoEventsBeforeFirstTurn, and the activation of Protosynthesis in ABILITYEFFECT_ON_SWITCHIN. -Added a weatherAbilityDone to prevent abilities that lack self-checks like Protosynthesis from getting stuck in a loop. -Removed now pointless ABILITYEFFECT_WEATHER_FORM. I think Duke/Sneed69 added it to fix Castform's form change, but it no longer serves a purpose.	2023-01-09 14:22:14 -03:00
LOuroboros	91b2e1bb50	More review changes and added lackings -Removed unnecessary special handling of terrain-inducing overworld weather states from ChangeTypeBasedOnTerrain. -Mimicry now activates normally for terrain-inducing overworld weather states. -Weather abilities now activate normally when switchineffects is called, and at the beginning of a battle. -Terrain abilities now activate normally at the beginning of a battle.	2023-01-09 07:55:55 -03:00
Eduardo Quezada	d72a3731d4	Merge branch 'RHH/upcoming' into RHH/pr/feature/reworkScald # Conflicts: # include/constants/battle_move_effects.h	2023-01-06 15:25:49 -03:00
LOuroboros	72566e6323	Turned Stone Axe's and Ceaseless Edge's effects into MOVE_EFFECTs	2023-01-05 03:02:56 -03:00
LOuroboros	2414283bb7	Removed BattleScript_EffectHit_Ret	2023-01-04 12:32:55 -03:00
ghoulslash	a425de77a6	Merge pull request #2446 from LOuroboros/primal Updated AnimTask_PrimalReversion	2023-01-04 09:16:28 -05:00
Eduardo Quezada	ada47831aa	Fixed reusable repels/lures function forcefully using items while menu config is on	2023-01-04 00:00:13 -03:00
Ariel A	4bee03bc18	Merge branch 'followers' into lighting	2023-01-03 18:19:19 -05:00
Ariel A	beb282a359	Added movements/scripts for overworld follower field moves.	2023-01-03 18:18:09 -05:00
LOuroboros	f1ca254c28	Updated the Mimicry reimplementation Mimicry is now a proud member of ABILITYEFFECT_ON_TERRAIN. Misc. changes: -Ditched the dependency on and usage of gBattlerAttacker for the effects inside ABILITYEFFECT_ON_WEATHER and ABILITYEFFECT_ON_TERRAIN. -Made Cmd_switchineffects activate ABILITYEFFECT_ON_TERRAIN to take into account overworld weather-induced field terrains. -Updated the text strings printed by the battle scripts inside the aforementioned AbilityBattleEffects caseIDs. -Removed constant label of unused VARIOUS_TRY_TO_APPLY_MIMICRY which I forgot about. -Updated ChangeTypeBasedOnTerrain, partly as a result of the aforementioned changes but also for optimization purposes. -There was never a reason to establish an empty scope, or to use GET_MOVE_TYPE and the variables that complemented it. -Removed case ABILITY_QUARK_DRIVE from AbilityBattleEffects' case ABILITYEFFECT_ON_SWITCHIN.	2023-01-03 02:27:41 -03:00
LOuroboros	d0f5653f5e	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into mimicry	2023-01-02 19:00:41 -03:00
Eduardo Quezada	a23501a4a3	Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/formBattleChange # Conflicts: # src/battle_script_commands.c	2023-01-02 18:54:57 -03:00
LOuroboros	0a00942a26	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into gen_9_move_effects_batch1	2023-01-02 16:00:13 -03: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
LOuroboros	13d8c0d167	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dev_gen9_abilities	2023-01-02 14:34:24 -03:00
LOuroboros	ca32d43433	Streamlined ability-on-weather changes Also renamed activateweatherabilities and activateterrainabilities.	2023-01-02 14:32:56 -03:00
Eduardo Quezada	16e8a5dd7f	Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/formBattleChange # Conflicts: # include/battle_util.h	2023-01-01 16:02:40 -03:00
LOuroboros	f2e63a2e41	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into iceFaceRedux	2022-12-31 03:33:42 -03:00
Eduardo Quezada D'Ottone	4dc72dcfc1	Merge pull request #1956 from SonikkuA-DatH/SonikkuA-DatH-Teatime2 Implementing Teatime effect	2022-12-30 17:49:54 -03:00
LOuroboros	e8dfb66c30	Adding ability effect triggers for terrains and weather A new, probably better way to handle the announcement trigger that abilities such as Protosynthesis and Quark Drive have, when the battle weather or the field terrain change. Misc. changes: -EFFECT_DAMAGE_SET_TERRAIN -> EFFECT_HIT_SET_REMOVE_TERRAIN -It's more appropriate as the effect can be used to force set a terrain or simply to remove an active terrain, after all. -The main reason for the rename was the inconsistency with the battle script's label. -Reverted accidentally committed change to B_DOUBLE_WILD_CHANCE, performed back in `c8abf00c`.	2022-12-30 03:25:16 -03:00
GriffinR	e88139d1b5	Add fix for Battle Tower cloning bug	2022-12-29 11:22:53 -05:00
LOuroboros	0ef148dfbb	Applied more corrections -Removed BattleScript_WindRiderActivatesEnd2 -Tweaked the condition of Wind Power in AbilityBattleEffects -Renamed ApplySupremeOverlordModifier to GetSupremeOverlordModifier	2022-12-28 08:50:15 -03:00
LOuroboros	0159065dea	Removed Shell Trap It's time to let it go for my own mental sanity. Besides, it's a Gen. 7 move. I shouldn't have added it here.	2022-12-28 07:51:11 -03:00
SphericalIce	200b71be02	Fix Beat Up's battle script to avoid an out-of-bounds array access	2022-12-27 10:49:57 +00:00
LOuroboros	17410fa9c5	Fixed some issues of the Intimidate's rework	2022-12-26 00:50:44 -03:00
SonikkuA-DatH	3e807e5b1e	Update battle_scripts_1.s fix ORs	2022-12-21 15:12:06 -08:00
LOuroboros	4bb86c5d96	Implemented Barb Barrage's effect	2022-12-21 19:48:50 -03:00
LOuroboros	1229fa752a	Fixed Triple Axe's target, added its effect and fixed Ceaseless Edge's	2022-12-21 19:48:49 -03:00
LOuroboros	2cb9400ef0	Implemented Dire Claw's effect	2022-12-21 19:48:48 -03:00
LOuroboros	3ce4869766	Implemented Shell Trap's effect	2022-12-21 19:48:10 -03:00
LOuroboros	ae482ed1f4	Implemented Ceaseless Edge's effect	2022-12-21 19:47:00 -03:00
SonikkuA-DatH	0a5154499e	Update battle_scripts_1.s Compensating Substitute, removing item	2022-12-21 14:27:39 -08:00
Eduardo Quezada	c0d4e14a61	Merge branch 'RHH/upcoming' into RHH/pr/feature/reworkScald # Conflicts: # include/config/battle.h # include/constants/battle_move_effects.h	2022-12-21 12:46:09 -03:00
LOuroboros	31cd076f9d	Oopsie. Wind Power doesn't boost Attack lol	2022-12-21 11:21:42 -03:00
LOuroboros	d943f891c5	Applied Wind Power and Wind Rider correction -Renamed TryActivateWindRiderLoop to BattleScript_TryTailwindAbilitiesLoop -Modified how it handles the check for Wind Rider by using a various and incorporated Wind Power into the mix because that ability is affected by Tailwind as well.	2022-12-21 10:08:16 -03:00
SonikkuA-DatH	5eaf0e15fc	Update data/battle_scripts_1.s -_- Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>	2022-12-20 18:08:01 -08:00
LOuroboros	6153b8e904	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dev_gen9_abilities	2022-12-20 07:11:36 -03:00
LOuroboros	c8abf00cac	Applied corrections Anger Shell: -Made it print a string from the gStatDownStringIds table while lowering Def and Sp. Def -Made it use the shiny new modifybattlerstatstage macro. -Made it activate multiple times per battle, as it should. Well-Baked Body: -Turned it into an absorbing ability. Wind Rider: -Turned it into an absorbing ability. -For its Tailwind interaction, I made it activate only when Tailwind kicks in successfully, instead of whenever it's active at the end of a turn. Guard Dog: -Updated its check inside BattleScript_EffectHitEscape. -Moved it from Cmd_forcerandomswitch to BattleScript_EffectRoar. Wind Power: -Split off its move end effect from Electromorphosis'. Electromorphosis: -Split off its move end effect from Wind Power's. Hadron Engine: -Merged its Switch In effect with Electric Surge's. Protosynthesis: -Fixed its stat boost. Quark Drive: -Fixed its stat boost. Cud Chew: -Updated its ENDTURN effect's berry check. Supreme Overlord: -Tweaked the looping i variable's data type, the order of the variables and the checks inside ApplySupremeOverlordModifier. Earth Eater: -Turned it into an absorbing ability. Misc changes: -Added a variable to set the amount of stat stages raised inside AbilityMoveEffects' case ABILITYEFFECT_ABSORBING. -Added a preproc config to update the text string that they print. -Limited the scope of atkHighestStat and defHighestStat in CalcMoveBasePowerAfterModifiers to Protosynthesis's and Quark Drive's effects.	2022-12-20 07:08:29 -03:00
SonikkuA-DatH	f6fab92ac8	Merge branch 'upcoming' into SonikkuA-DatH-Teatime2	2022-12-19 15:52:20 -08:00
Eduardo Quezada	1580f892a5	Merge branch 'RHH/upcoming' into RHH/pr/feature/formBattleChange # Conflicts: # include/constants/pokemon.h # src/battle_script_commands.c	2022-12-19 18:53:26 -03:00
SonikkuA-DatH	562736a5e6	Update battle_scripts_1.s Changed STAT_BUFF_ALLOW_PTR to STAT_CHANGE_ALLOW_PTR	2022-12-18 22:50:41 -08:00
SonikkuA-DatH	2dbfc1c8f5	Update data/battle_scripts_1.s Fixes spacing. Thanks Lunos! Co-authored-by: LOuroboros <lunosouroboros@gmail.com>	2022-12-18 22:28:33 -08:00
SonikkuA-DatH	f0aee1f8d3	Merge branch 'upcoming' into SonikkuA-DatH-Teatime2	2022-12-18 17:50:39 -08:00
SonikkuA-DatH	9cd8d81412	Update battle_scripts_1.s Fixed spacing	2022-12-18 15:37:44 -08:00
Eduardo Quezada	55ba9d8364	Fixed right Frontier move tutor not loading their move list correctly.	2022-12-18 13:17:33 -03:00
LOuroboros	4c9446ed0a	Fixed Speed Swap's effect	2022-12-14 12:00:45 -03:00
LOuroboros	a3e58b05c1	Implemented Guard Dog's effect	2022-12-12 20:33:37 -03:00
LOuroboros	a56cfd1aa7	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dev_gen9_abilities	2022-12-12 19:55:48 -03:00
ghoulslash	340278c83b	Merge pull request #2452 from LOuroboros/intimidate Optimized Intimidate's code	2022-12-11 22:04:16 -05:00
LOuroboros	8eff1a13c1	Updated BattleScript_IntimidateEffect to comply with BattleScript_TryAdrenalineOrb's demands	2022-12-11 23:17:59 -03:00
LOuroboros	e6a3396b0f	Added Adrenaline Orb check and removed silly comment	2022-12-11 19:24:36 -03:00
ghoulslash	0a9e3c8dc8	fix stattextbuffer in BattleScript_IntimidatePrevented_Item	2022-12-11 16:16:10 -05:00
ghoulslash	e3e0d60222	Merge pull request #2467 from Bassoonian/gen9moves Generation IX Moves	2022-12-11 14:47:47 -05:00
LOuroboros	0d1f9d9613	Reimplemented Mimicry	2022-12-09 20:46:18 -03:00
ghoulslash	6d28882e44	start gen9 hold effects	2022-12-06 09:48:36 -05:00
LOuroboros	d6b9f07681	Implemented Earth Eater's effect	2022-12-06 05:30:21 -03:00
LOuroboros	a961980e0f	Implemented Toxic Debris' effect	2022-12-06 05:23:30 -03:00
LOuroboros	aa051dab02	Implemented Costar's effect	2022-12-06 05:23:30 -03:00
LOuroboros	7a52404fd3	Implemented Supreme Overlord's effect	2022-12-06 05:23:30 -03:00
LOuroboros	f96137eb5e	Implemented Cud Chew's effect	2022-12-06 05:23:30 -03:00
LOuroboros	7c67f1ac27	Activated Switch In abilities during weather and terrain change Abilities such as Protosynthesis and Quark Drive demand it.	2022-12-06 05:23:30 -03:00
LOuroboros	24465858a7	Implemented the 4 Ruin Abilities	2022-12-06 05:23:29 -03:00
LOuroboros	de05c4dd56	Implemented Good as Gold's effect	2022-12-06 05:23:29 -03:00
LOuroboros	e25f843db3	Implemented Quark Drive's effect Also tweaked STRINGID_SUNLIGHTACTIVATEDABILITY and STRINGID_STATWASHEIGHTENED.	2022-12-06 05:23:29 -03:00
LOuroboros	a328088122	Implemented Protosynthesis' effect Also turned GetHighestStatId into a global function since Protosynthesis' effect uses it.	2022-12-06 05:23:29 -03:00
LOuroboros	34cafa746c	Implemented Electromorphosis' effect Also added a battle preproc config to check if the STATUS3_CHARGED_UP was already applied. Pokémon Scarlet and Violet don't check if this status flag was already applied on the target of abilities like Electromorphosis (and Wind Power until proven otherwise.) As a result, the game will trigger the ability multiple times if they're hit by a multihit move. This directive makes the code end the ability effect preemptively if the target does have the status flag applied.	2022-12-06 05:23:29 -03:00
LOuroboros	88cae380d0	Implemented Wind Power's effect	2022-12-06 05:23:29 -03:00
LOuroboros	c43060fbfd	Tweaked BattleScript_WellBakedBodyActivates and BattleScript_WindRiderActivatesMoveEnd	2022-12-06 05:23:29 -03:00
LOuroboros	4dc44150c5	Implemented Wind Rider's effect	2022-12-06 05:23:29 -03:00
LOuroboros	ca656b63b9	Added Well Baked Body's effect and misc. changes -Added a modifybattlerstatstage macro to handle stat stages in battle. -Rewrote the checks inside the case ABILITYEFFECT_MOVES_BLOCK of AbilityBattleEffects.	2022-12-06 05:21:24 -03:00
LOuroboros	eb082cd1a2	Implemented Purifying Salt's effect	2022-12-03 01:51:11 -03:00
LOuroboros	acb9c31bd4	Implemented Anger Shell's effect	2022-12-03 01:19:24 -03:00
LOuroboros	b0027cb78b	Implemented Seed Sower's effect	2022-12-02 23:31:41 -03:00
GriffinR	483c3d5c13	Document wonder news	2022-11-22 02:17:03 -05:00
Ariel A	5cae740eba	Merge branch 'followers' into lighting	2022-11-21 22:17:14 -05:00
Ariel A	e6d1cfae24	Merge branch 'master' into followers	2022-11-21 21:21:50 -05:00
Bassoonian	739680e425	Victory Dance effect	2022-11-18 22:23:34 +01:00
Bassoonian	29ae22183b	Mystical Power effect	2022-11-18 22:17:08 +01:00
Bassoonian	9512b3a57a	Implement Double Shock functionality with temporary string	2022-11-18 22:12:26 +01:00
Bassoonian	3ac3cb249e	Wicked Torque effect	2022-11-18 22:00:21 +01:00
Bassoonian	f7d1a12d2d	Data entry for gen9 moves	2022-11-18 12:15:44 +01:00
Eduardo Quezada	011ec16f1e	Organized conffig files into their own folder and cleaned up	2022-11-14 11:03:49 -03:00
LOuroboros	11c99cac61	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into iceFaceRedux	2022-11-13 23:17:59 -03:00
LOuroboros	31a602f3b6	Optimized Intimidate's code	2022-11-12 18:03:46 -03:00
Eduardo Quezada	f2d0e547ac	Merge branch 'RHH/upcoming' into RHH/pr/sync/pretmerge_20221030 # Conflicts: # src/rom_header_gf.c	2022-11-09 19:54:44 -03:00
LOuroboros	999a53028a	Updated AnimTask_PrimalReversion	2022-11-08 09:38:27 -03:00
Eduardo Quezada D'Ottone	e6ae0bd01e	Merge pull request #2434 from LOuroboros/badDreams Optimized Bad Dreams' code	2022-11-08 08:16:07 -03:00
Eduardo Quezada	2ef2134be1	Moved Hunger Switch to form change table.	2022-11-06 17:12:34 -03:00
Ariel A	22c1d94ab9	Merge branch 'followers' into lighting	2022-11-05 19:04:14 -04:00
BuffelSaft	1da4eb3b14	Merge pull request #2428 from AsparagusEduardo/RHH/pr/feature/DarkVoid Config for Dark Void being only usable by Darkrai	2022-11-05 22:42:51 +13:00
LOuroboros	f56df74576	Optimized Bad Dreams' code Misc: -Made the ability pop up stick around until the ability's effect ends just like in ORAS. -Updated sText_BadDreamsDmg accordingly while I was at it.	2022-11-04 14:58:58 -03:00
Eduardo Quezada	44bf4a15e3	Merge branch 'RHH/upcoming' into RHH/pr/feature/reworkScald # Conflicts: # include/constants/battle_config.h # include/constants/battle_move_effects.h	2022-11-04 12:19:40 -03:00
ghoulslash	7a0e541413	workaround for GetBattlerHoldEffectParam to handle bug bite different battler id	2022-11-04 10:29:05 -04:00
ghoulslash	1e6903840a	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into be/bugbite	2022-11-04 09:29:45 -04:00
ghoulslash	d13431b4ab	merge w rhh master	2022-11-04 09:29:39 -04:00
Eduardo Quezada	edf4e45c4d	Config for Dark Void being only usable by Darkrai	2022-11-03 21:36:12 -03:00
BuffelSaft	c169a9523e	Merge branch 'upcoming' into fix-stat-boost-on-hit	2022-11-03 22:01:30 +13:00
BuffelSaft	736ca893b6	Fix abilities that raise target's stat after hit Fix Justified, Berserk, Rattled, Stamina and Water Compaction printing the wrong message when they activate. Steam Engine was also updated to follow the gen 5+ ability activation method style.	2022-11-03 21:54:56 +13:00
LOuroboros	86e322dcea	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into iceFaceRedux	2022-11-01 22:41:31 -03:00
Eduardo Quezada D'Ottone	b8371500d3	Merge pull request #1676 from BuffelSaft/multistrike Multi-hit refactor and Parental Bond	2022-11-01 21:16:04 -03:00
Eduardo Quezada	e4a439aa46	Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221030 # Conflicts: # src/data/bard_music/moves.h # src/data/bard_music/pokemon.h	2022-10-30 12:30:38 -03:00
Eduardo Quezada	3172273c73	Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/Lures # Conflicts: # src/pokemon.c	2022-10-30 12:16:09 -03:00
GriffinR	c76beed989	Merge pull request #1807 from pret/porymap-5 Update for Porymap 5.0.0	2022-10-30 11:01:37 -04:00
GriffinR	01c71b4ce1	Fix more text and movements labeled as scripts	2022-10-30 03:27:28 -04:00
GriffinR	f439a2dee7	Fix EventScript_WroteSecretCodeLockOpened typo	2022-10-30 03:14:47 -04:00
AgustinGDLV	ae7cbc2aa1	merged physical and special max moves	2022-10-27 20:38:40 -07:00
AgustinGDLV	056048daf9	added data for max moves	2022-10-27 13:17:15 -07:00
BuffelSaft	224ca256ce	Requested clean up Rename constants, remove white space, improve B_BEAT_UP description. * Rename B_BEAT_UP_DMG to B_BEAT_UP * Shorten B_PARENTAL_BOND_DAMAGE to B_PARENTAL_BOND_DMG * Remove trailing whitespace * Replace boolean 1 with TRUE in MOVEEND_MULTIHIT_MOVE	2022-10-27 22:25:33 +13:00
GriffinR	cc182bf05e	Use Porymap's new order for connection fields	2022-10-24 10:05:59 -04:00
BuffelSaft	1b056f9044	Fix various Parental Bond issues - Dragon Tail and Circle Throw strike twice and then switch the target - Z moves are unaffected by Parental Bond - Renamed parentalBondOn to parentalBondState - Added constants for possible values of parentalBondState - Fixed broken stat change animations and removed unused MOVE_EFFECT_SKY_DROP	2022-10-23 17:37:23 +13:00
Ariel A	5d9e9d3e0e	Fixed some follower movements.	2022-10-22 18:50:27 -04:00
BuffelSaft	6035c5a280	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald into multistrike	2022-10-22 14:31:13 +13:00
GriffinR	a418f8d976	Merge pull request #1755 from GriffinRichards/map-dynamic Rename special map constants, treat warp ids as strings	2022-10-18 22:45:56 -04:00
tustin2121	4730870646	VAR_RUN_TRIGGER_IMMEDIATELY -> TRIGGER_RUN_IMMEDIATELY Getting rid of the VAR_ prefix, to avoid the porymap problem.	2022-10-18 21:12:31 -04:00
ghoulslash	4775e0372a	merge w pret	2022-10-17 09:06:27 -04:00
ghoulslash	a585d56053	fix whitespace	2022-10-16 23:39:12 -04:00
tustin2121	327c648e87	Document seldom-used trigger functionality Added a define for use in overworld triggers where the goal is to run the provided script in the immediate script context instead of the global one like normal. This is used in triggers in the desert, on faraway island, and a couple other places to do weather effects quickly and on the same frame. Suggestions for a better define name are welcome.	2022-10-16 20:46:50 -04:00
ghoulslash	71023512fd	update psycho cut anim	2022-10-16 19:20:24 -04:00
Ariel A	3a86c8bd4c	Merge branch 'followers' into lighting	2022-10-07 21:08:06 -04:00
Ariel A	1c011a9c1c	Merge branch 'master' into followers	2022-10-07 20:52:15 -04:00
Eduardo Quezada	77f24d42e4	Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/reworkScald # Conflicts: # include/constants/battle_config.h	2022-10-07 15:39:02 -03:00
GriffinR	4f407a1066	Convert tilesets.s to C	2022-09-27 17:23:26 -04:00
Eduardo Quezada D'Ottone	17c8842ad4	Merge branch 'dev' into teleport	2022-09-24 14:39:21 -03:00
Eduardo Quezada D'Ottone	a483899043	Merge branch 'dev' into symbiosis	2022-09-24 11:58:35 -03:00
LOuroboros	c64593cb9c	Fixed LTBTS's animation	2022-09-24 09:04:15 -03:00
Eduardo Quezada	720cb249d6	Merge remote-tracking branch 'RHH_origin/dev' into RHH/pr/reworkScald # Conflicts: # include/constants/battle_config.h	2022-09-16 12:06:06 -03:00
Eduardo Quezada	6b79c7772c	Merge branch 'RHH/dev' into RHH/pr/pretmerge_20220909 # Conflicts: # src/battle_interface.c	2022-09-16 11:56:50 -03:00
Eduardo Quezada	77696ca686	Rolled EFFECT_SCALD into EFFECT_BURN_HIT with a config for its Gen6+ change	2022-09-16 10:31:02 -03:00
ghoulslash	6616c89451	Merge pull request #2303 from Blackforest92/RHH-PR-Branch Tidying graphics - Trio Weather	2022-09-15 18:01:43 -04:00
Eduardo Quezada	dc423ef7ff	Handling repel/lure menu	2022-09-14 00:18:01 -03:00
Eduardo Quezada	de32940fdf	Further removed trailing whitespaces	2022-09-13 16:26:36 -03:00
Eduardo Quezada	1d7e8bd730	Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20220909 # Conflicts: # asm/macros/battle_ai_script.inc # asm/macros/battle_script.inc # data/battle_ai_scripts.s # include/link_rfu.h # src/pokemon.c # src/pokemon_summary_screen.c # src/sound.c	2022-09-13 16:22:42 -03:00
GriffinR	91c040b081	Merge pull request #1777 from AsparagusEduardo/pret/pr/trailingWhitespace Cleaned trailing whitespace	2022-09-13 14:00:11 -04:00
LOuroboros	222362e804	Fixed Raquaza typo	2022-09-12 21:26:22 -03:00
Eduardo Quezada	e3005e5275	Item config for repel prompt	2022-09-12 10:21:52 -03:00
Eduardo Quezada	2d78ac0192	Implemented Lures using the same vars as repels	2022-09-12 10:21:49 -03:00
Deokishisu	e3c19f5df5	Implement B2W2 Repel System The game now asks if the player would like to use another Repel when the one they used runs out. # Conflicts: # include/constants/vars.h	2022-09-12 10:21:38 -03:00
Eduardo Quezada	65108c3192	Cleaned trailing whitespace	2022-09-11 14:14:49 -04:00
Eduardo Quezada	69f01d73cd	Added missing uses of Fairy type for Union Room and Battle Factory	2022-09-11 12:41:56 -04:00
Ariel A	e54c18fb8e	Merge branch 'followers' into lighting	2022-09-10 22:29:18 -04:00
Blackforest92	431cb6fa7c	Tidying graphics - Trio Weather	2022-09-09 21:57:40 +07:00
Blackforest92	3acb32acb8	Tyding graphics - Acupressure	2022-09-09 00:25:43 +07:00
Eduardo Quezada D'Ottone	066a5bee85	Merge pull request #2277 from TheXaman/tx_debug_system_rhh Inclusion of the tx_debug_system	2022-09-08 00:26:37 -04:00
Eduardo Quezada D'Ottone	47a50b3dac	Merge branch 'master' into weather_forms_fixes	2022-09-07 23:07:25 -04:00
LOuroboros	c8f4a44380	Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into iceFaceRedux	2022-09-06 20:40:34 -03:00
LOuroboros	8705d1656b	Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into teleport	2022-09-06 20:38:28 -03:00
TheXaman	6062cf45fa	Merge branch 'master' into tx_debug_system_rhh	2022-09-07 00:03:58 +02:00
Eduardo Quezada	3a6318f1d9	Merge remote-tracking branch 'RHH_origin/master' into RHH/pr/configRefactor # Conflicts: # include/constants/battle_config.h	2022-09-06 15:20:54 -04:00
Eduardo Quezada	e253a87bc5	Consolidated Gen constants into config.h, with a new const called GEN_LATEST, to help edit all at once.	2022-09-05 14:49:14 -04:00
Eduardo Quezada	7c7da8e176	Merge remote-tracking branch 'RHH_origin/master' into RHH/pr/cleanConfigs # Conflicts: # src/battle_script_commands.c	2022-09-05 14:43:04 -04:00
Ariel A	e322475aee	Fixed Rayquaza cutscene flicker.	2022-09-03 21:43:04 -04:00
Eduardo Quezada D'Ottone	4017fc3e20	Apply style suggestions from code review	2022-09-03 21:22:15 -04:00
GriffinR	36551dff2f	Treat warp ids as strings to allow constants	2022-09-03 15:43:43 -04:00
Eduardo Quezada	5403cd036e	Merge remote-tracking branch 'pret/master' into RHH/pr/pretMerge_20220902 # Conflicts: # include/battle.h # include/battle_controllers.h # src/battle_ai_script_commands.c # src/battle_ai_switch_items.c # src/battle_controller_opponent.c # src/battle_controller_player.c # src/battle_controllers.c # src/battle_main.c # src/battle_message.c # src/battle_script_commands.c # src/battle_util.c	2022-09-02 23:24:08 -04:00
Eduardo Quezada	c7fc2e13f7	Renamed TM flags to keep consistency with the rest of the repo	2022-09-02 16:54:58 -04:00
TheXaman	b4b3e84cbd	removed default flags and added ingame warning if a function that requires them is used	2022-09-02 18:39:38 +02:00
TheXaman	ad57551db1	removed unnecessary script, cheat start now with national dex, reverted accidental type hin removal, changed indentation	2022-09-02 12:10:11 +02:00
Eduardo Quezada D'Ottone	59f1f10dec	Merge pull request #2260 from DizzyEggg/magic_bounce Fix Magic Bounce targets	2022-09-01 19:56:15 -04:00
Eduardo Quezada D'Ottone	cc174b622c	Merge pull request #2278 from rh-hideout/DizzyEggg-dragontailweakarmor Dragon Tail Weak Armor fix	2022-09-01 19:54:33 -04:00
LOuroboros	c167e2c6cc	Added Legends: Arceus' move data	2022-08-30 19:32:44 -03:00
DizzyEggg	d167b4ea0a	Dragon Tail Weak Armor fix	2022-08-30 20:08:50 +02:00
DizzyEggg	7cb010d71e	fix magic bounce conflicts and fix magic coat	2022-08-30 19:36:06 +02:00
TheXaman	8c9a59ec1c	Merge branch 'tx_debug_system' of https://github.com/TheXaman/pokeemerald into tx_debug_system_rhh	2022-08-29 19:13:11 +02:00
Eduardo Quezada D'Ottone	8ca2f949e3	Merge pull request #2233 from gruxor/tmhm_rework Reworked TMHM into expandable list format	2022-08-29 04:20:45 -04:00
Ariel A	8c60050553	Added proper movement actions for exiting/entering pokeball.	2022-08-28 23:34:39 -04:00
crater-git	9f16d1dd12	Fixed battle frontier tutors (for real this time)	2022-08-27 22:45:10 -04:00
Eduardo Quezada	69f4c226f0	Merge remote-tracking branch 'RHH/master' into RHH_cleanConfigs # Conflicts: # src/battle_ai_main.c # src/battle_controller_opponent.c # src/battle_controller_player.c # src/battle_script_commands.c # src/pokemon.c # src/pokemon_summary_screen.c	2022-08-27 02:42:22 -04:00
GriffinR	8aead3b4c8	Merge pull request #1747 from GriffinRichards/contest-ai-bug Incorporate commented bug fixes in contest AI scripts	2022-08-26 23:53:44 -04:00
Eduardo Quezada	7c86bd5d08	Merge remote-tracking branch 'pret/master' into RHH_pretMerge20220826 # Conflicts: # include/battle_interface.h # src/battle_anim_effects_1.c # src/battle_script_commands.c # src/field_specials.c	2022-08-26 22:23:37 -04:00
Eduardo Quezada D'Ottone	bee36edd9c	Merge pull request #2173 from LOuroboros/yourAffection Implement affection-now-friendship mechanics	2022-08-26 14:54:32 -04:00
GriffinR	0516f94837	Merge pull request #1753 from LOuroboros/GetLeadMonFriendshipScore Added constants for GetLeadMonFriendshipScore	2022-08-26 14:52:10 -04:00
GriffinR	c5e873aa2b	Merge pull request #1742 from GriffinRichards/sound-pan Add missing usage of SOUND_PAN_*	2022-08-26 14:47:24 -04:00
crater-git	54ee960970	Fixed Battle Frontier tutor move IDs	2022-08-26 10:12:11 -04:00
DizzyEggg	6331931ba3	Fix Magic Coat targets	2022-08-26 15:01:51 +02:00
Eduardo Quezada	6fb4da68f3	Corrected Oldale Town Sign labels	2022-08-25 22:00:24 -04:00
GriffinR	ce4a6e9067	MAP_NONE -> MAP_DYNAMIC	2022-08-25 21:34:05 -04:00
crater-git	ed02c4b425	Removed tutor move distinction, combined llists	2022-08-25 19:56:47 -04:00
LOuroboros	410045028a	Optimized General_AffectionHangedOn	2022-08-25 20:01:14 -03:00
LOuroboros	8bd7103b9d	Even more review corrections	2022-08-25 17:32:12 -03:00
LOuroboros	2cf2c00b29	Updated friendship labels	2022-08-25 17:10:11 -03:00
LOuroboros	7539051942	Further tweaked the affection animation	2022-08-25 17:05:57 -03:00
LOuroboros	5dd143f19d	Applied Blackforest's changes to General_AffectionHangedOn	2022-08-25 13:07:52 -03:00
LOuroboros	1fc63c3431	More review corrections	2022-08-25 11:52:21 -03:00
LOuroboros	11d6ae4820	Renamed the GetLeadMonFriendshipScore constants	2022-08-25 11:34:37 -03:00
LOuroboros	e792fae415	Review corrections -Simplified the affection mechanics' battle scripts. -Corrected the value seting inside CalcCritChanceStage. -Simplified the checks inside Cmd_adjustdamage -Simplified the contents of GetLeadMonFriendshipScore now that a more general function to do the same thing was added. -Added constants for the values returned by GetMonFriendshipScore.	2022-08-25 10:45:57 -03:00
LOuroboros	1f4ef2a0fb	Added constants for GetLeadMonFriendshipScore	2022-08-25 10:40:56 -03:00
LOuroboros	b7ca63d151	Implemented Ice Face Thanks to Benício Gonçalves#3454 who provided a base to work with.	2022-08-24 13:45:34 -03:00
Eduardo Quezada	eea718cfc6	Placeholder moves can't be used in battle.	2022-08-24 00:30:49 -04:00
Eduardo Quezada	56a2e91518	Updated move limitations	2022-08-23 22:40:04 -04:00
Eduardo Quezada	1f5adf93c7	Cleaned up use of configs be almost exclusively preproc functions	2022-08-23 21:00:08 -04:00
Eduardo Quezada	afcc1178b2	Merge remote-tracking branch 'pret/master' into MergedBranchUltimate # Conflicts: # data/battle_ai_scripts.s # data/battle_scripts_1.s # include/battle_controllers.h # include/battle_script_commands.h # include/battle_util.h # include/constants/battle_script_commands.h # include/constants/global.h # include/decompress.h # src/battle_anim_effects_1.c # src/battle_anim_normal.c # src/battle_anim_poison.c # src/battle_anim_water.c # src/battle_arena.c # src/battle_controller_link_opponent.c # src/battle_controller_link_partner.c # src/battle_controller_opponent.c # src/battle_controller_player.c # src/battle_controller_player_partner.c # src/battle_controller_recorded_opponent.c # src/battle_controller_recorded_player.c # src/battle_controller_safari.c # src/battle_controller_wally.c # src/battle_gfx_sfx_util.c # src/battle_interface.c # src/battle_main.c # src/battle_message.c # src/battle_script_commands.c # src/battle_util.c # src/berry.c # src/data/trainers.h # src/decompress.c # src/field_effect.c # src/hall_of_fame.c # src/overworld.c # src/pokeball.c # src/pokemon.c # src/pokemon_icon.c # src/pokemon_storage_system.c # src/scrcmd.c	2022-08-22 20:30:45 -04:00
Eduardo Quezada	2b7a2c4d09	Merge remote-tracking branch 'RHH/battle_engine' into MergedBranchUltimate	2022-08-22 17:30:48 -04:00
Eduardo Quezada	75ac960365	Introduced P_NEW_POKEMON, which will disable all Gen4+ Pokémon and Forms	2022-08-22 17:27:21 -04:00
GriffinR	898ec580ae	Merge pull request #1737 from GriffinRichards/lock-unlock Clean up lock/unlock anim movement	2022-08-22 01:30:33 -04:00
GriffinR	30906762ed	Merge pull request #1740 from AsparagusEduardo/pret_stringTabs Fixed inconsistent use of white space for scripts, .c files and .h files.	2022-08-20 23:03:59 -04:00
GriffinR	9e175a1037	Merge pull request #1735 from GriffinRichards/arena-const Add some missing battle arena constants	2022-08-20 22:54:32 -04:00
GriffinR	11b4958f23	Incorporate commented bug fixes in contest AI scripts	2022-08-19 19:45:15 -04:00
GriffinR	c2d5dd2a1f	Additional battle anim sync	2022-08-19 11:51:13 -04:00
Ariel A	0b1c81af66	Merge branch 'romhack' into lighting	2022-08-17 19:59:58 -04:00
Ariel A	d846b9c781	Added dynamic palette support for virtual objects. Added flag to hide follower on certain maps.	2022-08-17 19:58:46 -04:00
Ariel A	16babe87fc	Follower pokemon now disappears when teleporting. Fixed GF's incorrect GFX id on Route 123.	2022-08-17 19:50:22 -04:00
Ariel A	37ca4a6ceb	Made talking to defeated trainers follower-safe.	2022-08-16 19:59:14 -04:00
Eduardo Quezada	e43f65cc69	using BATTLE_RUN constants in BattleScript_EffectTeleport	2022-08-15 21:06:26 -04:00
Eduardo Quezada	e8a05e92e4	Corrected additional inconsistent uses of whitespace	2022-08-15 17:04:34 -04:00
Eduardo Quezada	63e4a8adcd	Fixed instances of .string being used with spaces instead of tabs	2022-08-15 14:32:01 -04:00
GriffinR	5515e328b2	Clean up lock/unlock anim movement	2022-08-12 21:18:10 -04:00
GriffinR	cf4d05e9e7	Fix typo	2022-08-11 12:09:38 -04:00
GriffinR	63468f9fcb	Add some missing battle arena constants	2022-08-11 12:02:56 -04:00
Eduardo Quezada D'Ottone	54097951f7	Using B_WAIT_TIME_LONG	2022-08-03 16:51:02 -04:00
ghoulslash	deddda451b	merge w pret	2022-07-30 18:35:41 -04:00
Eduardo Quezada	09af7422d5	Further cleaning after comparing with pokefirered STAT_BUFF changed to STAT_CHANGE, as it also uses debuffs	2022-07-28 01:27:05 -04:00
LOuroboros	032b7b2ab9	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into yourAffection	2022-07-25 10:24:19 -03:00
Eduardo Quezada	231727d02b	Merge remote-tracking branch 'RHH/pokemon_expansion' into RHH_masterMerge # Conflicts: # asm/macros/event.inc # data/specials.inc # include/constants/species.h # src/data/pokemon/base_stats.h	2022-07-22 23:33:04 -04:00
Eduardo Quezada	f3bebcd12c	Merge remote-tracking branch 'RHH/battle_engine' into RHH_masterMerge # Conflicts: # include/battle_anim.h # include/global.h # include/pokemon.h # src/battle_message.c # src/battle_script_commands.c # src/data/pokemon/base_stats.h	2022-07-22 22:57:02 -04:00
ghoulslash	3a77b52bad	Merge pull request #2194 from AsparagusEduardo/BE_pretmerge Battle Engine pret merge	2022-07-22 14:00:40 -04:00
Ariel A	8aef50c797	Fixed leftover Slateport light metatiles.	2022-07-21 21:36:40 -04:00
Eduardo Quezada D'Ottone	e14afd8957	Added Growth's Atk. raise to the its configuration, as that was also introduced in Gen 5.	2022-07-20 10:33:18 -04:00
Eduardo Quezada D'Ottone	cb34119711	Config for Charge raising Sp. Def.	2022-07-20 10:13:18 -04:00
Eduardo Quezada D'Ottone	fe63dafcc1	Merge branch 'battle_engine' into BE_pretmerge # Conflicts: # src/battle_anim_fire.c # src/battle_controller_player.c	2022-07-20 08:50:30 -04:00
ghoulslash	2b5bb9f6e4	move gSwapDamagecategory to battle struct, use GetSplitBasedOnStats for photon geyser check	2022-07-19 18:24:53 -04:00
ghoulslash	5d91bdeafc	add B_ANIM_RESTORE_BG to BattleScript_EffectTerrainHit	2022-07-17 19:13:45 -04:00
Ariel A	671fa68410	Merge branch 'romhack' into lighting	2022-07-17 16:07:50 -04:00
Ariel A	9beee311c4	Merge branch 'master' into romhack	2022-07-17 15:13:15 -04:00
ghoulslash	6b84a9f0b3	merge w be	2022-07-17 12:40:43 -04:00
ghoulslash	9b5aee3b93	fix z stat-boosts	2022-07-17 12:17:54 -04:00
Ariel A	b4cc3ca7b7	Tileset swapPalettes can now use palette 12 for swapping. Fixed Slateport Fan Club lights.	2022-07-15 19:32:13 -04:00
Eduardo Quezada D'Ottone	e791cf90ad	Merge tag 'pretmaster' into BE_pretmerge2 # Conflicts: # data/battle_anim_scripts.s # include/battle_anim.h # include/battle_controllers.h # include/battle_interface.h # include/battle_main.h # include/battle_setup.h # include/constants/battle_anim.h # include/constants/battle_string_ids.h # src/battle_ai_switch_items.c # src/battle_anim_fire.c # src/battle_anim_normal.c # src/battle_controllers.c # src/battle_dome.c # src/battle_gfx_sfx_util.c # src/battle_interface.c # src/battle_message.c # src/battle_script_commands.c # src/battle_util.c # src/pokemon.c	2022-07-15 12:58:46 -04:00
Eduardo Quezada D'Ottone	c69275f373	Merge remote-tracking branch 'pret/master' into PE_pretmerge # Conflicts: # include/battle_anim.h # include/pokemon.h # src/data/pokemon/base_stats.h	2022-07-12 17:20:49 -04:00
GriffinR	e6a374f2b6	Rename faintifabilitynotdamp and jumpifattackandspecialattackcannotfall	2022-07-06 14:49:08 -04:00
Ariel A	8e436e3add	Fixed fadescreen interaction with weather on outdoor maps.	2022-07-04 16:53:22 -04:00
LOuroboros	8f728dcd79	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into teleport	2022-07-03 13:49:18 -03:00
ghoulslash	02a62e245b	Merge pull request #1992 from AsparagusEduardo/BE_WhiteOutMoney Config for lost money after losing a battle	2022-07-01 11:58:36 -04:00
ghoulslash	b9be123716	Merge pull request #2163 from Sneed69/terrain-softlock-fix Fix terrain move softlock	2022-07-01 11:58:00 -04:00
ghoulslash	a349462b78	Merge pull request #2134 from LOuroboros/bePretMerge Pret merge for the battle_engine	2022-07-01 09:21:51 -04:00
Ariel A	090dc6b294	Merge branch 'romhack' into lighting	2022-06-28 00:07:23 -04:00
LOuroboros	aa5c6a3f01	Implemented affection-now-friendship mechanics	2022-06-22 00:18:01 -03:00
Ariel A	e5885c1284	Fixed Registeel graphics to use OW sprite.	2022-06-21 19:44:30 -04:00
Colton G. Rushton	3de23b332a	Supplant https://github.com/pret/pokeemerald/pull/1579	2022-06-18 21:51:05 -03:00
GriffinR	21ed288f50	Merge pull request #1687 from SimplyBLGDev/patch-1 Format newlines in surf.inc	2022-06-18 11:04:39 -04:00
Colton G. Rushton	c8e6d69fdc	Format newline in BattleBattleFrontier_BattlePikeLobby/scripts.inc One of the strings declared in BattleFrontier_BattlePikeLobby/scripts.inc was poorly formatted.	2022-06-18 11:49:13 -03:00
GriffinR	57222323c1	Merge pull request #1678 from GriffinRichards/const-frontier Add some battle frontier constant usage	2022-06-18 10:22:58 -04:00
Simply BLG	324a157b34	Format newlines in surf.inc One of the strings declared in surf.inc was poorly formatted. ## Description Some of the strings declared in surf.inc contained newline characters in the middle of the .string line, opposing the format used by every string in the `data/text` directory, I just updated them to match the format, making it more readable.	2022-06-17 15:21:12 -03:00
Simply BLG	380cc8615b	Format newlines in pc_transfer.inc	2022-06-17 14:22:31 -03:00
Simply BLG	1860b61fe3	Corrected two missing newlines	2022-06-17 12:05:32 -03:00
Simply BLG	e48341f7fc	Format newlines in contest_string.inc Some of the strings declared in contest_string.inc were poorly formatted, containing newline characters in the middle of the string, opposing the format used by every string in data/text, I just updated them to match the format, making it more readable.	2022-06-17 11:52:54 -03:00
GriffinR	4660f8c88b	Document battle tower TV show	2022-06-14 09:37:39 -04:00
GriffinR	dec54e6e92	Additional constant usage	2022-06-13 03:21:20 -04:00
sneed	f419fc3ae7	fix terrain move softlock	2022-06-04 18:36:18 +03:00
GriffinR	1ca1bff81c	Merge branch 'master' of https://github.com/GriffinRichards/pokeemerald into doc-arg	2022-06-03 15:43:21 -04:00
GriffinR	34438e6bc4	Continue documenting generic arguments	2022-06-03 15:38:03 -04:00
GriffinR	a8437493c1	Document generic argument names in battle anim palettes	2022-06-01 12:25:01 -04:00
Ariel A	11a7aa1ec8	Made cutting trees follower-safe.	2022-05-29 01:45:03 -04:00
hamish	307d5d93c4	add potlergeist animation	2022-05-23 08:53:08 -04:00
sneed	5b0afffd91	popup and flower gift description fixes	2022-05-22 13:10:51 +03:00
sneed	fe42eacdf0	tabs over spaces	2022-05-22 05:23:06 +03:00
BuffelSaft	16570e8c3f	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike	2022-05-22 12:55:55 +12:00
Sneed69	d0a2be9630	weather forms fixes and config	2022-05-22 03:20:48 +03:00
TheXaman	cbe8f30001	added FLAG_ADVENTURE_STARTED to cheat start	2022-05-21 12:54:02 +02:00
Ariel A	a6973154cd	Merge branch 'romhack' into lighting	2022-05-20 01:22:18 -04:00
Ariel A	4236f18f2d	Fixed follower bugs when returning from a battle facility challenge.	2022-05-20 00:18:41 -04:00
sneed	928d3c5a28	change form on weather fade	2022-05-19 15:08:03 +03:00
Ariel A	6d79b6dbaa	Merge branch 'romhack' into lighting	2022-05-18 20:14:22 -04:00
GriffinR	5fa8ca55b0	Clean up some additional unknowns	2022-05-17 17:12:45 -04:00
GriffinR	593e2c9be0	Fix inconsistent static s/g names	2022-05-17 14:00:02 -04:00
Ariel A	ec756d3d12	Fixed object events not being unfrozen after using Flash.	2022-05-17 00:33:37 -04:00
Eduardo Quezada	21d8c8e9c5	Using follower's nickname instead of ther species name.	2022-05-13 21:22:25 -04:00
ghoulslash	ebb711b6e5	fix bug bite not activating if faints target. also save original move target through the effect	2022-05-13 18:24:52 -04:00
ghoulslash	b09dad68d5	minor edits to consumeberry calls	2022-05-13 16:29:37 -04:00
ghoulslash	cdd37ad1bb	fix stuff cheeks w new consumeberry impl	2022-05-13 16:28:23 -04:00
ghoulslash	f6f4227f49	better bug bite impl, fix item removal	2022-05-13 16:21:41 -04:00
BuffelSaft	bb25746e05	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike	2022-05-13 22:40:43 +12:00
LOuroboros	52d6c96e69	Merge branch 'master' of https://github.com/pret/pokeemerald into pePretMerge	2022-05-13 03:20:42 -03:00
LOuroboros	2263caef7a	Merge branch 'master' of https://github.com/pret/pokeemerald into battle_engine	2022-05-13 03:17:31 -03:00
AgustinGDLV	54163240d8	implemented toggelable cancellation / multi-evo	2022-05-08 20:55:29 -07:00
ghoulslash	07b0ce9737	add inner focus ability popup msg	2022-05-08 17:57:30 -04:00
AgustinGDLV	7b0154336d	Merge branch 'battle_engine' into symbiosis	2022-05-07 13:26:21 -07:00
ghoulslash	9fa4d916d3	Merge pull request #2055 from AsparagusEduardo/BE_configs Once again, Battle Configs	2022-05-07 11:31:25 -04:00
Eduardo Quezada D'Ottone	dc25bc6145	Merge branch 'battle_engine' into BE_WhiteOutMoney # Conflicts: # include/constants/battle_string_ids.h # src/battle_message.c	2022-05-07 11:16:34 -04:00
Eduardo Quezada D'Ottone	cbe73de8c8	Merge pull request #1861 from LOuroboros/primalReversionTweaks Primal Reversion Tweaks	2022-05-07 11:04:23 -04:00
Eduardo Quezada D'Ottone	4e7ce0b663	Merge branch 'battle_engine' into BE_configs # Conflicts: # include/constants/battle_config.h	2022-05-07 10:25:34 -04:00
ghoulslash	adfb336a3f	Merge pull request #2105 from Sneed69/healblock Add missing Heal Block functionalities	2022-05-07 09:13:18 -04:00
ghoulslash	e5b777695c	Merge pull request #2107 from Sneed69/steelbeam Steel Beam Move Effect Implementation	2022-05-07 08:40:34 -04:00
AgustinGDLV	2ffff788b4	fixed Fling	2022-05-06 22:29:40 -07:00
AgustinGDLV	542a0f07b4	fixed bug bite / bestow	2022-05-06 22:07:25 -07:00
BuffelSaft	3e1934ebe3	Rework VARIOUS_IS_PARENTAL_BOND_LAST_STRIKE Make this more versatile by allowing it to check parentalBondOn instead of only checking if parentalBondOn == 2. Also, fix Dragon Tail/Circle Throw switching the target on the first hit.	2022-05-07 14:20:37 +12:00
BuffelSaft	8693db632b	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike	2022-05-07 12:27:20 +12:00
AgustinGDLV	0cb6529ae2	functional but not perfect implementation	2022-05-06 14:53:16 -07:00
sneed	ef7cd3cdfe	BattleScript_DefiantActivates rename	2022-05-06 11:15:24 +03:00
LOuroboros	43053d2e6c	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into teleport	2022-05-06 02:22:14 -03:00
sneed	6c23eb431d	Heal Pulse and Pollen Puff	2022-05-05 13:56:59 +03:00
Ariel A	19df355574	Merge branch 'romhack' into lighting	2022-05-03 23:01:52 -04:00
Ariel A	831c73c18c	Added system for conditional follower messages.	2022-05-03 23:01:02 -04:00
sneed	60d7d8f97e	Initial Commit	2022-05-03 03:38:44 +03:00
sneed	b17d1f7816	Add generation specific interactions	2022-05-02 17:56:09 +03:00
PikalaxALT	ff936c15e1	Sync arg descriptions from FireRed https://github.com/pret/pokefirered/pull/501	2022-04-28 13:46:23 -04:00
PikalaxALT	3f7b6ca357	Remove spurious space in battle_anim_scripts.s	2022-04-28 09:04:16 -04:00
BuffelSaft	af6242f2e0	Requested changes, Sticky Web edge case Fix issues found by ghoulslash, and make sure Defiant works properly with Sticky Web and Court Change.	2022-04-27 21:51:10 +12:00
BuffelSaft	5358cc0a00	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch2	2022-04-25 13:38:13 +12:00
LOuroboros	055c72a384	Improved the special animation of Shell Side Arm	2022-04-23 04:29:15 -03:00
GriffinR	fc5747f0f7	Merge pull request #1649 from GriffinRichards/clean-trainer Trainer hill clean up	2022-04-20 00:20:44 -04:00
Ariel A	6e621d80a1	Added day/night palette swapping. Updated lighting for lava, Petalburg, Slateport, Dewford, Verdanturf, Oldale, Mossdeep, Lilycove, Fallarbor. Improved lantern appearance & added neon signs on PokeCenter & Mart. Optimized gamma shift code. Removed obselete CacheLightMetatiles.	2022-04-18 00:23:11 -04:00
TheXaman	c54bf21b01	Merge branch 'master' of https://github.com/pret/pokeemerald into tx_debug_system	2022-04-16 23:18:35 +02:00
LOuroboros	fa39dc76dc	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD	2022-04-02 18:45:18 -03:00
GriffinR	62f3f144ab	Clean up some trainer hill	2022-03-31 12:54:07 -04:00
LOuroboros	434f6cf5ad	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into flingBE	2022-03-26 08:43:55 -03:00
ExpoSeed	5fd468f507	Review comments. Commented code removed, ShouldAIUseZMove moved to battle_ai_util and renamed to be consistent with other fns	2022-03-22 13:10:24 -05:00
ExpoSeed	f50a406b18	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/z-moves	2022-03-22 12:56:23 -05:00
LOuroboros	387bf07e3c	Update battle_scripts_1.s	2022-03-20 19:00:21 -03:00
LOuroboros	aca51e843e	Update battle_scripts_1.s	2022-03-14 16:14:32 -03:00
ultima-soul	86089ce935	Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync	2022-02-28 22:13:14 -08:00
Eduardo Quezada D'Ottone	ed464a9e8d	Merge pull request #2068 from ghoulslash/be/strugglebug Fix struggle bug anim	2022-02-25 12:50:55 -03:00
ghoulslash	7c2bbf1df3	fix struggle bug anim	2022-02-25 08:54:35 -05:00
ghoulslash	e4ef3cc3b4	move glare effectiveness exception to code	2022-02-24 22:06:18 -05:00
cbt6	f826a5a82d	Use constants for PC locations	2022-02-23 15:07:22 +08:00
Ariel A	d23b8e99d7	Merge branch 'romhack' into lighting	2022-02-22 21:27:44 -05:00
Ariel A	2273a61b37	Re-indexed follower & pokeball GFX IDs.	2022-02-22 20:14:02 -05:00
Ariel A	ab6b14868b	Merge branch 'romhack' into lighting	2022-02-21 15:58:45 -05:00
GriffinR	0710a5467b	Add some missing RGB constant usage	2022-02-15 21:55:51 -05:00
BuffelSaft	6a119c5a30	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch2	2022-02-13 21:06:15 +13:00
Eduardo Quezada D'Ottone	c849197a88	Config for Minimize raising 2 stages	2022-02-13 00:45:35 -03:00
Eduardo Quezada D'Ottone	d73e6faab8	Config for Growth being affected by sunlight	2022-02-13 00:30:37 -03:00
Eduardo Quezada D'Ottone	0dd2de988a	Merge branch 'battle_engine' into primalReversionTweaks	2022-02-12 23:08:12 -03:00
ghoulslash	209279c207	fix psycho shift string printing	2022-02-09 14:30:30 -05:00
Ariel A	7daa78311b	Added more follower footprint types. Credit: Sonikku-DatH https://www.pokecommunity.com/showthread.php?p=10410294#post10410294	2022-02-07 23:06:38 -05:00
BuffelSaft	0a27b575dc	Fix merge error in battle scripts	2022-01-27 17:24:11 +13:00
BuffelSaft	9d1800f53e	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch2	2022-01-27 17:18:51 +13:00
GriffinR	2495d18132	Add missing :req, remove old macros	2022-01-23 18:52:04 -05:00
LOuroboros	8eaf0718ec	Review changes Also updated tryfaintmon call in BattleScript_FlingEnd, and updated CanFling.	2022-01-23 19:13:04 -03:00
LOuroboros	a8a8c7e2fa	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into flingBE	2022-01-23 02:37:07 -03:00
GriffinR	a7e6045d71	Merge pull request #1597 from GriffinRichards/misc-cleanup Miscellaneous fixes	2022-01-19 22:17:37 -05:00
GriffinR	69759b2d12	Merge pull request #1601 from GriffinRichards/fix-decor-flag Fix FLAG_DECORATION_0 name	2022-01-16 17:44:58 -05:00
Eduardo Quezada D'Ottone	6aabe58649	Merge branch 'battle_engine' into magician	2022-01-15 13:06:13 -03:00
GriffinR	fd7457b05a	Remove berry fix	2022-01-13 15:26:20 -05:00
GriffinR	f899a02ac6	Use MON_GIVEN_TO_ constants for givemon	2022-01-12 18:34:26 -05:00
LOuroboros	69f678b3fc	Put the new B_WAIT_TIME_SHORTEST to use	2022-01-11 20:21:12 -03:00
LOuroboros	b2965e5522	Added a pause to BattleScript_ProteanActivates	2022-01-11 20:15:47 -03:00
GriffinR	49418f8c01	Add missing commas	2022-01-11 09:55:11 -05:00
GriffinR	3a6c633905	Add seteventmon	2022-01-11 02:16:25 -05:00
GriffinR	110fbc559c	Make item optional for givemon and setwildbattle	2022-01-11 02:08:14 -05:00
GriffinR	8b920691e6	Fix FLAG_DECORATION_0 name	2022-01-09 01:31:42 -05:00
Eduardo Quezada D'Ottone	97baedbd5e	Merge pull request #1923 from WiserVisor/battle_engine Added Sky Drop to Battle Engine	2022-01-07 18:14:40 -03:00
GriffinR	ce55e58ad8	Misc cleanup	2022-01-04 10:09:42 -05:00
Ariel A	609a304890	Merge branch 'romhack' into lighting	2022-01-03 02:08:14 -05:00
Ariel A	cf673fda9f	Added movements to follower messages. Movement credit: SonikkuA-DatH	2021-12-31 19:23:44 -05:00
GriffinR	23f5c9fd5c	Clean up pokedex_area_screen	2021-12-31 00:16:56 -05:00
Eduardo Quezada D'Ottone	5b54986e6b	Merge pull request #1980 from LOuroboros/multiBattles Multi battle updates	2021-12-29 22:09:06 -03:00
Eduardo Quezada D'Ottone	4d6f54e8d6	Merge pull request #2007 from ghoulslash/be/roleplay Update Role Play	2021-12-25 11:37:57 -03:00
ghoulslash	93a7e139ec	merge w be	2021-12-24 09:40:12 -05:00
WiserVisor	8923ffb3af	Merge branch 'battle_engine' into battle_engine	2021-12-23 15:29:10 -08:00
ghoulslash	b6b5d862f4	update role play mechanics	2021-12-23 08:37:11 -05:00
Ariel A	5034d14ffb	Merge branch 'romhack' into lighting	2021-12-22 22:59:59 -05:00
Ariel A	c29516bc2f	Fixed bug with follower update after the party was healed. Credit: Jaizu	2021-12-22 22:14:28 -05:00
LOuroboros	e28fa7f91c	Update event_scripts.s	2021-12-21 22:10:54 -03:00
ghoulslash	ad514cf3fd	Merge branch 'master' of https://github.com/pret/pokeemerald into dexnav	2021-12-20 11:49:23 -05:00
LOuroboros	ffe35fbb06	Updated defeat condition on multi battles	2021-12-19 08:30:43 -03:00
Ariel A	9de9442c39	Merge branch 'romhack' into lighting	2021-12-18 17:25:56 -05:00
Ariel A	bdcbb5c700	Merge branch 'master' into romhack	2021-12-18 17:14:52 -05:00
ultima-soul	b0b8b9bf46	Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync	2021-12-17 23:51:29 -08:00
ultima-soul	4f2e3bf214	Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into master_sync	2021-12-17 21:23:54 -08:00
ghoulslash	31bbc4ddde	prevent stat-raising damage effects if battle will end	2021-12-17 10:24:07 -05:00
ExpoSeed	65186b8c3a	Fix some style issues	2021-12-16 21:57:30 -06:00
ExpoSeed	d6747527da	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/z-moves	2021-12-16 21:44:01 -06:00
Ariel A	c7593af215	Fixed bug where follower did not update after depositing in daycare.	2021-12-16 21:26:50 -05:00
Eduardo Quezada D'Ottone	bbf7b62ceb	Config for lost money after losing a battle	2021-12-11 23:03:50 -03:00
LOuroboros	f317b542e2	Updated Teleport	2021-12-11 21:20:04 -03:00
ultima-soul	26f29a04fd	Revert "Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into item_expansion_sync" This reverts commit `ac2bcece75`, reversing changes made to `349262ebc3`.	2021-12-10 09:41:54 -08:00
ultima-soul	ac2bcece75	Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into item_expansion_sync	2021-12-09 14:16:05 -08:00
ultima-soul	a5afdac0ae	Resolved review suggestions for upstream Battle Engine sync.	2021-12-08 12:08:16 -08:00
GriffinR	cc05b08227	Fix incorrect ever grande flower animation palettes	2021-12-06 11:17:42 -05:00
ghoulslash	1e644c9d4c	fix spacing	2021-12-05 14:45:48 -05:00
ghoulslash	c0e408bfab	fix aqua ring heal anim	2021-12-05 14:44:22 -05:00
ultima-soul	7369f60c06	Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into battle_engine_sync	2021-12-03 17:30:45 -08:00
GriffinR	d501636730	Fix incorrect flag animation palettes	2021-12-03 16:36:18 -05:00
ultima-soul	d408b56549	Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync	2021-12-01 20:18:57 -08:00
ultima-soul	23bf41713c	Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync	2021-12-01 20:17:08 -08:00
LOuroboros	2e67153982	Renamed the Enigma Berries' constants	2021-12-01 22:16:38 -03:00
LOuroboros	f2dd7bce99	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into primalReversionTweaks	2021-11-30 20:39:58 -03:00
SonikkuA-DatH	adecc77fe8	Update battle_anim_scripts.s	2021-11-28 19:47:09 -08:00
SonikkuA-DatH	10a870a568	Update battle_scripts_1.s	2021-11-28 19:45:47 -08:00
ghoulslash	6f6ed0a25c	Merge branch 'master' of https://github.com/pret/pokeemerald into dexnav	2021-11-28 15:01:19 -05:00
ultima-soul	d0623d7b71	Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync	2021-11-27 21:40:08 -08:00
ultima-soul	0312c5be8b	Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync	2021-11-27 21:38:26 -08:00
BuffelSaft	fd4414fe62	Spaces instead of tabs	2021-11-23 23:01:43 +13:00
BuffelSaft	a89ce0c38a	Swapped webs don't trigger Defiant Track the side that originally set Sticky Web, and if it matches the side the target of the speed drop is on, don't activate Defiant. Hard to tell if this is a bug or a feature in gen 8 - maybe the swapped webs are considered a "friendly" effect? Also, fix Sticky Web not activating Defiant.	2021-11-23 22:54:30 +13:00
GriffinR	e0fae879da	Merge pull request #1558 from GriffinRichards/update-macros Update event macro comments	2021-11-22 19:10:49 -05:00
BuffelSaft	6b8f86c276	Snap Trap placeholder anims Set up animation data for Snap Trap so it can be easily replaced with a proper animation later.	2021-11-23 11:05:36 +13:00
BuffelSaft	d2eb5f0e61	Remove shell trap effect code Left strings and animations as those were fine, but code was non-functional and fixing it was not trivial.	2021-11-22 14:46:47 +13:00
BuffelSaft	42b8f18cb1	Remove Corrosive Gas code This was not working at all in testing, so it can be done by a separate PR later.	2021-11-22 14:35:01 +13:00
BuffelSaft	70f0018c08	Partially implement Shell Trap Doesn't play the animation when the trap triggers, but kinda works? May also be incredibly buggy, but I'm not interested in working on this move any further.	2021-11-22 14:14:41 +13:00
ultima-soul	a8f9a54787	Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync	2021-11-21 10:41:32 -08:00
ultima-soul	3ed51d6d91	Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync	2021-11-21 10:40:26 -08:00
GriffinR	23dd1dad7f	Fix incorrect palettes in Mauville flower tileset anims	2021-11-21 11:23:03 -05:00
W1serV1ser	c2f81cd5f5	Added Sky Drop	2021-11-20 11:44:48 -08:00
BuffelSaft	14a2e86313	Fix Scale Shot Lowers defense and raises speed instead of just lowering defense now. Tested with Contrary and min/max speed/def.	2021-11-19 21:57:32 +13:00
BuffelSaft	86efd69370	Finish/fix Beak Blast This was not working at all, but the basic framework was there; some small changes tidied it up and made it work.	2021-11-19 20:19:10 +13:00
BuffelSaft	98712e576e	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch2	2021-11-19 17:48:11 +13:00
GriffinR	42a83ee50e	Use STR_VAR names for apprentice_buff and frontier_gettrainername	2021-11-18 23:20:05 -05:00
GriffinR	e66ea0cb99	Reformat compare + goto_if/call_if to single statements	2021-11-18 23:06:51 -05:00
BuffelSaft	16a4fc9062	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike	2021-11-19 16:33:24 +13:00
GriffinR	6c6487dd7a	Missing spaces to tabs in scripts files	2021-11-18 21:02:22 -05:00
TheXaman	2f8896f2f0	Merge branch 'master' of https://github.com/pret/pokeemerald into tx_debug_system	2021-11-18 15:13:04 +01:00
GriffinR	c89dfd9f56	Finish updating macro comments	2021-11-18 01:47:58 -05:00
GriffinR	b5b5d95de6	Distinguish 'virtual object' names from object events	2021-11-17 23:40:53 -05:00
GriffinR	c4f8f4d11a	Add STR_VAR_# ids to string buffer macros	2021-11-17 22:00:44 -05:00
GriffinR	c940b67716	Continue macro comment updating	2021-11-17 17:45:59 -05:00
GriffinR	61aa9c3ba9	More updating event macro comments	2021-11-16 17:46:34 -05:00
GriffinR	d414787932	Some TV clean-up	2021-11-16 16:22:17 -05:00
GriffinR	5d9c31a610	Label slot machine ids, fix GetPriceReduction	2021-11-16 15:43:52 -05:00
GriffinR	63c5905914	Continue updating event macro comments	2021-11-16 13:10:23 -05:00
GriffinR	04cc923d6c	Handle optional arguments for warp commands, add WARP_ID_NONE	2021-11-16 10:53:00 -05:00
LOuroboros	5c485d9769	Fixed Fling when gLastUsedItem is 0 Also renamed VARIOUS_JUMP_IF_NO_FLING_POWER to VARIOUS_JUMP_IF_FLING_FAILS.	2021-11-15 14:02:33 -03:00
GriffinR	65d3b58374	Add PARTY_NOTHING_CHOSEN	2021-11-15 10:57:06 -05:00
GriffinR	f85de6eca5	Start event macro comment updates	2021-11-15 10:54:57 -05:00
LOuroboros	a01fd2eb7a	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into flingBE	2021-11-15 12:47:26 -03:00
LOuroboros	cbb6639f8d	Fling tweaks -Updated and renamed VARIOUS_JUMP_IF_FLING_FAILS (now VARIOUS_JUMP_IF_NO_FLING_POWER) -Updated BattleScript_EffectFling following Smogon's description of Fling's effect. -Refactored BattleScript_FlingMentalHerb thanks to GetMentalHerbEffect -No need to define flingPower when its value is 0 -Forced the target to eat a berry that was flung at them by overwriting their item with the berry thrown and restoring their original item after its effect finishes. -Added a preproc config for Klutz.	2021-11-15 12:40:10 -03:00
GriffinR	b14fe9dce3	Merge pull request #1547 from GriffinRichards/doc-sounddata Clean up sound, add CRY_MODE constants	2021-11-13 15:54:40 -05:00
ghoulslash	940a165be7	merge w be	2021-11-13 09:09:15 -05:00
ghoulslash	9df66f4ac1	Merge pull request #1843 from Blackforest92/battle_engine Update Giga Impact's graphic and use fade-in battle animation.	2021-11-13 08:54:37 -05:00
LOuroboros	2fe015e5ce	Implemented Fling	2021-11-13 10:27:05 -03:00
Eduardo Quezada D'Ottone	704957efb9	Fixed Relic Song's SE	2021-11-13 07:30:12 -03:00
BuffelSaft	04867ac0d3	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike	2021-11-13 17:33:25 +13:00
BuffelSaft	55b279ba0a	Fix several move effects Dragon Tail, Natural Gift, Spit Up all hit twice now. Could maybe use isparentalbondlaststrike instead of some of the other checks too.	2021-11-13 16:29:12 +13:00
BuffelSaft	6232b046b1	Fix Burn Up Now works properly with and without Parental Bond. It wasn't broken before, but its interaction with Parental Bond was.	2021-11-13 12:40:45 +13:00
Eduardo Quezada D'Ottone	a7870dbef0	Merge branch 'battle_engine' into magician	2021-11-12 19:40:34 -03:00
LOuroboros	ad5bcd06cf	Fixed a small buffer overflow in AI_CV_Recycle_ItemsToEncourage	2021-11-11 22:27:17 -03:00
BuffelSaft	e606e54f9d	Fix Big Pecks/Octolock animation Also removed MOVE_EFFECT_AFFECTS_USER because that shouldn't be part of playstatchangeanimation. The stat drops still bypass Mirror Armor without this.	2021-11-11 14:32:38 +13:00
BuffelSaft	e637714e1b	Requested changes Various bug fixes, syntax corrections etc.	2021-11-10 21:11:15 +13:00
BuffelSaft	e2599c2469	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch1	2021-11-10 14:31:32 +13:00
ghoulslash	fdaa979bd6	Merge branch 'master' of https://github.com/pret/pokeemerald into dexnav	2021-11-09 08:58:29 -05:00
Blackforest92	76ba9d835a	pulled latest RHH battle_engine 08-11-2021	2021-11-08 16:38:42 +07:00
GriffinR	c4169cfd29	Disambiguate cry functions	2021-11-07 14:26:09 -05:00
GriffinR	54b254a829	Add CRY_MODE constants	2021-11-07 13:33:05 -05:00
Eduardo Quezada D'Ottone	c2a17510a9	Terrain Pulse animations	2021-11-07 11:25:08 -03:00
BuffelSaft	e407883b58	Rethink final strike effects This is now checked in SetMoveEffect instead of in each move that should behave this way. Some effects will need to be redone to make them play nice with this change, but some just work as is.	2021-11-07 20:31:09 +13:00
BuffelSaft	72d12a575d	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike	2021-11-07 12:13:18 +13:00
Eduardo Quezada D'Ottone	e9804a5023	Secret Power animation config	2021-11-06 17:32:34 -03:00
ghoulslash	da6ec51fc2	merge w be	2021-11-06 10:43:35 -04:00
ghoulslash	41bf1dc2f4	merge w be	2021-11-06 10:40:57 -04:00
Eduardo Quezada D'Ottone	ae8de0f07a	Merge branch 'BattleEngine' into BE_TerrainMoves # Conflicts: # data/battle_scripts_1.s # include/constants/battle_move_effects.h # src/battle_util.c	2021-11-06 10:44:05 -03:00
BuffelSaft	5acebe32aa	Merge pull request #1817 from LOuroboros/photonGeyser Implemented Photon Geyser and Shell Side Arm	2021-11-06 16:04:53 +13:00
BuffelSaft	14ebba04af	Align comment with others Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>	2021-11-06 12:43:57 +13:00
BuffelSaft	4007a8d1f8	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into relic_song	2021-11-06 11:52:51 +13:00
LOuroboros	5f458c9cd3	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into photonGeyser	2021-11-05 10:58:53 -03:00
ghoulslash	eee3f5b181	merge w pret	2021-11-05 09:22:24 -04:00
BuffelSaft	ee83d1142c	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch1	2021-11-05 21:40:05 +13:00
BuffelSaft	bf786c6c9a	Fix Magma Storm Fix the strings and animation displayed when Magma Storm. Also move gTrappingMoves to battle_script_message.c as it's only sued in this file, and this allows ARRAY_COUNT(sTrappingMoves) to replace the constant in SetMoveEffect.	2021-11-05 18:22:52 +13:00
BuffelSaft	a8d44f84a1	Merge pull request #1852 from Blackforest92/battle_engine_2 Update waterfall, trick room, & focus blast BG	2021-11-05 15:27:52 +13:00
BuffelSaft	6df3975fc6	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into hunger_switch2	2021-11-05 14:32:33 +13:00
cbt6	32aaf6912f	Rename movement scripts to use Faster over Fastest	2021-11-05 02:22:28 +08:00
LOuroboros	22f7e81bef	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into mimicry	2021-11-04 12:25:26 -03:00
LOuroboros	4f251e6ec2	Moved VARIOUS_TRY_TO_REVERT_MIMICRY to VARIOUS_REMOVE_TERRAIN	2021-11-04 12:13:55 -03:00
LOuroboros	e0b53f87fc	Primal Reversion Tweaks -Fixed the inconsistent Primal Reversion activation in double battles. -Optimized the primal weather checks in attackcanceler a little. -Fixed the issue with multi-target fire/water moves during primal rain/sun.	2021-11-04 12:04:14 -03:00
BuffelSaft	c9ae140bd1	Fix Clangourous Soul I broke this while trying to tidy up the code, it worked perfectly before. Also, make sure the "recoil' doesn't break Disguise.	2021-11-04 21:50:42 +13:00
BuffelSaft	ecbe048f96	Fix Octolock Fixed two issues: - Octolock doesn't have an end of turn animation in gen 8 - The def drop anim wasn't played if Sp. Def was at -6 and def could still drop	2021-11-04 21:26:04 +13:00
BuffelSaft	cecd341011	Fix Tar Shot If Tar Shot can't do anything to the target it should fail. Checking this is clunky, but it works.	2021-11-04 20:47:45 +13:00
BuffelSaft	3baf2aa331	Remove trynextdart, update waitmessage 0x40 Not dealing with Dragon Darts in this PR. Updated waitmessage 0x40 to waitmessage B_WAIT_TIME_LONG.	2021-11-04 20:19:18 +13:00
BuffelSaft	28e78cb6c4	Gen 8 moves initial commit Full credit to Nunuchu42 and cfmnephrite for this code.	2021-11-04 19:50:54 +13:00
BuffelSaft	e930dae278	Remove ability pop up for Hunger Switch Morpeko should change form each turn without showing its ability.	2021-11-04 15:40:26 +13:00
BuffelSaft	616be576fc	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into hunger_switch2	2021-11-04 15:29:38 +13:00
LOuroboros	b931e34172	Handled Mimicry's interaction with Steel Roller's effect	2021-11-03 23:23:28 -03:00
BuffelSaft	eeb40daede	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into pastel_veil2	2021-11-04 13:52:58 +13:00
LOuroboros	f6628e301f	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into mimicry	2021-11-03 20:43:33 -03:00
LOuroboros	f0d7c75ec8	Syntax corrections	2021-11-03 17:48:04 -03:00
ghoulslash	48c29a9cd8	proper mirror armor sticky web targeting	2021-11-03 15:05:52 -04:00
GriffinR	e14210ce1f	Merge pull request #1536 from GriffinRichards/clean-braille Add font id constants, better braille support	2021-11-03 13:17:29 -04:00
GriffinR	0ba22ca112	Merge pull request #1534 from GriffinRichards/doc-btrans Document battle transition	2021-11-03 11:26:20 -04:00
LOuroboros	af6e72ecfe	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into photonGeyser	2021-11-03 08:56:01 -03:00
Blackforest92	b9c23f7c62	Update waterfall, trick room, & focus blast BG	2021-11-03 16:29:09 +07:00
BuffelSaft	6ce1f01b8c	Hunger Switch and Aura Wheel Implement the ability Hunger Switch and the move Aura Wheel.	2021-11-03 19:45:03 +13:00
BuffelSaft	18b87416d5	Fixes - Fix Sheer Force interaction (needed after adding \| MOVE_EFFECT_AFFECTS_USER \| MOVE_EFFECT_CERTAIN) - Fix "X Transformed!" target - Allow switching between both forms - Allow form change if target is KO'ed	2021-11-03 17:56:16 +13:00
BuffelSaft	74c85b5818	Implement Relic Song's form change Meloetta transforms into its pirouette form after using Relic Song, unless it has Sheer Force or the move has no effect. It also has a chance to put both targets to sleep.	2021-11-03 17:23:33 +13:00
BuffelSaft	f323e2c047	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into pastel_veil	2021-11-03 14:18:28 +13:00
BuffelSaft	d99fd30e4d	Looping battle script, correct message Testing in Sword showed that the pop up should happen once if two mons are cured, and that the correct message is "X was cured of its poisoning!"	2021-11-03 11:51:20 +13:00
LOuroboros	69b42de0d9	Implemented Mimicry Thanks to AsparagusEduardo for helping me optimize RestoreBattlerOriginalTypes.	2021-11-02 14:44:55 -03:00
Blackforest92	0f5c9f5cb0	Adjust Giga Impact background to fade in before impact	2021-11-03 00:37:22 +07:00
ghoulslash	592a1dab63	fix mirror armor setstatchanger, handle reflected stat blockage	2021-11-02 12:02:58 -04:00
ghoulslash	ffcba355b0	merge w be	2021-11-02 10:36:08 -04:00
BuffelSaft	4668e11765	Looping battlescript version 1 Would be better if it simply updated the target, cured the status and returned I think, needs testing.	2021-11-03 00:45:24 +13:00
BuffelSaft	95435b5f7f	Pastel Veil switchin effect attempt Battle script isn't working for partner for some reason.	2021-11-02 23:06:10 +13:00
BuffelSaft	40bced517a	Pastel Veil blocks poison for whole side Tested vs Toxic, Toxic Thread and Sludge with 100% effect chance.	2021-11-02 20:00:57 +13:00
Blackforest92	2d5ed4a1e2	Allow Giga Impact fadein background & upgrade its graphic	2021-11-02 12:53:11 +07:00
BuffelSaft	1e3b3d482b	Merge pull request #1838 from Blackforest92/battle_engine Edit Spacial Rend and Hurricane background	2021-11-02 17:11:47 +13:00
Eduardo Quezada D'Ottone	f3013d8ee9	Standarized Solarbeam into Solar Beam	2021-11-01 18:36:35 -03:00
ghoulslash	e4242d04ab	remove battler skipping in neutralizing gas exit bs	2021-11-01 14:28:41 -04:00
ghoulslash	48bea554a3	fix tryendneutralizinggas placement	2021-11-01 14:21:28 -04:00
ghoulslash	98b4b821dc	merge with be	2021-11-01 13:55:55 -04:00
ghoulslash	a1e64fce4f	handle simple beam, gastro acid	2021-11-01 13:50:57 -04:00
ghoulslash	b5d20da927	merge with be	2021-11-01 11:36:18 -04:00
BuffelSaft	5d678bc2ce	Fix move effect defines Had a define in a comment, which offset all the new move effects and misaligned their battle scripts.	2021-11-01 23:51:03 +13:00
BuffelSaft	0345dea918	Replace EFFECT_DOUBLE_HIT with FLAG_TWO_STRIKES This removes the need to have separate move effects for Twineedle, Double Iron Bash, and any custom two strike moves.	2021-11-01 23:39:37 +13:00
BuffelSaft	fb25e1ac98	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike	2021-11-01 22:37:23 +13:00
BuffelSaft	fbce8b2ff0	Merge pull request #1749 from ghoulslash/wandering_spirit Wandering Spirit	2021-11-01 11:26:53 +13:00
Blackforest92	9b6cd383a4	Optimized Rock Wrecker and Hurricane	2021-11-01 01:06:39 +07:00
ghoulslash	52d4d1cd34	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into utility_umbrella	2021-10-31 11:40:00 -04:00
ghoulslash	bc170f3a43	merge with be	2021-10-31 11:04:39 -04:00
Blackforest92	c87e2433a7	Minor fix to Steel Beam	2021-10-31 21:41:39 +07:00
GriffinR	36039e1b86	Convert fonts.s to C	2021-10-31 01:44:18 -04:00
ghoulslash	e1f0e6285b	Merge pull request #1828 from BuffelSaft/gorilla-tactics Implement Gorilla Tactics	2021-10-30 21:44:33 -04:00
GriffinR	fdaf436960	Add font id constants	2021-10-30 19:54:15 -04:00
GriffinR	13cd2a41f0	Better braille support	2021-10-30 16:19:10 -04:00
GriffinR	71605556ab	Clean up braille_puzzles	2021-10-30 11:59:14 -04:00
LOuroboros	0ddcb69c65	Fixed Move_SPECIAL_REND typo	2021-10-30 12:14:28 -03:00
ghoulslash	468ee66cd8	fix synthesis and leaf guard w utility umbrella	2021-10-30 11:04:50 -04:00
GriffinR	875be8a8a8	Merge pull request #1528 from GriffinRichards/doc-ereaderscr Document ereader screen	2021-10-30 09:34:14 -04:00
ghoulslash	ee7b63e372	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into utility_umbrella	2021-10-30 09:26:33 -04:00
ghoulslash	3e364b4870	switchin abilities activate after wandering spirit	2021-10-30 09:16:33 -04:00
ghoulslash	f4537b1213	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into wandering_spirit	2021-10-30 09:14:32 -04:00
ghoulslash	4b0325dbe4	neutralizing gas switchout	2021-10-30 09:13:08 -04:00
Blackforest92	799852ea77	Introduce alternate Steel Beam	2021-10-30 17:00:55 +07:00
BuffelSaft	47bfeaeecd	Implement Gorilla Tactics It's Choice Band but as an ability.	2021-10-30 18:31:44 +13:00
ghoulslash	af914ee7ed	merge w be	2021-10-29 22:33:50 -04:00
ghoulslash	28bc7dc14d	start ability	2021-10-29 22:32:19 -04:00
BuffelSaft	6b65ef5bcf	Merge pull request #1824 from ghoulslash/itemheal_fix Fix iteam healing after a failed move	2021-10-30 15:25:28 +13:00
BuffelSaft	f0e9b09258	Merge pull request #1822 from ghoulslash/harvest fix recycle and harvest	2021-10-30 15:00:56 +13:00
GriffinR	07bf225f94	Continue battle_transition documenting	2021-10-29 11:24:36 -04:00
ghoulslash	2502820e83	document a couple hitmarkers. fix failing moves not updating hp from own healing effects	2021-10-29 09:03:14 -04:00
ghoulslash	204748e01a	fix recycle and harvest	2021-10-28 17:52:52 -04:00
ghoulslash	f342e7c590	merge with be	2021-10-28 17:03:10 -04:00
ghoulslash	e2e31f0b74	skill swap config option for switchin abilities	2021-10-28 16:53:00 -04:00
LOuroboros	a77f058146	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into photonGeyser	2021-10-28 14:24:43 -03:00
ghoulslash	34e966fdee	Merge pull request #1815 from LOuroboros/hyperspaceFury Implemented Hyperspace Fury	2021-10-28 13:20:33 -04:00
LOuroboros	82101d3581	Optimizations	2021-10-28 14:02:43 -03:00
LOuroboros	28522f3ffb	Fixed Hyperspace Fury not breaking through protections Also repositioned VARIOUS_JUMP_IF_SPECIES.	2021-10-28 12:09:44 -03:00
ghoulslash	bebaded415	merge with be	2021-10-27 16:48:38 -04:00

... 15 16 17 18 19 ...

4471 Commits